diff --git a/build.xml b/build.xml
index a21113f6..e50f7cae 100644
--- a/build.xml
+++ b/build.xml
@@ -4064,7 +4064,6 @@
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/app-client.jar" />
         <fileset file="${artifacts.mps}/lib/lib.jar" />
         <fileset file="${artifacts.mps}/lib/lib-client.jar" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 98fc9647..61b83ba8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -2323,7 +2323,7 @@
                       <node concept="3clFbF" id="4sSe4$p4Z85" role="3cqZAp">
                         <node concept="2OqwBi" id="4sSe4$p4Z86" role="3clFbG">
                           <node concept="37vLTw" id="4sSe4$p4Z87" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKMB" />
+                            <ref role="3cqZAo" node="6E5fMGvfKMB" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4sSe4$p4Z88" role="2OqNvi">
                             <node concept="chp4Y" id="1mdVbTS8Lqa" role="cj9EA">
@@ -2408,7 +2408,7 @@
                                               <node concept="1PxgMI" id="4sSe4$p5z8x" role="2Oq$k0">
                                                 <property role="1BlNFB" value="true" />
                                                 <node concept="37vLTw" id="4sSe4$p5z8y" role="1m5AlR">
-                                                  <ref role="3cqZAo" node="6E5fMGvfKMD" />
+                                                  <ref role="3cqZAo" node="6E5fMGvfKMD" resolve="it" />
                                                 </node>
                                                 <node concept="chp4Y" id="1mdVbTS8Pgm" role="3oSUPX">
                                                   <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
@@ -2419,11 +2419,11 @@
                                               </node>
                                             </node>
                                             <node concept="37vLTw" id="4sSe4$p5z8$" role="3K4GZi">
-                                              <ref role="3cqZAo" node="6E5fMGvfKMD" />
+                                              <ref role="3cqZAo" node="6E5fMGvfKMD" resolve="it" />
                                             </node>
                                             <node concept="2OqwBi" id="4sSe4$p5z8_" role="3K4Cdx">
                                               <node concept="37vLTw" id="4sSe4$p5z8A" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6E5fMGvfKMD" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKMD" resolve="it" />
                                               </node>
                                               <node concept="1mIQ4w" id="4sSe4$p5z8B" role="2OqNvi">
                                                 <node concept="chp4Y" id="1mdVbTS8PKO" role="cj9EA">
@@ -2471,7 +2471,7 @@
                                             <node concept="1PxgMI" id="4sSe4$p5sOA" role="2Oq$k0">
                                               <property role="1BlNFB" value="true" />
                                               <node concept="37vLTw" id="4sSe4$p5s25" role="1m5AlR">
-                                                <ref role="3cqZAo" node="6E5fMGvfKMF" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKMF" resolve="it" />
                                               </node>
                                               <node concept="chp4Y" id="1mdVbTS8QrK" role="3oSUPX">
                                                 <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
@@ -2486,7 +2486,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="4sSe4$p5nqL" role="3K4Cdx">
                                             <node concept="37vLTw" id="4sSe4$p5mF0" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6E5fMGvfKMF" />
+                                              <ref role="3cqZAo" node="6E5fMGvfKMF" resolve="it" />
                                             </node>
                                             <node concept="1mIQ4w" id="4sSe4$p5odr" role="2OqNvi">
                                               <node concept="chp4Y" id="1mdVbTS8QRy" role="cj9EA">
@@ -2536,7 +2536,7 @@
                     <node concept="3clFbF" id="4sSe4$p51UH" role="3cqZAp">
                       <node concept="2OqwBi" id="4sSe4$p51UI" role="3clFbG">
                         <node concept="37vLTw" id="4sSe4$p51UJ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKMH" />
+                          <ref role="3cqZAo" node="6E5fMGvfKMH" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="4sSe4$p51UK" role="2OqNvi">
                           <node concept="chp4Y" id="1mdVbTS8LHN" role="cj9EA">
@@ -3841,7 +3841,7 @@
                           <node concept="2OqwBi" id="4nIWweBKzCG" role="3clFbG">
                             <node concept="2OqwBi" id="4nIWweBKybC" role="2Oq$k0">
                               <node concept="37vLTw" id="4nIWweBKxLU" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKML" />
+                                <ref role="3cqZAo" node="6E5fMGvfKML" resolve="it" />
                               </node>
                               <node concept="32TBzR" id="4nIWweBKy_a" role="2OqNvi" />
                             </node>
@@ -3851,7 +3851,7 @@
                                   <node concept="3clFbF" id="4nIWweBKzVK" role="3cqZAp">
                                     <node concept="2OqwBi" id="4nIWweBKzVL" role="3clFbG">
                                       <node concept="37vLTw" id="4nIWweBKzVM" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKMJ" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKMJ" resolve="c" />
                                       </node>
                                       <node concept="1mIQ4w" id="4nIWweBKzVN" role="2OqNvi">
                                         <node concept="chp4Y" id="4nIWweBKzVO" role="cj9EA">
@@ -4540,7 +4540,7 @@
                               <node concept="2OqwBi" id="18kNIl1hIib" role="37wK5m">
                                 <node concept="2OqwBi" id="18kNIl1hIic" role="2Oq$k0">
                                   <node concept="37vLTw" id="18kNIl1hIid" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKMN" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKMN" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="18kNIl1hIie" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpee:hiB6Ojz" resolve="key" />
@@ -10606,7 +10606,7 @@
                                                           <node concept="2OqwBi" id="3P9qlbs0U7P" role="3uHU7B">
                                                             <node concept="2OqwBi" id="6cGbuqOvvNY" role="2Oq$k0">
                                                               <node concept="37vLTw" id="6cGbuqOvvNZ" role="2Oq$k0">
-                                                                <ref role="3cqZAo" node="6E5fMGvfKMP" />
+                                                                <ref role="3cqZAo" node="6E5fMGvfKMP" resolve="it" />
                                                               </node>
                                                               <node concept="3TrEf2" id="3P9qlbs0Tf$" role="2OqNvi">
                                                                 <ref role="3Tt5mk" to="wq2x:5itBwM7QPtQ" resolve="declaration" />
@@ -13701,7 +13701,7 @@
                                 <node concept="3clFbF" id="7WFMSEudfeL" role="3cqZAp">
                                   <node concept="2OqwBi" id="7WFMSEudfeM" role="3clFbG">
                                     <node concept="37vLTw" id="7WFMSEudfeN" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKMR" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKMR" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="7WFMSEudfeO" role="2OqNvi">
                                       <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -13976,7 +13976,7 @@
                                 <node concept="3clFbF" id="5itBwM5YCM1" role="3cqZAp">
                                   <node concept="2OqwBi" id="5itBwM5YD_N" role="3clFbG">
                                     <node concept="37vLTw" id="5itBwM5YCM0" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKMT" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKMT" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="5itBwM5YEWW" role="2OqNvi">
                                       <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -14464,7 +14464,7 @@
                                 <node concept="3clFbF" id="7WFMSEudQA7" role="3cqZAp">
                                   <node concept="2OqwBi" id="7WFMSEudQA8" role="3clFbG">
                                     <node concept="37vLTw" id="7WFMSEudQA9" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKMV" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKMV" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="7WFMSEudQAa" role="2OqNvi">
                                       <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -14580,7 +14580,7 @@
                                 <node concept="3clFbF" id="5itBwM6XBHA" role="3cqZAp">
                                   <node concept="2OqwBi" id="5itBwM6XBHB" role="3clFbG">
                                     <node concept="37vLTw" id="5itBwM6XBHC" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKMX" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKMX" resolve="it" />
                                     </node>
                                     <node concept="3Tsc0h" id="5itBwM6XBHD" role="2OqNvi">
                                       <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -15255,7 +15255,7 @@
                           <node concept="2OqwBi" id="6P1UyJoUCu5" role="3clFbG">
                             <node concept="2OqwBi" id="6P1UyJoUzRQ" role="2Oq$k0">
                               <node concept="37vLTw" id="6P1UyJoUztd" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKMZ" />
+                                <ref role="3cqZAo" node="6E5fMGvfKMZ" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6P1UyJoU$pQ" role="2OqNvi">
                                 <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index 6fac0d92..d6b82de3 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -50,7 +50,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 65e64c1c..ed380843 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -346,7 +346,7 @@
                   <node concept="3clFbF" id="7lt0LtPpP5v" role="3cqZAp">
                     <node concept="2OqwBi" id="7lt0LtPpP5w" role="3clFbG">
                       <node concept="37vLTw" id="7lt0LtPpP5x" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKKX" />
+                        <ref role="3cqZAo" node="6E5fMGvfKKX" resolve="pd" />
                       </node>
                       <node concept="3Tsc0h" id="7lt0LtPpP5y" role="2OqNvi">
                         <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -690,7 +690,7 @@
                     <node concept="3clFbF" id="7lt0LtPIy7x" role="3cqZAp">
                       <node concept="2OqwBi" id="7lt0LtPIy7y" role="3clFbG">
                         <node concept="37vLTw" id="7lt0LtPIy7z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKKZ" />
+                          <ref role="3cqZAo" node="6E5fMGvfKKZ" resolve="hd" />
                         </node>
                         <node concept="2qgKlT" id="5TXeSYSxOKn" role="2OqNvi">
                           <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
@@ -726,7 +726,7 @@
                       <node concept="3clFbF" id="4beNoh2thn6" role="3cqZAp">
                         <node concept="2OqwBi" id="4beNoh2thn7" role="3clFbG">
                           <node concept="37vLTw" id="4beNoh2thn8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKL1" />
+                            <ref role="3cqZAo" node="6E5fMGvfKL1" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4beNoh2thn9" role="2OqNvi">
                             <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
@@ -787,7 +787,7 @@
                       <node concept="3clFbF" id="6E2cNibpUF1" role="3cqZAp">
                         <node concept="2OqwBi" id="6E2cNibpV8e" role="3clFbG">
                           <node concept="37vLTw" id="6E2cNibpUF0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKL3" />
+                            <ref role="3cqZAo" node="6E5fMGvfKL3" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="6E2cNibpVnr" role="2OqNvi">
                             <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
@@ -1442,7 +1442,7 @@
                     <node concept="3clFbF" id="5itBwM5Ar0o" role="3cqZAp">
                       <node concept="2OqwBi" id="5itBwM5ArgA" role="3clFbG">
                         <node concept="37vLTw" id="5itBwM5Ar0n" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKL5" />
+                          <ref role="3cqZAo" node="6E5fMGvfKL5" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="5itBwM5ArVA" role="2OqNvi">
                           <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -1471,7 +1471,7 @@
                       <node concept="3clFbF" id="5itBwM5thSz" role="3cqZAp">
                         <node concept="2OqwBi" id="5itBwM5ti8D" role="3clFbG">
                           <node concept="37vLTw" id="5itBwM5thSy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKL7" />
+                            <ref role="3cqZAo" node="6E5fMGvfKL7" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5itBwM5tj9l" role="2OqNvi">
                             <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -1523,7 +1523,7 @@
                     <node concept="3clFbF" id="5itBwM6yPJV" role="3cqZAp">
                       <node concept="2OqwBi" id="5itBwM6yQ03" role="3clFbG">
                         <node concept="37vLTw" id="5itBwM6yPJU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKL9" />
+                          <ref role="3cqZAo" node="6E5fMGvfKL9" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="5itBwM6yQBv" role="2OqNvi">
                           <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -1552,7 +1552,7 @@
                       <node concept="3clFbF" id="5itBwM6yY_Z" role="3cqZAp">
                         <node concept="2OqwBi" id="5itBwM6yYX1" role="3clFbG">
                           <node concept="37vLTw" id="5itBwM6yY_Y" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKLb" />
+                            <ref role="3cqZAo" node="6E5fMGvfKLb" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5itBwM6yZH0" role="2OqNvi">
                             <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -1765,7 +1765,7 @@
                   <node concept="3clFbF" id="5itBwM6JwbU" role="3cqZAp">
                     <node concept="2OqwBi" id="5itBwM6Jws0" role="3clFbG">
                       <node concept="37vLTw" id="5itBwM6JwbT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKLd" />
+                        <ref role="3cqZAo" node="6E5fMGvfKLd" resolve="it" />
                       </node>
                       <node concept="3Tsc0h" id="5itBwM6JxsG" role="2OqNvi">
                         <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -2335,7 +2335,7 @@
                   <node concept="3clFbF" id="1GNw78$s227" role="3cqZAp">
                     <node concept="2OqwBi" id="1GNw78$s22d" role="3clFbG">
                       <node concept="37vLTw" id="1GNw78$s22e" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKLf" />
+                        <ref role="3cqZAo" node="6E5fMGvfKLf" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="1GNw78$s22f" role="2OqNvi">
                         <node concept="chp4Y" id="JOGAOsxSBD" role="cj9EA">
@@ -2378,7 +2378,7 @@
                   <node concept="3clFbF" id="1GNw78$s22H" role="3cqZAp">
                     <node concept="2OqwBi" id="5YVpdhev4Hh" role="3clFbG">
                       <node concept="37vLTw" id="5YVpdhev4Hi" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKLh" />
+                        <ref role="3cqZAo" node="6E5fMGvfKLh" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5YVpdhev4Hj" role="2OqNvi">
                         <node concept="chp4Y" id="JOGAOsxT7n" role="cj9EA">
@@ -2421,7 +2421,7 @@
                   <node concept="3clFbF" id="3Co8b0rNyyi" role="3cqZAp">
                     <node concept="2OqwBi" id="3Co8b0rNyyk" role="3clFbG">
                       <node concept="37vLTw" id="3Co8b0rNyyl" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKLj" />
+                        <ref role="3cqZAo" node="6E5fMGvfKLj" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="3Co8b0rNyym" role="2OqNvi">
                         <node concept="chp4Y" id="3Co8b0rNyyn" role="cj9EA">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 68c1b523..9498dfd7 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -796,7 +796,7 @@
                               <node concept="3clFbF" id="34$A1Mf4Up5" role="3cqZAp">
                                 <node concept="2OqwBi" id="34$A1Mf4UJQ" role="3clFbG">
                                   <node concept="37vLTw" id="34$A1Mf4Up4" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKLl" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKLl" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="34$A1Mf4VmA" role="2OqNvi">
                                     <ref role="3TtcxE" to="wq2x:1HWyn8jEsaE" resolve="constraint" />
@@ -1539,7 +1539,7 @@
                       <node concept="3clFbF" id="5itBwMauiaG" role="3cqZAp">
                         <node concept="2OqwBi" id="5itBwMauiaH" role="3clFbG">
                           <node concept="37vLTw" id="5itBwMauiaI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKLn" />
+                            <ref role="3cqZAo" node="6E5fMGvfKLn" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5itBwMaujeX" role="2OqNvi">
                             <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
@@ -1677,7 +1677,7 @@
                       <node concept="3clFbF" id="5itBwM9Un4k" role="3cqZAp">
                         <node concept="2OqwBi" id="5itBwM9Unlq" role="3clFbG">
                           <node concept="37vLTw" id="5itBwM9Un4j" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKLp" />
+                            <ref role="3cqZAo" node="6E5fMGvfKLp" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5itBwM9UnsK" role="2OqNvi">
                             <ref role="3TtcxE" to="wq2x:5itBwM6ukmz" resolve="prototype" />
@@ -1846,7 +1846,7 @@
                         <node concept="2OqwBi" id="6P1UyJpkqnf" role="3clFbG">
                           <node concept="2OqwBi" id="6P1UyJpkprY" role="2Oq$k0">
                             <node concept="37vLTw" id="6P1UyJpkpe$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKLr" />
+                              <ref role="3cqZAo" node="6E5fMGvfKLr" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6P1UyJpkpKz" role="2OqNvi">
                               <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
@@ -1978,7 +1978,7 @@
                           <node concept="3clFbF" id="7LI_gNMozlS" role="3cqZAp">
                             <node concept="2OqwBi" id="7LI_gNMozlT" role="3clFbG">
                               <node concept="37vLTw" id="7LI_gNMozlU" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKLt" />
+                                <ref role="3cqZAo" node="6E5fMGvfKLt" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="7LI_gNMozlV" role="2OqNvi">
                                 <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
@@ -2000,7 +2000,7 @@
                           <node concept="1Wc70l" id="7LI_gNMotJ9" role="3clFbG">
                             <node concept="2OqwBi" id="7LI_gNMotJa" role="3uHU7w">
                               <node concept="37vLTw" id="7LI_gNMotJb" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKLv" />
+                                <ref role="3cqZAo" node="6E5fMGvfKLv" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="7LI_gNMotJc" role="2OqNvi">
                                 <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
@@ -2008,7 +2008,7 @@
                             </node>
                             <node concept="3y3z36" id="7LI_gNMotJd" role="3uHU7B">
                               <node concept="37vLTw" id="7LI_gNMotJe" role="3uHU7B">
-                                <ref role="3cqZAo" node="6E5fMGvfKLv" />
+                                <ref role="3cqZAo" node="6E5fMGvfKLv" resolve="it" />
                               </node>
                               <node concept="3kakTB" id="7LI_gNMotJf" role="3uHU7w" />
                             </node>
@@ -2108,7 +2108,7 @@
                           <node concept="3y3z36" id="7LI_gNMl4mf" role="3clFbG">
                             <node concept="3kakTB" id="7LI_gNMl4Ah" role="3uHU7w" />
                             <node concept="37vLTw" id="7LI_gNMl46A" role="3uHU7B">
-                              <ref role="3cqZAo" node="6E5fMGvfKLx" />
+                              <ref role="3cqZAo" node="6E5fMGvfKLx" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -2263,7 +2263,7 @@
                                   <node concept="2OqwBi" id="554EtBItpqq" role="3clFbG">
                                     <node concept="2OqwBi" id="554EtBItpqr" role="2Oq$k0">
                                       <node concept="37vLTw" id="554EtBItpqs" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKLz" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKLz" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="554EtBItpqt" role="2OqNvi">
                                         <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
@@ -2291,12 +2291,12 @@
                                   <node concept="3y3z36" id="554EtBIujMx" role="3K4Cdx">
                                     <node concept="EsrRn" id="554EtBIukfc" role="3uHU7w" />
                                     <node concept="37vLTw" id="554EtBIujl0" role="3uHU7B">
-                                      <ref role="3cqZAo" node="6E5fMGvfKL_" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKL_" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="554EtBItpq_" role="3K4E3e">
                                     <node concept="37vLTw" id="554EtBItpqA" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKL_" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKL_" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="554EtBItpqB" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index fbafa99c..b39cb176 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -6020,7 +6020,7 @@
                         <node concept="3clFbF" id="7LI_gNMoPjw" role="3cqZAp">
                           <node concept="2OqwBi" id="7LI_gNMoPjx" role="3clFbG">
                             <node concept="37vLTw" id="7LI_gNMoPjy" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKLB" />
+                              <ref role="3cqZAo" node="6E5fMGvfKLB" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="7LI_gNMoPjz" role="2OqNvi">
                               <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
@@ -6042,7 +6042,7 @@
                         <node concept="1Wc70l" id="7LI_gNMoPjE" role="3clFbG">
                           <node concept="2OqwBi" id="7LI_gNMoPjF" role="3uHU7w">
                             <node concept="37vLTw" id="7LI_gNMoPjG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKLD" />
+                              <ref role="3cqZAo" node="6E5fMGvfKLD" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="7LI_gNMoPjH" role="2OqNvi">
                               <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
@@ -6050,7 +6050,7 @@
                           </node>
                           <node concept="3y3z36" id="7LI_gNMoPjI" role="3uHU7B">
                             <node concept="37vLTw" id="7LI_gNMoPjJ" role="3uHU7B">
-                              <ref role="3cqZAo" node="6E5fMGvfKLD" />
+                              <ref role="3cqZAo" node="6E5fMGvfKLD" resolve="it" />
                             </node>
                             <node concept="7Obwk" id="7LI_gNMoPjK" role="3uHU7w" />
                           </node>
@@ -6138,7 +6138,7 @@
                         <node concept="3y3z36" id="7LI_gNMl4mf" role="3clFbG">
                           <node concept="7Obwk" id="7LI_gNMln42" role="3uHU7w" />
                           <node concept="37vLTw" id="7LI_gNMl46A" role="3uHU7B">
-                            <ref role="3cqZAo" node="6E5fMGvfKLF" />
+                            <ref role="3cqZAo" node="6E5fMGvfKLF" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -6730,7 +6730,7 @@
                       <node concept="2OqwBi" id="3czCaDvmo4f" role="3clFbG">
                         <node concept="1XCIdh" id="3czCaDvmo4h" role="2OqNvi" />
                         <node concept="37vLTw" id="4jcOV4hu7E1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKLH" />
+                          <ref role="3cqZAo" node="6E5fMGvfKLH" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -7002,7 +7002,7 @@
                       <node concept="3clFbF" id="5itBwMau$Lw" role="3cqZAp">
                         <node concept="2OqwBi" id="5itBwMau$Lx" role="3clFbG">
                           <node concept="37vLTw" id="5itBwMau$Ly" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKLL" />
+                            <ref role="3cqZAo" node="6E5fMGvfKLL" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="5itBwMau$Lz" role="2OqNvi">
                             <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
@@ -7205,7 +7205,7 @@
                               <node concept="3clFbF" id="5itBwM9VlFW" role="3cqZAp">
                                 <node concept="2OqwBi" id="5itBwM9Vnj2" role="3clFbG">
                                   <node concept="37vLTw" id="5itBwM9VlFV" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKLN" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKLN" resolve="it" />
                                   </node>
                                   <node concept="1$rogu" id="5itBwM9VnGB" role="2OqNvi" />
                                 </node>
@@ -7638,7 +7638,7 @@
                               <node concept="2OqwBi" id="7LI_gNNcxGU" role="3clFbG">
                                 <node concept="17RM3I" id="7LI_gNNa_lU" role="2Oq$k0">
                                   <node concept="37vLTw" id="7LI_gNNa_eZ" role="17RM3D">
-                                    <ref role="3cqZAo" node="6E5fMGvfKLP" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKLP" resolve="it" />
                                   </node>
                                   <node concept="3cmrfG" id="7LI_gNNa_x2" role="17RM3C">
                                     <property role="3cmrfH" value="0" />
@@ -7843,7 +7843,7 @@
                       <node concept="2OqwBi" id="6mHZizzmv1C" role="3clFbG">
                         <node concept="1XCIdh" id="6mHZizzmv1D" role="2OqNvi" />
                         <node concept="37vLTw" id="6mHZizzmv1E" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKLR" />
+                          <ref role="3cqZAo" node="6E5fMGvfKLR" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -8532,7 +8532,7 @@
                       <node concept="3clFbF" id="34$A1Mf4Up5" role="3cqZAp">
                         <node concept="2OqwBi" id="34$A1Mf4UJQ" role="3clFbG">
                           <node concept="37vLTw" id="34$A1Mf4Up4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKLT" />
+                            <ref role="3cqZAo" node="6E5fMGvfKLT" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="34$A1Mf4VmA" role="2OqNvi">
                             <ref role="3TtcxE" to="wq2x:1HWyn8jEsaE" resolve="constraint" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
index fb212fe4..ae5842dc 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
@@ -515,7 +515,7 @@
                                         <ref role="cht4Q" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
                                       </node>
                                       <node concept="37vLTw" id="5f6wxQ3dm_a" role="1m5AlR">
-                                        <ref role="3cqZAo" node="6E5fMGvfKLV" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKLV" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="5f6wxQ3dqe2" role="2OqNvi">
@@ -599,7 +599,7 @@
                   <node concept="3clFbF" id="5f6wxQ3dKqQ" role="3cqZAp">
                     <node concept="2OqwBi" id="5f6wxQ3dKDR" role="3clFbG">
                       <node concept="37vLTw" id="5f6wxQ3dKqP" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKLX" />
+                        <ref role="3cqZAo" node="6E5fMGvfKLX" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5f6wxQ3dL3y" role="2OqNvi">
                         <node concept="chp4Y" id="5f6wxQ3dLlZ" role="cj9EA">
@@ -729,7 +729,7 @@
                                         <ref role="cht4Q" to="wq2x:6p0DfM0a6KG" resolve="EmitConstraintStatement" />
                                       </node>
                                       <node concept="37vLTw" id="5f6wxQ3eSZG" role="1m5AlR">
-                                        <ref role="3cqZAo" node="6E5fMGvfKLZ" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKLZ" resolve="it" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="5f6wxQ3eVmk" role="2OqNvi">
@@ -849,7 +849,7 @@
                   <node concept="3clFbF" id="5f6wxQ3eFPF" role="3cqZAp">
                     <node concept="2OqwBi" id="5f6wxQ3eG9L" role="3clFbG">
                       <node concept="37vLTw" id="5f6wxQ3eFPE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKM1" />
+                        <ref role="3cqZAo" node="6E5fMGvfKM1" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="5f6wxQ3eH6o" role="2OqNvi">
                         <node concept="chp4Y" id="5f6wxQ3eHOA" role="cj9EA">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
index 0e169df8..db220263 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
@@ -412,7 +412,7 @@
                       <node concept="1rXfSq" id="1$LYeHxPYsJ" role="3clFbG">
                         <ref role="37wK5l" node="1$LYeHxQozt" resolve="isAffected" />
                         <node concept="37vLTw" id="1$LYeHxQ1xR" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKJL" />
+                          <ref role="3cqZAo" node="6E5fMGvfKJL" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -430,7 +430,7 @@
                   <node concept="3clFbF" id="1$LYeHxQaBt" role="3cqZAp">
                     <node concept="2OqwBi" id="1$LYeHxQbZZ" role="3clFbG">
                       <node concept="37vLTw" id="1$LYeHxQaBs" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKJN" />
+                        <ref role="3cqZAo" node="6E5fMGvfKJN" resolve="it" />
                       </node>
                       <node concept="2OwXpG" id="1$LYeHxQeyN" role="2OqNvi">
                         <ref role="2Oxat5" node="1$LYeHxEHIw" resolve="var" />
@@ -520,7 +520,7 @@
                         <node concept="1rXfSq" id="4t6qIYTl6hK" role="3clFbG">
                           <ref role="37wK5l" node="4t6qIYSK4k1" resolve="symDecl" />
                           <node concept="37vLTw" id="4t6qIYTlarY" role="37wK5m">
-                            <ref role="3cqZAo" node="6E5fMGvfKJP" />
+                            <ref role="3cqZAo" node="6E5fMGvfKJP" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -556,7 +556,7 @@
                               <ref role="37wK5l" node="1$LYeHxEJzC" resolve="findRoot" />
                             </node>
                             <node concept="37vLTw" id="4t6qIYTgULq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKJR" />
+                              <ref role="3cqZAo" node="6E5fMGvfKJR" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -576,7 +576,7 @@
                   <node concept="3clFbF" id="4t6qIYTgULw" role="3cqZAp">
                     <node concept="2OqwBi" id="4t6qIYTgULx" role="3clFbG">
                       <node concept="37vLTw" id="4t6qIYTgULy" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKJT" />
+                        <ref role="3cqZAo" node="6E5fMGvfKJT" resolve="it" />
                       </node>
                       <node concept="2OwXpG" id="4t6qIYTgULz" role="2OqNvi">
                         <ref role="2Oxat5" node="1$LYeHxEHIw" resolve="var" />
@@ -628,7 +628,7 @@
                     <node concept="1rXfSq" id="6V4Y$98rZl5" role="3clFbG">
                       <ref role="37wK5l" node="7qe1GumU7ih" resolve="isFree" />
                       <node concept="37vLTw" id="6V4Y$98upy3" role="37wK5m">
-                        <ref role="3cqZAo" node="6E5fMGvfKJV" />
+                        <ref role="3cqZAo" node="6E5fMGvfKJV" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -689,7 +689,7 @@
                   <node concept="3clFbF" id="1$LYeHxSKK_" role="3cqZAp">
                     <node concept="2OqwBi" id="1$LYeHxSKKA" role="3clFbG">
                       <node concept="37vLTw" id="1$LYeHxSKKB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKJX" />
+                        <ref role="3cqZAo" node="6E5fMGvfKJX" resolve="it" />
                       </node>
                       <node concept="2Rf3mk" id="1$LYeHxSKKC" role="2OqNvi">
                         <node concept="1xMEDy" id="1$LYeHxSKKD" role="1xVPHs">
@@ -757,7 +757,7 @@
                       <node concept="3clFbF" id="6E2cNibpMIp" role="3cqZAp">
                         <node concept="2OqwBi" id="6E2cNibpN3y" role="3clFbG">
                           <node concept="37vLTw" id="6E2cNibpMIo" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKJZ" />
+                            <ref role="3cqZAo" node="6E5fMGvfKJZ" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="6E2cNibpNqQ" role="2OqNvi">
                             <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
@@ -779,7 +779,7 @@
                   <node concept="3clFbF" id="1RMe_qTcpmQ" role="3cqZAp">
                     <node concept="2OqwBi" id="1RMe_qTcpMT" role="3clFbG">
                       <node concept="37vLTw" id="1RMe_qTcpmP" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKK1" />
+                        <ref role="3cqZAo" node="6E5fMGvfKK1" resolve="it" />
                       </node>
                       <node concept="2Rf3mk" id="1RMe_qTcl8w" role="2OqNvi">
                         <node concept="1xMEDy" id="1RMe_qTcl8y" role="1xVPHs">
@@ -1915,7 +1915,7 @@
                         <node concept="1rXfSq" id="2NnDL4G9exd" role="3clFbG">
                           <ref role="37wK5l" node="1$LYeHxGjJ5" resolve="sym" />
                           <node concept="37vLTw" id="2NnDL4G9f5X" role="37wK5m">
-                            <ref role="3cqZAo" node="6E5fMGvfKK3" />
+                            <ref role="3cqZAo" node="6E5fMGvfKK3" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -2603,7 +2603,7 @@
                         <node concept="3clFbF" id="5u2z7mHknJu" role="3cqZAp">
                           <node concept="2OqwBi" id="5u2z7mHknV6" role="3clFbG">
                             <node concept="37vLTw" id="5u2z7mHknJt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKK5" />
+                              <ref role="3cqZAo" node="6E5fMGvfKK5" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="5u2z7mHko6V" role="2OqNvi">
                               <ref role="37wK5l" to="x5bw:34$A1Mf3_WJ" resolve="handlerClosure" />
@@ -2644,7 +2644,7 @@
                         <node concept="3clFbF" id="WJTIInSNaj" role="3cqZAp">
                           <node concept="2OqwBi" id="WJTIInSNak" role="3clFbG">
                             <node concept="37vLTw" id="WJTIInSNal" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKK7" />
+                              <ref role="3cqZAo" node="6E5fMGvfKK7" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="WJTIInTo6K" role="2OqNvi">
                               <ref role="37wK5l" to="x5bw:WJTIInTj5R" resolve="extendsClosure" />
@@ -2715,7 +2715,7 @@
                         <node concept="3clFbF" id="3MFPGC4UM7T" role="3cqZAp">
                           <node concept="2OqwBi" id="3MFPGC4UMl5" role="3clFbG">
                             <node concept="37vLTw" id="3MFPGC4UM7S" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKK9" />
+                              <ref role="3cqZAo" node="6E5fMGvfKK9" resolve="it" />
                             </node>
                             <node concept="I4A8Y" id="3MFPGC4UM_p" role="2OqNvi" />
                           </node>
@@ -2752,7 +2752,7 @@
                     <node concept="3clFbF" id="3MFPGC4UR7y" role="3cqZAp">
                       <node concept="2OqwBi" id="3MFPGC4UR7z" role="3clFbG">
                         <node concept="37vLTw" id="3MFPGC4UR7$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKKb" />
+                          <ref role="3cqZAo" node="6E5fMGvfKKb" resolve="m" />
                         </node>
                         <node concept="2RRcyG" id="3MFPGC4UR7_" role="2OqNvi">
                           <node concept="chp4Y" id="30mNApUi$Jl" role="3MHsoP">
@@ -2790,7 +2790,7 @@
                       <node concept="3clFbF" id="WJTIInRGxY" role="3cqZAp">
                         <node concept="2OqwBi" id="WJTIInRGJp" role="3clFbG">
                           <node concept="37vLTw" id="WJTIInRGxX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKKd" />
+                            <ref role="3cqZAo" node="6E5fMGvfKKd" resolve="m" />
                           </node>
                           <node concept="2RRcyG" id="WJTIInRGWM" role="2OqNvi">
                             <node concept="chp4Y" id="30mNApUi$Jm" role="3MHsoP">
@@ -3749,7 +3749,7 @@
                         <node concept="3clFbF" id="WJTIInUW0Q" role="3cqZAp">
                           <node concept="2OqwBi" id="WJTIInUWj9" role="3clFbG">
                             <node concept="37vLTw" id="WJTIInUW0P" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKKf" />
+                              <ref role="3cqZAo" node="6E5fMGvfKKf" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="WJTIInUWAh" role="2OqNvi">
                               <node concept="1xMEDy" id="WJTIInUWAj" role="1xVPHs">
@@ -3910,7 +3910,7 @@
                             <node concept="3clFbF" id="6E2cNiboVpE" role="3cqZAp">
                               <node concept="2OqwBi" id="6E2cNiboWrN" role="3clFbG">
                                 <node concept="37vLTw" id="6E2cNiboVpD" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKKh" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKKh" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="6E2cNiboXem" role="2OqNvi">
                                   <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
@@ -4153,7 +4153,7 @@
                                       <node concept="1rXfSq" id="6u6$XO9g_G4" role="3fr31v">
                                         <ref role="37wK5l" node="6u6$XO9fIWb" resolve="isKept" />
                                         <node concept="37vLTw" id="6u6$XO9gAo4" role="37wK5m">
-                                          <ref role="3cqZAo" node="6E5fMGvfKKj" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKKj" resolve="ctr" />
                                         </node>
                                       </node>
                                     </node>
@@ -4162,7 +4162,7 @@
                                         <ref role="3cqZAo" node="6u6$XO9fYrX" resolve="isPrincipal" />
                                       </node>
                                       <node concept="37vLTw" id="6u6$XO9g$_g" role="2SgHGx">
-                                        <ref role="3cqZAo" node="6E5fMGvfKKj" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKKj" resolve="ctr" />
                                       </node>
                                     </node>
                                   </node>
@@ -4228,7 +4228,7 @@
                   <node concept="3clFbF" id="7ebSZkq0pzp" role="3cqZAp">
                     <node concept="2OqwBi" id="7ebSZkq0pzq" role="3clFbG">
                       <node concept="37vLTw" id="7ebSZkq0pzr" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKKl" />
+                        <ref role="3cqZAo" node="6E5fMGvfKKl" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="7ebSZkq0pzs" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
@@ -4274,7 +4274,7 @@
                     <node concept="1rXfSq" id="6u6$XO9feLU" role="3clFbG">
                       <ref role="37wK5l" node="6u6$XO9f52R" resolve="hasTemplateInput" />
                       <node concept="37vLTw" id="6u6$XO9ffzg" role="37wK5m">
-                        <ref role="3cqZAo" node="6E5fMGvfKKn" />
+                        <ref role="3cqZAo" node="6E5fMGvfKKn" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -4406,7 +4406,7 @@
                   <node concept="3clFbF" id="WJTIInTBBh" role="3cqZAp">
                     <node concept="2OqwBi" id="WJTIInUac6" role="3clFbG">
                       <node concept="37vLTw" id="WJTIInU9Sl" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKKp" />
+                        <ref role="3cqZAo" node="6E5fMGvfKKp" resolve="it" />
                       </node>
                       <node concept="3Tsc0h" id="WJTIInUagM" role="2OqNvi">
                         <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
@@ -4453,7 +4453,7 @@
                   <node concept="3clFbF" id="1$LYeHxziwe" role="3cqZAp">
                     <node concept="2OqwBi" id="1$LYeHxziwf" role="3clFbG">
                       <node concept="37vLTw" id="1$LYeHxziwg" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKKr" />
+                        <ref role="3cqZAo" node="6E5fMGvfKKr" resolve="it" />
                       </node>
                       <node concept="2Rf3mk" id="1$LYeHxziwh" role="2OqNvi">
                         <node concept="1xMEDy" id="1$LYeHxziwi" role="1xVPHs">
@@ -4502,7 +4502,7 @@
                   <node concept="3clFbF" id="1$LYeHxzwpB" role="3cqZAp">
                     <node concept="2OqwBi" id="1$LYeHxzwpC" role="3clFbG">
                       <node concept="37vLTw" id="1$LYeHxzwpD" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKKt" />
+                        <ref role="3cqZAo" node="6E5fMGvfKKt" resolve="it" />
                       </node>
                       <node concept="2Rf3mk" id="1$LYeHxzwpE" role="2OqNvi">
                         <node concept="1xMEDy" id="1$LYeHxzwpF" role="1xVPHs">
@@ -4713,7 +4713,7 @@
                           <node concept="3clFbF" id="6E2cNibpeNt" role="3cqZAp">
                             <node concept="2OqwBi" id="6E2cNibpfxE" role="3clFbG">
                               <node concept="37vLTw" id="6E2cNibpeNs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKKv" />
+                                <ref role="3cqZAo" node="6E5fMGvfKKv" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="6E2cNibpfS3" role="2OqNvi">
                                 <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
@@ -4736,7 +4736,7 @@
                         <node concept="2OqwBi" id="2Ap6smyZWJ" role="3clFbG">
                           <node concept="2OqwBi" id="2Ap6smyXvx" role="2Oq$k0">
                             <node concept="37vLTw" id="2Ap6smyXc5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKKx" />
+                              <ref role="3cqZAo" node="6E5fMGvfKKx" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2Ap6smyXXP" role="2OqNvi">
                               <ref role="3Tt5mk" to="wq2x:20Ay2VegCfd" resolve="logic" />
@@ -4985,7 +4985,7 @@
                     <node concept="3clFbF" id="2NnDL4G7TO1" role="3cqZAp">
                       <node concept="2OqwBi" id="2NnDL4G7U2l" role="3clFbG">
                         <node concept="37vLTw" id="2NnDL4G7TO0" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKKz" />
+                          <ref role="3cqZAo" node="6E5fMGvfKKz" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="2NnDL4G7Uju" role="2OqNvi">
                           <node concept="1xMEDy" id="2NnDL4G7Ujw" role="1xVPHs">
@@ -5077,7 +5077,7 @@
                       <node concept="1rXfSq" id="2NnDL4G7NQF" role="3clFbG">
                         <ref role="37wK5l" node="7qe1GumCPHi" resolve="isNonLocal" />
                         <node concept="37vLTw" id="2NnDL4G7Ou4" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKK_" />
+                          <ref role="3cqZAo" node="6E5fMGvfKK_" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -5099,7 +5099,7 @@
                     <node concept="1rXfSq" id="2NnDL4G7Zr$" role="3clFbG">
                       <ref role="37wK5l" node="7qe1GumJo4T" resolve="markAffected" />
                       <node concept="37vLTw" id="2NnDL4G80wh" role="37wK5m">
-                        <ref role="3cqZAo" node="6E5fMGvfKKB" />
+                        <ref role="3cqZAo" node="6E5fMGvfKKB" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -5237,7 +5237,7 @@
                             <ref role="3cqZAo" node="2NnDL4G80G9" resolve="representative" />
                           </node>
                           <node concept="37vLTw" id="2NnDL4G8HdP" role="37wK5m">
-                            <ref role="3cqZAo" node="6E5fMGvfKKD" />
+                            <ref role="3cqZAo" node="6E5fMGvfKKD" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -5836,7 +5836,7 @@
                         <node concept="1rXfSq" id="2NnDL4G9n5N" role="3clFbG">
                           <ref role="37wK5l" node="7qe1GumJo4T" resolve="markAffected" />
                           <node concept="37vLTw" id="2NnDL4G9o4m" role="37wK5m">
-                            <ref role="3cqZAo" node="6E5fMGvfKKF" />
+                            <ref role="3cqZAo" node="6E5fMGvfKKF" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -6436,7 +6436,7 @@
                       <node concept="3clFbF" id="2NnDL4G9Wv$" role="3cqZAp">
                         <node concept="2OqwBi" id="2NnDL4G9Wv_" role="3clFbG">
                           <node concept="37vLTw" id="2NnDL4G9WvA" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKKH" />
+                            <ref role="3cqZAo" node="6E5fMGvfKKH" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="2NnDL4G9WvB" role="2OqNvi">
                             <node concept="1xMEDy" id="2NnDL4G9WvC" role="1xVPHs">
@@ -6462,7 +6462,7 @@
                       <node concept="1rXfSq" id="2NnDL4Gb9yG" role="3clFbG">
                         <ref role="37wK5l" node="2NnDL4G9Wzf" resolve="isPrincipalRule" />
                         <node concept="37vLTw" id="2NnDL4Gb9OK" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKKJ" />
+                          <ref role="3cqZAo" node="6E5fMGvfKKJ" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -6489,7 +6489,7 @@
                     <node concept="1rXfSq" id="2NnDL4Gb6$2" role="3clFbG">
                       <ref role="37wK5l" node="2NnDL4G9WvM" resolve="check" />
                       <node concept="37vLTw" id="2NnDL4Gb6Dx" role="37wK5m">
-                        <ref role="3cqZAo" node="6E5fMGvfKKL" />
+                        <ref role="3cqZAo" node="6E5fMGvfKKL" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -6565,7 +6565,7 @@
                           <node concept="3clFbF" id="6E2cNibptaX" role="3cqZAp">
                             <node concept="2OqwBi" id="6E2cNibptRg" role="3clFbG">
                               <node concept="37vLTw" id="6E2cNibptaW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKKN" />
+                                <ref role="3cqZAo" node="6E5fMGvfKKN" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="6E2cNibpu_C" role="2OqNvi">
                                 <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
@@ -6587,7 +6587,7 @@
                       <node concept="3clFbF" id="2NnDL4GaiAz" role="3cqZAp">
                         <node concept="2OqwBi" id="2NnDL4GaiQJ" role="3clFbG">
                           <node concept="37vLTw" id="2NnDL4GaiAy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKKP" />
+                            <ref role="3cqZAo" node="6E5fMGvfKKP" resolve="it" />
                           </node>
                           <node concept="2Rf3mk" id="2NnDL4Gaj7D" role="2OqNvi">
                             <node concept="1xMEDy" id="2NnDL4Gaj7F" role="1xVPHs">
@@ -6614,7 +6614,7 @@
                         <ref role="37wK5l" node="2NnDL4G9Wz3" resolve="isPrincipalCtr" />
                         <node concept="2OqwBi" id="2NnDL4GamMD" role="37wK5m">
                           <node concept="37vLTw" id="2NnDL4GamcO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKKR" />
+                            <ref role="3cqZAo" node="6E5fMGvfKKR" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2NnDL4GanPJ" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
@@ -6664,7 +6664,7 @@
                         <node concept="3clFbF" id="2NnDL4GauHP" role="3cqZAp">
                           <node concept="2OqwBi" id="2NnDL4GauRb" role="3clFbG">
                             <node concept="37vLTw" id="2NnDL4GauHO" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKKT" />
+                              <ref role="3cqZAo" node="6E5fMGvfKKT" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="2NnDL4Gav1A" role="2OqNvi">
                               <node concept="1xMEDy" id="2NnDL4Gav1C" role="1xVPHs">
@@ -6727,7 +6727,7 @@
                           <node concept="liA8E" id="2NnDL4GaW44" role="2OqNvi">
                             <ref role="37wK5l" node="6V4Y$98rsJ8" resolve="hasFreeVars" />
                             <node concept="37vLTw" id="2NnDL4GaWEV" role="37wK5m">
-                              <ref role="3cqZAo" node="6E5fMGvfKKV" />
+                              <ref role="3cqZAo" node="6E5fMGvfKKV" resolve="it" />
                             </node>
                           </node>
                         </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 243f8a20..0ac35f8f 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -1499,7 +1499,7 @@
                             </node>
                             <node concept="2OqwBi" id="4nUKN9YPVPh" role="3uHU7B">
                               <node concept="37vLTw" id="4nUKN9YPVwb" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKMn" />
+                                <ref role="3cqZAo" node="6E5fMGvfKMn" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="4nUKN9YPWc3" role="2OqNvi">
                                 <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
@@ -1523,7 +1523,7 @@
                         <node concept="2OqwBi" id="4nUKN9YQ24D" role="3clFbG">
                           <node concept="2OqwBi" id="4nUKN9YQ1lE" role="2Oq$k0">
                             <node concept="37vLTw" id="4nUKN9YQ0PQ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKMp" />
+                              <ref role="3cqZAo" node="6E5fMGvfKMp" resolve="lvdc" />
                             </node>
                             <node concept="3TrEf2" id="4nUKN9YQ1HM" role="2OqNvi">
                               <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
@@ -1623,7 +1623,7 @@
                           <node concept="2OqwBi" id="ZNYugtnE_L" role="3clFbG">
                             <node concept="2OqwBi" id="ZNYugtnDKq" role="2Oq$k0">
                               <node concept="37vLTw" id="ZNYugtnDxM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKMr" />
+                                <ref role="3cqZAo" node="6E5fMGvfKMr" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="ZNYugtnE5m" role="2OqNvi">
                                 <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
@@ -1656,7 +1656,7 @@
                           <node concept="2OqwBi" id="ZNYugtnMuG" role="33vP2m">
                             <node concept="2OqwBi" id="ZNYugtnJ0R" role="2Oq$k0">
                               <node concept="37vLTw" id="ZNYugtnJ0S" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKMt" />
+                                <ref role="3cqZAo" node="6E5fMGvfKMt" resolve="tfo" />
                               </node>
                               <node concept="3TrEf2" id="ZNYugtnJ0T" role="2OqNvi">
                                 <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
@@ -1686,7 +1686,7 @@
                           </node>
                           <node concept="2OqwBi" id="ZNYugtnGHI" role="37vLTJ">
                             <node concept="37vLTw" id="ZNYugtnGqs" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKMt" />
+                              <ref role="3cqZAo" node="6E5fMGvfKMt" resolve="tfo" />
                             </node>
                             <node concept="3TrEf2" id="ZNYugtnH5y" role="2OqNvi">
                               <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
@@ -1721,7 +1721,7 @@
                           <node concept="2OqwBi" id="ZNYugtnN0X" role="3clFbG">
                             <node concept="2OqwBi" id="ZNYugtnN0Y" role="2Oq$k0">
                               <node concept="37vLTw" id="ZNYugtnN0Z" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKMv" />
+                                <ref role="3cqZAo" node="6E5fMGvfKMv" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="ZNYugtnN10" role="2OqNvi">
                                 <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
@@ -1754,7 +1754,7 @@
                           <node concept="2OqwBi" id="ZNYugtnN1b" role="33vP2m">
                             <node concept="2OqwBi" id="ZNYugtnN1c" role="2Oq$k0">
                               <node concept="37vLTw" id="ZNYugtnN1d" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKMx" />
+                                <ref role="3cqZAo" node="6E5fMGvfKMx" resolve="tfo" />
                               </node>
                               <node concept="3TrEf2" id="ZNYugtnN1e" role="2OqNvi">
                                 <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
@@ -1794,7 +1794,7 @@
                           </node>
                           <node concept="2OqwBi" id="ZNYugtnOWj" role="37vLTJ">
                             <node concept="37vLTw" id="ZNYugtnOF9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKMx" />
+                              <ref role="3cqZAo" node="6E5fMGvfKMx" resolve="tfo" />
                             </node>
                             <node concept="3TrEf2" id="ZNYugtnPld" role="2OqNvi">
                               <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
@@ -1896,7 +1896,7 @@
                                 <node concept="10Nm6u" id="ZNYugu2$kP" role="3uHU7w" />
                                 <node concept="2OqwBi" id="ZNYugu2zoW" role="3uHU7B">
                                   <node concept="37vLTw" id="ZNYugu2z3f" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKMz" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKMz" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="ZNYugu2zLJ" role="2OqNvi">
                                     <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
@@ -1907,7 +1907,7 @@
                                 <node concept="2OqwBi" id="ZNYugtSp06" role="3fr31v">
                                   <node concept="2OqwBi" id="ZNYugtSodp" role="2Oq$k0">
                                     <node concept="37vLTw" id="ZNYugtSo2a" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKMz" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKMz" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="ZNYugtSoDo" role="2OqNvi">
                                       <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
@@ -1925,7 +1925,7 @@
                               <node concept="2OqwBi" id="ZNYugtSrAI" role="3fr31v">
                                 <node concept="2OqwBi" id="ZNYugtSqO_" role="2Oq$k0">
                                   <node concept="37vLTw" id="ZNYugtSqzU" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKMz" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKMz" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="ZNYugtSrek" role="2OqNvi">
                                     <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
@@ -1964,7 +1964,7 @@
                                   <node concept="2OqwBi" id="ZNYugtSx6j" role="36biLW">
                                     <node concept="2OqwBi" id="ZNYugtSwgy" role="2Oq$k0">
                                       <node concept="37vLTw" id="ZNYugtSw0s" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKM_" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKM_" resolve="tfo" />
                                       </node>
                                       <node concept="3TrEf2" id="ZNYugtSwLL" role="2OqNvi">
                                         <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
@@ -1978,7 +1978,7 @@
                           </node>
                           <node concept="2OqwBi" id="ZNYugtStPI" role="37vLTJ">
                             <node concept="37vLTw" id="ZNYugtStyq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKM_" />
+                              <ref role="3cqZAo" node="6E5fMGvfKM_" resolve="tfo" />
                             </node>
                             <node concept="3TrEf2" id="ZNYugtSunM" role="2OqNvi">
                               <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index a7a5b7c2..f29e044a 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -386,7 +386,7 @@
                         <node concept="10Nm6u" id="4JBuioHu6Zy" role="3uHU7w" />
                         <node concept="2OqwBi" id="4JBuioHu5JB" role="3uHU7B">
                           <node concept="37vLTw" id="4JBuioHu5qx" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKM3" />
+                            <ref role="3cqZAo" node="6E5fMGvfKM3" resolve="annInst" />
                           </node>
                           <node concept="3TrEf2" id="4JBuioHu64U" role="2OqNvi">
                             <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
@@ -398,7 +398,7 @@
                           <node concept="2JrnkZ" id="4JBuioHu4qk" role="2Oq$k0">
                             <node concept="2OqwBi" id="4JBuioHu4ql" role="2JrQYb">
                               <node concept="37vLTw" id="4JBuioHu4qm" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKM3" />
+                                <ref role="3cqZAo" node="6E5fMGvfKM3" resolve="annInst" />
                               </node>
                               <node concept="3TrEf2" id="4JBuioHu4qn" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
@@ -455,7 +455,7 @@
                               <node concept="2OqwBi" id="1zN1RIls0zH" role="3clFbG">
                                 <node concept="2OqwBi" id="1zN1RIls0zI" role="2Oq$k0">
                                   <node concept="37vLTw" id="1zN1RIls0zJ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKM5" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKM5" resolve="val" />
                                   </node>
                                   <node concept="3TrEf2" id="1zN1RIls0zK" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpee:hiB70Z4" resolve="value" />
@@ -543,7 +543,7 @@
                                 <node concept="2JrnkZ" id="4cvvxaYh$3h" role="2Oq$k0">
                                   <node concept="2OqwBi" id="1zN1RIlsblY" role="2JrQYb">
                                     <node concept="37vLTw" id="1zN1RIlsblZ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKM7" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKM7" resolve="ai" />
                                     </node>
                                     <node concept="3TrEf2" id="1zN1RIlsbm0" role="2OqNvi">
                                       <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
@@ -596,7 +596,7 @@
                                   <node concept="2OqwBi" id="1zN1RIlsbIC" role="3clFbG">
                                     <node concept="2OqwBi" id="1zN1RIlsbID" role="2Oq$k0">
                                       <node concept="37vLTw" id="1zN1RIlsbIE" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKM9" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKM9" resolve="val" />
                                       </node>
                                       <node concept="3TrEf2" id="1zN1RIlsbIF" role="2OqNvi">
                                         <ref role="3Tt5mk" to="tpee:hiB70Z4" resolve="value" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
index 45c126e2..44af1309 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
@@ -258,7 +258,7 @@
                           <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="18kNIl1dMWR" role="37wK5m">
                             <node concept="37vLTw" id="18kNIl1dMWS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKMb" />
+                              <ref role="3cqZAo" node="6E5fMGvfKMb" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="18kNIl1dMWT" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -303,7 +303,7 @@
                         </node>
                         <node concept="2OqwBi" id="746Sd4ukaDR" role="3uHU7B">
                           <node concept="37vLTw" id="746Sd4ukaDS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKMd" />
+                            <ref role="3cqZAo" node="6E5fMGvfKMd" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="746Sd4ukaDT" role="2OqNvi">
                             <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
@@ -347,7 +347,7 @@
                               <node concept="3clFbC" id="18kNIl1cZZP" role="3clFbG">
                                 <node concept="2OqwBi" id="746Sd4ukhhU" role="3uHU7B">
                                   <node concept="37vLTw" id="746Sd4ukhhV" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKMf" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKMf" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="18kNIl1cZ5Q" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpee:hiB6Ojz" resolve="key" />
@@ -492,7 +492,7 @@
                           <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="18kNIl1dUkJ" role="37wK5m">
                             <node concept="37vLTw" id="18kNIl1dUkK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKMh" />
+                              <ref role="3cqZAo" node="6E5fMGvfKMh" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="18kNIl1dUkL" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -537,7 +537,7 @@
                         </node>
                         <node concept="2OqwBi" id="18kNIl18CxM" role="3uHU7B">
                           <node concept="37vLTw" id="18kNIl18CxN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKMj" />
+                            <ref role="3cqZAo" node="6E5fMGvfKMj" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="18kNIl18CxO" role="2OqNvi">
                             <ref role="3Tt5mk" to="tpee:hiAI5P0" resolve="annotation" />
@@ -583,7 +583,7 @@
                             </node>
                             <node concept="2OqwBi" id="18kNIl1e4pu" role="3uHU7B">
                               <node concept="37vLTw" id="18kNIl1e4pv" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKMl" />
+                                <ref role="3cqZAo" node="6E5fMGvfKMl" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="18kNIl1e4pw" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpee:hiB6Ojz" resolve="key" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 4b0e60bf..8ad03099 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -1577,7 +1577,7 @@
                       <node concept="2OqwBi" id="zL5ZaNMxMM" role="3clFbG">
                         <node concept="2OqwBi" id="zL5ZaNMxMN" role="2Oq$k0">
                           <node concept="37vLTw" id="zL5ZaNMxMO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKQ4" />
+                            <ref role="3cqZAo" node="6E5fMGvfKQ4" resolve="it" />
                           </node>
                           <node concept="liA8E" id="zL5ZaNMxMP" role="2OqNvi">
                             <ref role="37wK5l" to="fqlx:4MqhgXUaiLz" resolve="ruleTables" />
@@ -5415,7 +5415,7 @@
                       <node concept="3clFbF" id="7WKNeR97vRT" role="3cqZAp">
                         <node concept="2OqwBi" id="7WKNeR97vRU" role="3clFbG">
                           <node concept="37vLTw" id="7WKNeR97vRV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKQ6" />
+                            <ref role="3cqZAo" node="6E5fMGvfKQ6" resolve="it" />
                           </node>
                           <node concept="liA8E" id="7LI_gNLXJbt" role="2OqNvi">
                             <ref role="37wK5l" to="fqlx:5EDW3XF60ae" resolve="queryTables" />
@@ -5436,7 +5436,7 @@
                     <node concept="3clFbF" id="7LI_gNLXKKX" role="3cqZAp">
                       <node concept="2OqwBi" id="7LI_gNLXLki" role="3clFbG">
                         <node concept="37vLTw" id="7LI_gNLXKKW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKQ8" />
+                          <ref role="3cqZAo" node="6E5fMGvfKQ8" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7LI_gNLXLP8" role="2OqNvi">
                           <ref role="37wK5l" to="i348:tbauFy9ROe" resolve="queryTemplates" />
@@ -7525,7 +7525,7 @@
           <node concept="3cpWsn" id="4Q576RaUOoA" role="3cpWs9">
             <property role="TrG5h" value="currentSource" />
             <node concept="3uibUv" id="4Q576RaV4Yd" role="1tU5fm">
-              <ref role="3uigEE" node="39eNUjlUY05" resolve="TracedNode" />
+              <ref role="3uigEE" node="39eNUjlUY05" resolve="TemplateTraceImpl.TracedNode" />
             </node>
             <node concept="1rXfSq" id="4Q576RbagSC" role="33vP2m">
               <ref role="37wK5l" node="4Q576Rb9N55" resolve="peekSource" />
@@ -7582,7 +7582,7 @@
       </node>
       <node concept="3Tm6S6" id="4Q576RaUC44" role="1B3o_S" />
       <node concept="3uibUv" id="4Q576RaUF8n" role="3clF45">
-        <ref role="3uigEE" node="39eNUjlUY05" resolve="TracedNode" />
+        <ref role="3uigEE" node="39eNUjlUY05" resolve="TemplateTraceImpl.TracedNode" />
       </node>
       <node concept="37vLTG" id="4Q576RaUInz" role="3clF46">
         <property role="TrG5h" value="node" />
@@ -7777,7 +7777,7 @@
                 <node concept="_YKpA" id="4Q576RbaW3P" role="1tU5fm">
                   <node concept="3qUE_q" id="4Q576RbBlmD" role="_ZDj9">
                     <node concept="3uibUv" id="4Q576RbBlvW" role="3qUE_r">
-                      <ref role="3uigEE" node="39eNUjlVBcO" resolve="BaseTracePoint" />
+                      <ref role="3uigEE" node="39eNUjlVBcO" resolve="TemplateTraceImpl.BaseTracePoint" />
                     </node>
                   </node>
                 </node>
@@ -7893,7 +7893,7 @@
               <node concept="3cpWsn" id="4Q576RbaW41" role="3cpWs9">
                 <property role="TrG5h" value="source" />
                 <node concept="3uibUv" id="4Q576RbaW42" role="1tU5fm">
-                  <ref role="3uigEE" node="39eNUjlVBcO" resolve="BaseTracePoint" />
+                  <ref role="3uigEE" node="39eNUjlVBcO" resolve="TemplateTraceImpl.BaseTracePoint" />
                 </node>
                 <node concept="2OqwBi" id="4Q576RbaW43" role="33vP2m">
                   <node concept="37vLTw" id="4Q576RbaW44" role="2Oq$k0">
@@ -8148,7 +8148,7 @@
           <node concept="3cpWsn" id="4Q576RaVnnH" role="3cpWs9">
             <property role="TrG5h" value="source" />
             <node concept="3uibUv" id="4Q576RaVnnI" role="1tU5fm">
-              <ref role="3uigEE" node="39eNUjlVBcO" resolve="BaseTracePoint" />
+              <ref role="3uigEE" node="39eNUjlVBcO" resolve="TemplateTraceImpl.BaseTracePoint" />
             </node>
             <node concept="1rXfSq" id="4Q576RaVocr" role="33vP2m">
               <ref role="37wK5l" node="4Q576RaUFqs" resolve="ensureSourceFor" />
@@ -8278,7 +8278,7 @@
                   <ref role="37wK5l" node="6YRY30_KxAD" resolve="totalChildren" />
                   <node concept="Rm8GO" id="6YRY30_K$cT" role="37wK5m">
                     <ref role="Rm8GQ" node="4Q576Rbj$_2" resolve="Node" />
-                    <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="PointKind" />
+                    <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
                   </node>
                 </node>
               </node>
@@ -8300,7 +8300,7 @@
                   <ref role="37wK5l" node="6YRY30_KxAD" resolve="totalChildren" />
                   <node concept="Rm8GO" id="6YRY30_K$Tj" role="37wK5m">
                     <ref role="Rm8GQ" node="4Q576RbjAsm" resolve="Template" />
-                    <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="PointKind" />
+                    <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
                   </node>
                 </node>
               </node>
@@ -8324,7 +8324,7 @@
             <node concept="3KbdKl" id="6YRY30_KEUg" role="3KbHQx">
               <node concept="Rm8GO" id="6YRY30_KEUh" role="3Kbmr1">
                 <ref role="Rm8GQ" node="4Q576Rbj$_2" resolve="Node" />
-                <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="PointKind" />
+                <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
               </node>
               <node concept="3clFbS" id="6YRY30_KEUi" role="3Kbo56">
                 <node concept="3clFbF" id="6YRY30_KFQ6" role="3cqZAp">
@@ -8342,7 +8342,7 @@
             <node concept="3KbdKl" id="6YRY30_KEUl" role="3KbHQx">
               <node concept="Rm8GO" id="6YRY30_KEUm" role="3Kbmr1">
                 <ref role="Rm8GQ" node="4Q576RbjAsm" resolve="Template" />
-                <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="PointKind" />
+                <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
               </node>
               <node concept="3clFbS" id="6YRY30_KEUn" role="3Kbo56">
                 <node concept="3clFbF" id="6YRY30_KGu$" role="3cqZAp">
@@ -8393,7 +8393,7 @@
         <node concept="3Tm1VV" id="799SgOKzZfZ" role="1B3o_S" />
         <node concept="_YKpA" id="6YRY30_JFon" role="3clF45">
           <node concept="3uibUv" id="6YRY30_JFop" role="_ZDj9">
-            <ref role="3uigEE" node="4tC1JBnl0fF" resolve="TracePoint" />
+            <ref role="3uigEE" node="4tC1JBnl0fF" resolve="TemplateTrace.TracePoint" />
           </node>
         </node>
         <node concept="2AHcQZ" id="4Q576RaXbvD" role="2AJF6D">
@@ -8406,7 +8406,7 @@
         <node concept="37vLTG" id="6YRY30_Kig3" role="3clF46">
           <property role="TrG5h" value="kind" />
           <node concept="3uibUv" id="6YRY30_KisF" role="1tU5fm">
-            <ref role="3uigEE" node="4Q576Rbjy_X" resolve="PointKind" />
+            <ref role="3uigEE" node="4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
           </node>
         </node>
         <node concept="3clFbS" id="6YRY30_KhuB" role="3clF47">
@@ -8417,7 +8417,7 @@
             <node concept="3KbdKl" id="6YRY30_K_xW" role="3KbHQx">
               <node concept="Rm8GO" id="6YRY30_KAbJ" role="3Kbmr1">
                 <ref role="Rm8GQ" node="4Q576Rbj$_2" resolve="Node" />
-                <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="PointKind" />
+                <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
               </node>
               <node concept="3clFbS" id="6YRY30_KAr3" role="3Kbo56">
                 <node concept="3cpWs6" id="6YRY30_KAwI" role="3cqZAp">
@@ -8430,7 +8430,7 @@
             <node concept="3KbdKl" id="6YRY30_KAJJ" role="3KbHQx">
               <node concept="Rm8GO" id="6YRY30_KB1$" role="3Kbmr1">
                 <ref role="Rm8GQ" node="4Q576RbjAsm" resolve="Template" />
-                <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="PointKind" />
+                <ref role="1Px2BO" node="4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
               </node>
               <node concept="3clFbS" id="6YRY30_KAJL" role="3Kbo56">
                 <node concept="3cpWs6" id="6YRY30_KAJM" role="3cqZAp">
@@ -8481,7 +8481,7 @@
             <node concept="3fqX7Q" id="39eNUjlVkTO" role="3clFbw">
               <node concept="2ZW3vV" id="39eNUjlVgKV" role="3fr31v">
                 <node concept="3uibUv" id="39eNUjlVJaD" role="2ZW6by">
-                  <ref role="3uigEE" node="39eNUjlVBcO" resolve="BaseTracePoint" />
+                  <ref role="3uigEE" node="39eNUjlVBcO" resolve="TemplateTraceImpl.BaseTracePoint" />
                 </node>
                 <node concept="37vLTw" id="39eNUjlVuTb" role="2ZW6bz">
                   <ref role="3cqZAo" node="39eNUjlVaaB" resolve="obj" />
@@ -8498,7 +8498,7 @@
             <node concept="3cpWsn" id="39eNUjlW_bn" role="3cpWs9">
               <property role="TrG5h" value="other" />
               <node concept="3uibUv" id="39eNUjlW_bo" role="1tU5fm">
-                <ref role="3uigEE" node="39eNUjlVBcO" resolve="BaseTracePoint" />
+                <ref role="3uigEE" node="39eNUjlVBcO" resolve="TemplateTraceImpl.BaseTracePoint" />
               </node>
               <node concept="1eOMI4" id="39eNUjlVxu_" role="33vP2m">
                 <node concept="10QFUN" id="39eNUjlVqJK" role="1eOMHV">
@@ -8506,7 +8506,7 @@
                     <ref role="3cqZAo" node="39eNUjlVaaB" resolve="obj" />
                   </node>
                   <node concept="3uibUv" id="39eNUjlVJ1A" role="10QFUM">
-                    <ref role="3uigEE" node="39eNUjlVBcO" resolve="BaseTracePoint" />
+                    <ref role="3uigEE" node="39eNUjlVBcO" resolve="TemplateTraceImpl.BaseTracePoint" />
                   </node>
                 </node>
               </node>
@@ -9191,7 +9191,7 @@
       <node concept="2tJIrI" id="4tC1JBnlHJX" role="jymVt" />
       <node concept="3Tm6S6" id="39eNUjlUXP6" role="1B3o_S" />
       <node concept="3uibUv" id="39eNUjlVK2w" role="1zkMxy">
-        <ref role="3uigEE" node="39eNUjlVBcO" resolve="BaseTracePoint" />
+        <ref role="3uigEE" node="39eNUjlVBcO" resolve="TemplateTraceImpl.BaseTracePoint" />
       </node>
       <node concept="3clFb_" id="4tC1JBnlIkK" role="jymVt">
         <property role="TrG5h" value="presentation" />
@@ -9415,7 +9415,7 @@
                                 <node concept="10QFUN" id="3YPJJpIenJ1" role="3clFbG">
                                   <node concept="2OqwBi" id="3YPJJpIenIY" role="10QFUP">
                                     <node concept="37vLTw" id="3YPJJpIenIZ" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKQa" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKQa" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="3YPJJpIenJ0" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
@@ -9552,7 +9552,7 @@
       <node concept="2tJIrI" id="4tC1JBnlEYD" role="jymVt" />
       <node concept="3Tm6S6" id="39eNUjlVL03" role="1B3o_S" />
       <node concept="3uibUv" id="39eNUjlVL04" role="1zkMxy">
-        <ref role="3uigEE" node="39eNUjlVBcO" resolve="BaseTracePoint" />
+        <ref role="3uigEE" node="39eNUjlVBcO" resolve="TemplateTraceImpl.BaseTracePoint" />
       </node>
       <node concept="3clFb_" id="4tC1JBnlFDK" role="jymVt">
         <property role="TrG5h" value="presentation" />
@@ -9755,7 +9755,7 @@
         <node concept="3Tm1VV" id="4Q576RaXgk2" role="1B3o_S" />
         <node concept="_YKpA" id="6YRY30_JElW" role="3clF45">
           <node concept="3uibUv" id="6YRY30_JElY" role="_ZDj9">
-            <ref role="3uigEE" node="4tC1JBnl0fF" resolve="TracePoint" />
+            <ref role="3uigEE" node="4tC1JBnl0fF" resolve="TemplateTrace.TracePoint" />
           </node>
         </node>
         <node concept="2AHcQZ" id="4Q576RaXh36" role="2AJF6D">
@@ -9767,7 +9767,7 @@
         <node concept="37vLTG" id="6YRY30_KyuQ" role="3clF46">
           <property role="TrG5h" value="kind" />
           <node concept="3uibUv" id="6YRY30_KyzJ" role="1tU5fm">
-            <ref role="3uigEE" node="4Q576Rbjy_X" resolve="PointKind" />
+            <ref role="3uigEE" node="4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
           </node>
         </node>
         <node concept="10Oyi0" id="6YRY30_KxHf" role="3clF45" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 7df85051..18b6f396 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -760,7 +760,7 @@
                       <node concept="2OqwBi" id="zL5ZaNMxMM" role="3clFbG">
                         <node concept="2OqwBi" id="zL5ZaNMxMN" role="2Oq$k0">
                           <node concept="37vLTw" id="zL5ZaNMxMO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKQe" />
+                            <ref role="3cqZAo" node="6E5fMGvfKQe" resolve="it" />
                           </node>
                           <node concept="liA8E" id="zL5ZaNMxMP" role="2OqNvi">
                             <ref role="37wK5l" to="fqlx:4MqhgXUaiLz" resolve="ruleTables" />
@@ -2422,7 +2422,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="4baZKvb6gnK" role="0kSFX">
                                   <node concept="37vLTw" id="4baZKvb6gnL" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKQg" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKQg" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="4baZKvb6gnM" role="2OqNvi">
                                     <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
@@ -2665,7 +2665,7 @@
                             </node>
                             <node concept="2OqwBi" id="4baZKvb26tk" role="0kSFX">
                               <node concept="37vLTw" id="4baZKvb26tl" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKQi" />
+                                <ref role="3cqZAo" node="6E5fMGvfKQi" resolve="it" />
                               </node>
                               <node concept="liA8E" id="4baZKvb26tm" role="2OqNvi">
                                 <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
@@ -2806,7 +2806,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="6tXRJZa$Adp" role="0kSFX">
                                           <node concept="37vLTw" id="6tXRJZa$Adq" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6E5fMGvfKQk" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKQk" resolve="it" />
                                           </node>
                                           <node concept="liA8E" id="6tXRJZa$Adr" role="2OqNvi">
                                             <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
@@ -5072,7 +5072,7 @@
                       <node concept="3clFbF" id="42eP3ws2S9m" role="3cqZAp">
                         <node concept="2OqwBi" id="42eP3ws2Txp" role="3clFbG">
                           <node concept="37vLTw" id="42eP3ws2S9l" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKQm" />
+                            <ref role="3cqZAo" node="6E5fMGvfKQm" resolve="it" />
                           </node>
                           <node concept="iZEcu" id="42eP3ws2UQq" role="2OqNvi" />
                         </node>
@@ -5200,7 +5200,7 @@
                                     <ref role="3uigEE" to="w1kc:~DynamicReference" resolve="DynamicReference" />
                                   </node>
                                   <node concept="37vLTw" id="1T5MAgP1sPF" role="2ZW6bz">
-                                    <ref role="3cqZAo" node="6E5fMGvfKQo" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKQo" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -5228,7 +5228,7 @@
                             <node concept="2OqwBi" id="3Tm1CT$yzT4" role="3uHU7B">
                               <node concept="2OqwBi" id="3Tm1CT$ywn2" role="2Oq$k0">
                                 <node concept="37vLTw" id="3Tm1CT$yvM2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKQq" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKQq" resolve="it" />
                                 </node>
                                 <node concept="2ZHEkA" id="3Tm1CT$yyTr" role="2OqNvi" />
                               </node>
@@ -5251,7 +5251,7 @@
                         <node concept="2OqwBi" id="3Tm1CT$wHhD" role="3clFbG">
                           <node concept="2OqwBi" id="3Tm1CT$wHhE" role="2Oq$k0">
                             <node concept="37vLTw" id="3Tm1CT$wHhF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKQs" />
+                              <ref role="3cqZAo" node="6E5fMGvfKQs" resolve="it" />
                             </node>
                             <node concept="2ZHEkA" id="3Tm1CT$wHhG" role="2OqNvi" />
                           </node>
@@ -10107,7 +10107,7 @@
                                   <ref role="37wK5l" node="6nFpYluRAm8" resolve="isOrigin" />
                                   <node concept="2OqwBi" id="61G6TdDTMol" role="37wK5m">
                                     <node concept="37vLTw" id="61G6TdDTMom" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKQu" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKQu" resolve="it" />
                                     </node>
                                     <node concept="iZEcu" id="61G6TdDTMon" role="2OqNvi" />
                                   </node>
@@ -12367,7 +12367,7 @@
                                 </node>
                                 <node concept="3JPx81" id="3DPJ8QJ029V" role="2OqNvi">
                                   <node concept="37vLTw" id="3DPJ8QJ02px" role="25WWJ7">
-                                    <ref role="3cqZAo" node="6E5fMGvfKQw" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKQw" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -12425,7 +12425,7 @@
                                     <node concept="3clFbF" id="51ek2rQMIZ_" role="3cqZAp">
                                       <node concept="2OqwBi" id="51ek2rQMIZA" role="3clFbG">
                                         <node concept="37vLTw" id="51ek2rQMIZB" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6E5fMGvfKQy" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKQy" resolve="it" />
                                         </node>
                                         <node concept="Vyspw" id="51ek2rQMIZC" role="2OqNvi">
                                           <node concept="37vLTw" id="51ek2rQMIZD" role="Vysub">
@@ -12459,7 +12459,7 @@
                                     </node>
                                     <node concept="3JPx81" id="51ek2rQMIZQ" role="2OqNvi">
                                       <node concept="37vLTw" id="51ek2rQMIZR" role="25WWJ7">
-                                        <ref role="3cqZAo" node="6E5fMGvfKQ$" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKQ$" resolve="it" />
                                       </node>
                                     </node>
                                   </node>
@@ -12966,7 +12966,7 @@
                         </node>
                         <node concept="2JrnkZ" id="6PD9XvnQH$5" role="2Oq$k0">
                           <node concept="37vLTw" id="3GLv42NdYKf" role="2JrQYb">
-                            <ref role="3cqZAo" node="6E5fMGvfKQA" />
+                            <ref role="3cqZAo" node="6E5fMGvfKQA" resolve="m" />
                           </node>
                         </node>
                       </node>
@@ -12979,7 +12979,7 @@
                         </node>
                         <node concept="2JrnkZ" id="6PD9XvnQH16" role="2Oq$k0">
                           <node concept="37vLTw" id="3GLv42NdYRU" role="2JrQYb">
-                            <ref role="3cqZAo" node="6E5fMGvfKQA" />
+                            <ref role="3cqZAo" node="6E5fMGvfKQA" resolve="m" />
                           </node>
                         </node>
                       </node>
@@ -13019,7 +13019,7 @@
                         </node>
                         <node concept="2JrnkZ" id="3GLv42Ne9YN" role="2Oq$k0">
                           <node concept="37vLTw" id="3GLv42NebhA" role="2JrQYb">
-                            <ref role="3cqZAo" node="6E5fMGvfKQC" />
+                            <ref role="3cqZAo" node="6E5fMGvfKQC" resolve="m" />
                           </node>
                         </node>
                       </node>
@@ -13083,7 +13083,7 @@
                         </node>
                         <node concept="2JrnkZ" id="3GLv42NebOe" role="2Oq$k0">
                           <node concept="37vLTw" id="3GLv42Nedcu" role="2JrQYb">
-                            <ref role="3cqZAo" node="6E5fMGvfKQE" />
+                            <ref role="3cqZAo" node="6E5fMGvfKQE" resolve="m" />
                           </node>
                         </node>
                       </node>
@@ -14734,7 +14734,7 @@
                         <node concept="3clFbF" id="IfzMHGfK2N" role="3cqZAp">
                           <node concept="2OqwBi" id="IfzMHGfK2O" role="3clFbG">
                             <node concept="37vLTw" id="IfzMHGfK2P" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKQG" />
+                              <ref role="3cqZAo" node="6E5fMGvfKQG" resolve="it" />
                             </node>
                             <node concept="2OwXpG" id="IfzMHGfK2Q" role="2OqNvi">
                               <ref role="2Oxat5" node="IfzMHGfK5U" resolve="priority" />
@@ -14757,7 +14757,7 @@
                         <node concept="2OqwBi" id="IfzMHGfK2Y" role="3clFbG">
                           <node concept="2OqwBi" id="IfzMHGfK2Z" role="2Oq$k0">
                             <node concept="37vLTw" id="IfzMHGfK30" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKQI" />
+                              <ref role="3cqZAo" node="6E5fMGvfKQI" resolve="it" />
                             </node>
                             <node concept="2OwXpG" id="IfzMHGfK31" role="2OqNvi">
                               <ref role="2Oxat5" node="IfzMHGfK5K" resolve="ruleTemplateTable" />
@@ -14954,7 +14954,7 @@
                     <node concept="3clFbF" id="IfzMHGfK4k" role="3cqZAp">
                       <node concept="2OqwBi" id="IfzMHGfK4l" role="3clFbG">
                         <node concept="37vLTw" id="IfzMHGfK4m" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKQK" />
+                          <ref role="3cqZAo" node="6E5fMGvfKQK" resolve="it" />
                         </node>
                         <node concept="2OwXpG" id="IfzMHGfK4n" role="2OqNvi">
                           <ref role="2Oxat5" node="IfzMHGfK5K" resolve="ruleTemplateTable" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps
index 7d776b2f..3be2f23d 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps
@@ -283,7 +283,7 @@
                       </node>
                       <node concept="2OqwBi" id="7mIqwW45MOj" role="3uHU7B">
                         <node concept="37vLTw" id="7mIqwW45MOk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKN5" />
+                          <ref role="3cqZAo" node="6E5fMGvfKN5" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="7mIqwW45MOl" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -338,7 +338,7 @@
                       </node>
                       <node concept="2OqwBi" id="7mIqwW45MJp" role="3uHU7B">
                         <node concept="37vLTw" id="7mIqwW45MJq" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKN7" />
+                          <ref role="3cqZAo" node="6E5fMGvfKN7" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="7mIqwW45MJr" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -496,7 +496,7 @@
                         </node>
                         <node concept="2OqwBi" id="7mIqwW45N3x" role="3uHU7B">
                           <node concept="37vLTw" id="7mIqwW45N3y" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKN9" />
+                            <ref role="3cqZAo" node="6E5fMGvfKN9" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="7mIqwW45N3z" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -655,7 +655,7 @@
                         </node>
                         <node concept="2OqwBi" id="7mIqwW45Qp1" role="3uHU7B">
                           <node concept="37vLTw" id="7mIqwW45Qp2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKNb" />
+                            <ref role="3cqZAo" node="6E5fMGvfKNb" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="7mIqwW45Qp3" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index 97e1ce20..43023284 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -690,7 +690,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="4APe_wK_yYl" role="3uHU7B">
                                               <node concept="37vLTw" id="4APe_wK_yYm" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6E5fMGvfKNd" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKNd" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="4APe_wK_yYn" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -832,7 +832,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="4APe_wKs1QX" role="3uHU7B">
                                               <node concept="37vLTw" id="4APe_wKs1QY" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6E5fMGvfKNf" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKNf" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="4APe_wKs1QZ" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -993,7 +993,7 @@
                                             </node>
                                             <node concept="2OqwBi" id="4APe_wKs3_J" role="3uHU7B">
                                               <node concept="37vLTw" id="4APe_wKs3_K" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6E5fMGvfKNh" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKNh" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="4APe_wKs3_L" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1985,7 +1985,7 @@
                         <node concept="3clFbF" id="2CPBoD_JTDF" role="3cqZAp">
                           <node concept="2OqwBi" id="2CPBoD_JTQt" role="3clFbG">
                             <node concept="37vLTw" id="2CPBoD_JTDE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKNj" />
+                              <ref role="3cqZAo" node="6E5fMGvfKNj" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="2CPBoD_JUL6" role="2OqNvi">
                               <ref role="3Tt5mk" to="zfi7:6wBZuQUG3fi" resolve="builder" />
@@ -2379,7 +2379,7 @@
                                                   </node>
                                                   <node concept="2OqwBi" id="4APe_wKp$cy" role="3uHU7B">
                                                     <node concept="37vLTw" id="4APe_wKpxT3" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="6E5fMGvfKNl" />
+                                                      <ref role="3cqZAo" node="6E5fMGvfKNl" resolve="it" />
                                                     </node>
                                                     <node concept="3TrcHB" id="4APe_wKp$sQ" role="2OqNvi">
                                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2503,7 +2503,7 @@
                                                   </node>
                                                   <node concept="2OqwBi" id="4APe_wKpDJi" role="3uHU7B">
                                                     <node concept="37vLTw" id="4APe_wKpDJj" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="6E5fMGvfKNn" />
+                                                      <ref role="3cqZAo" node="6E5fMGvfKNn" resolve="it" />
                                                     </node>
                                                     <node concept="3TrcHB" id="4APe_wKpDJk" role="2OqNvi">
                                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2602,7 +2602,7 @@
                                                   </node>
                                                   <node concept="2OqwBi" id="4APe_wKpEnZ" role="3uHU7B">
                                                     <node concept="37vLTw" id="4APe_wKpEo0" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="6E5fMGvfKNp" />
+                                                      <ref role="3cqZAo" node="6E5fMGvfKNp" resolve="it" />
                                                     </node>
                                                     <node concept="3TrcHB" id="4APe_wKpEo1" role="2OqNvi">
                                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2999,7 +2999,7 @@
                                       <ref role="cht4Q" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
                                     </node>
                                     <node concept="37vLTw" id="4APe_wKj9gT" role="1m5AlR">
-                                      <ref role="3cqZAo" node="6E5fMGvfKNr" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKNr" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -3086,7 +3086,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="4APe_wKqzSL" role="3uHU7B">
                                                 <node concept="37vLTw" id="4APe_wKqzSM" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6E5fMGvfKNt" />
+                                                  <ref role="3cqZAo" node="6E5fMGvfKNt" resolve="it" />
                                                 </node>
                                                 <node concept="3TrcHB" id="4APe_wKqzSN" role="2OqNvi">
                                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3157,7 +3157,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="4APe_wKqChk" role="3uHU7B">
                                                 <node concept="37vLTw" id="4APe_wKqChl" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6E5fMGvfKNv" />
+                                                  <ref role="3cqZAo" node="6E5fMGvfKNv" resolve="it" />
                                                 </node>
                                                 <node concept="3TrcHB" id="4APe_wKqChm" role="2OqNvi">
                                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3280,7 +3280,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="4APe_wKqBu_" role="3uHU7B">
                                                 <node concept="37vLTw" id="4APe_wKqBuA" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6E5fMGvfKNx" />
+                                                  <ref role="3cqZAo" node="6E5fMGvfKNx" resolve="it" />
                                                 </node>
                                                 <node concept="3TrcHB" id="4APe_wKqBuB" role="2OqNvi">
                                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3351,7 +3351,7 @@
                                               </node>
                                               <node concept="2OqwBi" id="4APe_wKqCTj" role="3uHU7B">
                                                 <node concept="37vLTw" id="4APe_wKqCTk" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6E5fMGvfKNz" />
+                                                  <ref role="3cqZAo" node="6E5fMGvfKNz" resolve="it" />
                                                 </node>
                                                 <node concept="3TrcHB" id="4APe_wKqCTl" role="2OqNvi">
                                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3460,7 +3460,7 @@
                               <node concept="3clFbF" id="4APe_wKhNYI" role="3cqZAp">
                                 <node concept="2OqwBi" id="4APe_wKhOgh" role="3clFbG">
                                   <node concept="37vLTw" id="4APe_wKhNYH" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKN_" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKN_" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="4APe_wKhP1n" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
@@ -3502,7 +3502,7 @@
                               <node concept="3clFbF" id="4APe_wKhQRa" role="3cqZAp">
                                 <node concept="2OqwBi" id="4APe_wKhQRb" role="3clFbG">
                                   <node concept="37vLTw" id="4APe_wKhQRc" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKNB" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKNB" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="4APe_wKhQRd" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
@@ -3544,7 +3544,7 @@
                               <node concept="3clFbF" id="4APe_wKhSEB" role="3cqZAp">
                                 <node concept="2OqwBi" id="4APe_wKhSEC" role="3clFbG">
                                   <node concept="37vLTw" id="4APe_wKhSED" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKND" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKND" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="4APe_wKhSEE" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
index acf5e7d3..311a6216 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
@@ -51,7 +51,6 @@
         <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
         <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
index 5f8fcbc7..d372244a 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
@@ -258,7 +258,7 @@
                           <node concept="2OqwBi" id="1vAI4X$N8Ti" role="3clFbG">
                             <node concept="2OqwBi" id="1vAI4X$N8Tj" role="2Oq$k0">
                               <node concept="37vLTw" id="1vAI4X$N8Tk" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKN1" />
+                                <ref role="3cqZAo" node="6E5fMGvfKN1" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="1vAI4X$N8Tl" role="2OqNvi">
                                 <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
@@ -267,7 +267,7 @@
                             <node concept="3QWeyG" id="1vAI4X$N8Tm" role="2OqNvi">
                               <node concept="2OqwBi" id="1vAI4X$N8Tn" role="576Qk">
                                 <node concept="37vLTw" id="1vAI4X$N8To" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKN1" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKN1" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="1vAI4X$N8Tp" role="2OqNvi">
                                   <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="allChildFeatures" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps
index b84b913f..8ec16f08 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps
@@ -297,7 +297,7 @@
                                       <node concept="2OqwBi" id="C1f6iDYzqH" role="3clFbG">
                                         <node concept="2OqwBi" id="C1f6iDYzqI" role="2Oq$k0">
                                           <node concept="37vLTw" id="C1f6iDYzqJ" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6E5fMGvfKN3" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKN3" resolve="it" />
                                           </node>
                                           <node concept="liA8E" id="C1f6iDYzqK" role="2OqNvi">
                                             <ref role="37wK5l" to="c17a:~SLanguage.getSourceModuleReference()" resolve="getSourceModuleReference" />
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index bdfe8263..d44bda69 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -534,7 +534,7 @@
                               <node concept="3clFbF" id="1RYTbd66z3G" role="3cqZAp">
                                 <node concept="2OqwBi" id="1RYTbd66z3H" role="3clFbG">
                                   <node concept="37vLTw" id="1RYTbd66z3I" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKNP" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKNP" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="1RYTbd66z3J" role="2OqNvi">
                                     <node concept="chp4Y" id="1RYTbd66z3K" role="cj9EA">
@@ -566,7 +566,7 @@
                                   <node concept="3fqX7Q" id="1RYTbd66z3W" role="3clFbG">
                                     <node concept="2OqwBi" id="1RYTbd66z3X" role="3fr31v">
                                       <node concept="37vLTw" id="1RYTbd66z3Y" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKNR" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKNR" resolve="it" />
                                       </node>
                                       <node concept="1mIQ4w" id="1RYTbd66z3Z" role="2OqNvi">
                                         <node concept="chp4Y" id="1RYTbd66z40" role="cj9EA">
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 9b8e8b7a..b7f590cb 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -43,7 +43,6 @@
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 93f6ceea..b69eaf39 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -693,7 +693,7 @@
                                             <node concept="3clFbF" id="5TXeSYSLiBz" role="3cqZAp">
                                               <node concept="2OqwBi" id="5TXeSYSLaRM" role="3clFbG">
                                                 <node concept="37vLTw" id="5TXeSYSLjnX" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6E5fMGvfKNF" />
+                                                  <ref role="3cqZAo" node="6E5fMGvfKNF" resolve="it" />
                                                 </node>
                                                 <node concept="2qgKlT" id="5TXeSYSLqFn" role="2OqNvi">
                                                   <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
index 781688f9..24bbe7b2 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
@@ -995,7 +995,7 @@
                           <node concept="2OqwBi" id="51ek2rSfwT5" role="3clFbG">
                             <node concept="2OqwBi" id="51ek2rSggv3" role="2Oq$k0">
                               <node concept="37vLTw" id="51ek2rSggdP" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKNH" />
+                                <ref role="3cqZAo" node="6E5fMGvfKNH" resolve="it" />
                               </node>
                               <node concept="1mfA1w" id="51ek2rSggOe" role="2OqNvi" />
                             </node>
@@ -1021,7 +1021,7 @@
                         <node concept="2OqwBi" id="51ek2rSg5yq" role="3clFbG">
                           <node concept="2OqwBi" id="51ek2rSg5j0" role="2Oq$k0">
                             <node concept="37vLTw" id="51ek2rSghYL" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKNJ" />
+                              <ref role="3cqZAo" node="6E5fMGvfKNJ" resolve="it" />
                             </node>
                             <node concept="1mfA1w" id="51ek2rSg5rK" role="2OqNvi" />
                           </node>
@@ -1029,7 +1029,7 @@
                             <node concept="2OqwBi" id="51ek2rSg668" role="1P9ThW">
                               <node concept="2OqwBi" id="51ek2rSg5MT" role="2Oq$k0">
                                 <node concept="37vLTw" id="51ek2rSgi8J" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKNJ" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKNJ" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="51ek2rSg5Wq" role="2OqNvi">
                                   <ref role="3Tt5mk" to="5j4j:49obaclcanY" resolve="logical" />
@@ -1107,7 +1107,7 @@
                               <node concept="2OqwBi" id="51ek2rSgL2a" role="3clFbG">
                                 <node concept="2OqwBi" id="51ek2rSgL2b" role="2Oq$k0">
                                   <node concept="37vLTw" id="51ek2rSgL2c" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKNL" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKNL" resolve="it" />
                                   </node>
                                   <node concept="1mfA1w" id="51ek2rSgL2d" role="2OqNvi" />
                                 </node>
@@ -1138,7 +1138,7 @@
                                   <ref role="1Y3XeK" to="6f4m:4JdgAL_5vM9" resolve="NotMigratedNode" />
                                   <node concept="3Tm1VV" id="51ek2rSgL2p" role="1B3o_S" />
                                   <node concept="37vLTw" id="51ek2rSgL2q" role="37wK5m">
-                                    <ref role="3cqZAo" node="6E5fMGvfKNN" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKNN" resolve="it" />
                                   </node>
                                   <node concept="3clFb_" id="51ek2rSgL2r" role="jymVt">
                                     <property role="TrG5h" value="getMessage" />
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index b4fa2958..2dea57ba 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -10728,7 +10728,7 @@
                             </node>
                             <node concept="2OqwBi" id="19fWAfxOEPp" role="3uHU7B">
                               <node concept="37vLTw" id="19fWAfxOEPq" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKQM" />
+                                <ref role="3cqZAo" node="6E5fMGvfKQM" resolve="it" />
                               </node>
                               <node concept="liA8E" id="19fWAfxOEPr" role="2OqNvi">
                                 <ref role="37wK5l" node="19fWAfxNak0" resolve="role" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps
index 6654622f..bda7ba45 100644
--- a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps
@@ -714,7 +714,7 @@
                         <node concept="3clFbF" id="4qGA5WE2v5U" role="3cqZAp">
                           <node concept="2OqwBi" id="4qGA5WE2v5V" role="3clFbG">
                             <node concept="37vLTw" id="4qGA5WE2v5W" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKQO" />
+                              <ref role="3cqZAo" node="6E5fMGvfKQO" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4qGA5WE2w6u" role="2OqNvi">
                               <ref role="37wK5l" node="5X1yxJI3E6N" resolve="allCauses" />
@@ -754,7 +754,7 @@
                           <node concept="10Nm6u" id="6cGbuqOorbj" role="3uHU7w" />
                           <node concept="2OqwBi" id="6cGbuqOorbk" role="3uHU7B">
                             <node concept="37vLTw" id="6cGbuqOorbl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKQQ" />
+                              <ref role="3cqZAo" node="6E5fMGvfKQQ" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6cGbuqOorbm" role="2OqNvi">
                               <ref role="37wK5l" node="5X1yxJI3vjy" resolve="cause" />
@@ -1072,7 +1072,7 @@
                         <node concept="3clFbF" id="4qGA5WE2Jf0" role="3cqZAp">
                           <node concept="2OqwBi" id="4qGA5WE2Jf1" role="3clFbG">
                             <node concept="37vLTw" id="4qGA5WE2Jf2" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKQS" />
+                              <ref role="3cqZAo" node="6E5fMGvfKQS" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4qGA5WE2Jf3" role="2OqNvi">
                               <ref role="37wK5l" node="5X1yxJI3E6N" resolve="allCauses" />
@@ -1112,7 +1112,7 @@
                           <node concept="10Nm6u" id="6cGbuqOzVVk" role="3uHU7w" />
                           <node concept="2OqwBi" id="6cGbuqOzVVl" role="3uHU7B">
                             <node concept="37vLTw" id="6cGbuqOzVVm" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKQU" />
+                              <ref role="3cqZAo" node="6E5fMGvfKQU" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6cGbuqOzVVn" role="2OqNvi">
                               <ref role="37wK5l" node="5X1yxJI3vjy" resolve="cause" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
index a8e3ccd2..fc9031bf 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
@@ -668,7 +668,7 @@
                             <node concept="2i4dXS" id="_tf6vyTJvh" role="2ShVmc">
                               <node concept="2OqwBi" id="_tf6vyTK9X" role="I$8f6">
                                 <node concept="37vLTw" id="_tf6vyTJSs" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKQW" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKQW" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6vyTK$o" role="2OqNvi">
                                   <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
@@ -987,7 +987,7 @@
                             <node concept="2i4dXS" id="_tf6vzI5RB" role="2ShVmc">
                               <node concept="2OqwBi" id="_tf6vzI5RC" role="I$8f6">
                                 <node concept="37vLTw" id="_tf6vzI5RD" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKQY" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKQY" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6vzI5RE" role="2OqNvi">
                                   <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
@@ -1359,7 +1359,7 @@
                             <node concept="2i4dXS" id="2URzoKVns62" role="2ShVmc">
                               <node concept="2OqwBi" id="2URzoKVns63" role="I$8f6">
                                 <node concept="37vLTw" id="2URzoKVns64" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKR0" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKR0" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="2URzoKVns65" role="2OqNvi">
                                   <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
@@ -1666,7 +1666,7 @@
                             <node concept="2i4dXS" id="_tf6vzr80t" role="2ShVmc">
                               <node concept="2OqwBi" id="_tf6vzr80u" role="I$8f6">
                                 <node concept="37vLTw" id="_tf6vzr80v" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKR2" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKR2" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6vzr80w" role="2OqNvi">
                                   <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
@@ -1949,7 +1949,7 @@
                             <node concept="2i4dXS" id="_tf6v$43AL" role="2ShVmc">
                               <node concept="2OqwBi" id="_tf6v$43AM" role="I$8f6">
                                 <node concept="37vLTw" id="_tf6v$43AN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKR4" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKR4" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6v$43AO" role="2OqNvi">
                                   <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
@@ -2136,7 +2136,7 @@
                             <node concept="2i4dXS" id="_tf6vzrgBl" role="2ShVmc">
                               <node concept="2OqwBi" id="_tf6vzrgBm" role="I$8f6">
                                 <node concept="37vLTw" id="_tf6vzrgBn" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKR6" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKR6" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6vzrgBo" role="2OqNvi">
                                   <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index cf622eae..a9c04991 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -1324,7 +1324,7 @@
                             <node concept="2OqwBi" id="37zP$quAM$V" role="3clFbG">
                               <node concept="2OqwBi" id="37zP$quAL_Y" role="2Oq$k0">
                                 <node concept="37vLTw" id="37zP$quALoQ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKR8" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKR8" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="37zP$quALOp" role="2OqNvi">
                                   <ref role="37wK5l" to="fqlx:3KN3A4uUhpW" resolve="aspects" />
@@ -1358,7 +1358,7 @@
                         <node concept="3clFbF" id="5SC$dmovmMz" role="3cqZAp">
                           <node concept="2OqwBi" id="5SC$dmovnqg" role="3clFbG">
                             <node concept="37vLTw" id="5SC$dmovmMy" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKRa" />
+                              <ref role="3cqZAo" node="6E5fMGvfKRa" resolve="it" />
                             </node>
                             <node concept="liA8E" id="5SC$dmovo$r" role="2OqNvi">
                               <ref role="37wK5l" to="fqlx:1PixfKRp5_w" resolve="coversNamespace" />
@@ -2054,7 +2054,7 @@
                         <node concept="3clFbF" id="WJTIIoYZh8" role="3cqZAp">
                           <node concept="2OqwBi" id="WJTIIoYZqe" role="3clFbG">
                             <node concept="37vLTw" id="WJTIIoYZh7" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKRc" />
+                              <ref role="3cqZAo" node="6E5fMGvfKRc" resolve="it" />
                             </node>
                             <node concept="iZEcu" id="WJTIIoYZye" role="2OqNvi" />
                           </node>
@@ -3651,7 +3651,7 @@
                                   <node concept="3clFbF" id="6DQTzHxUiHo" role="3cqZAp">
                                     <node concept="2OqwBi" id="6DQTzHxUiHp" role="3clFbG">
                                       <node concept="37vLTw" id="6DQTzHxUiHq" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKRe" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKRe" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="6DQTzHxUiHr" role="2OqNvi">
                                         <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -3798,7 +3798,7 @@
                       <node concept="3clFbF" id="6DQTzHxMOrU" role="3cqZAp">
                         <node concept="2OqwBi" id="6DQTzHxMOBd" role="3clFbG">
                           <node concept="37vLTw" id="6DQTzHxMOrT" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKRg" />
+                            <ref role="3cqZAo" node="6E5fMGvfKRg" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6DQTzHxMP75" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -3848,7 +3848,7 @@
                       <node concept="3clFbF" id="6DQTzHxMSR7" role="3cqZAp">
                         <node concept="2OqwBi" id="6DQTzHxMSR8" role="3clFbG">
                           <node concept="37vLTw" id="6DQTzHxMSR9" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKRi" />
+                            <ref role="3cqZAo" node="6E5fMGvfKRi" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6DQTzHxMSRa" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -3898,7 +3898,7 @@
                     <node concept="3clFbF" id="3evPR3Eemw0" role="3cqZAp">
                       <node concept="2OqwBi" id="3evPR3Eemw1" role="3clFbG">
                         <node concept="37vLTw" id="3evPR3Eemw2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKRk" />
+                          <ref role="3cqZAo" node="6E5fMGvfKRk" resolve="it" />
                         </node>
                         <node concept="liA8E" id="65y6zSCD20r" role="2OqNvi">
                           <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
@@ -5544,7 +5544,7 @@
                           </node>
                           <node concept="3JPx81" id="6DQTzHxL7HY" role="2OqNvi">
                             <node concept="37vLTw" id="6DQTzHxL9a3" role="25WWJ7">
-                              <ref role="3cqZAo" node="6E5fMGvfKRm" />
+                              <ref role="3cqZAo" node="6E5fMGvfKRm" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -5581,7 +5581,7 @@
                           </node>
                           <node concept="3JPx81" id="6DQTzHyeuWG" role="2OqNvi">
                             <node concept="37vLTw" id="6DQTzHyeuWH" role="25WWJ7">
-                              <ref role="3cqZAo" node="6E5fMGvfKRo" />
+                              <ref role="3cqZAo" node="6E5fMGvfKRo" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -9196,7 +9196,7 @@
                         <node concept="2OqwBi" id="6jc_YgcVMK3" role="3clFbG">
                           <node concept="2OqwBi" id="6jc_YgcVMK4" role="2Oq$k0">
                             <node concept="37vLTw" id="6jc_YgcVMK6" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKRq" />
+                              <ref role="3cqZAo" node="6E5fMGvfKRq" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6jc_YgcVMK8" role="2OqNvi">
                               <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -9315,7 +9315,7 @@
                           <node concept="2OqwBi" id="6jc_YgcS9MU" role="2Oq$k0">
                             <node concept="2OqwBi" id="6jc_YgcS9lH" role="2Oq$k0">
                               <node concept="37vLTw" id="6jc_YgcS9ap" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKRs" />
+                                <ref role="3cqZAo" node="6E5fMGvfKRs" resolve="it" />
                               </node>
                               <node concept="liA8E" id="6jc_YgcS9AW" role="2OqNvi">
                                 <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
@@ -9461,7 +9461,7 @@
                           <node concept="2OqwBi" id="6jc_YgcT5hm" role="2Oq$k0">
                             <node concept="2OqwBi" id="6jc_YgcT5hn" role="2Oq$k0">
                               <node concept="37vLTw" id="6jc_YgcT5ho" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKRu" />
+                                <ref role="3cqZAo" node="6E5fMGvfKRu" resolve="it" />
                               </node>
                               <node concept="liA8E" id="6jc_YgcT5hp" role="2OqNvi">
                                 <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
@@ -10227,7 +10227,7 @@
                         <node concept="2OqwBi" id="6jc_Ygd1NyX" role="3clFbG">
                           <node concept="2OqwBi" id="6jc_Ygd1N2b" role="2Oq$k0">
                             <node concept="37vLTw" id="6jc_Ygd1MR5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKRw" />
+                              <ref role="3cqZAo" node="6E5fMGvfKRw" resolve="it" />
                             </node>
                             <node concept="Vyspw" id="6jc_Ygd1N99" role="2OqNvi">
                               <node concept="37vLTw" id="6jc_Ygd1NjM" role="Vysub">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
index 6f6a3e6e..447af525 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
@@ -1698,7 +1698,7 @@
                       <node concept="3clFbF" id="7qe1GumE5zK" role="3cqZAp">
                         <node concept="2OqwBi" id="7qe1GumE5J1" role="3clFbG">
                           <node concept="37vLTw" id="7qe1GumE5zJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKRy" />
+                            <ref role="3cqZAo" node="6E5fMGvfKRy" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4t6qIYSLtQv" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1771,7 +1771,7 @@
                       <node concept="3clFbF" id="4t6qIYSLu68" role="3cqZAp">
                         <node concept="2OqwBi" id="4t6qIYSLu69" role="3clFbG">
                           <node concept="37vLTw" id="4t6qIYSLu6a" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKR$" />
+                            <ref role="3cqZAo" node="6E5fMGvfKR$" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4t6qIYSLu6b" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1836,7 +1836,7 @@
                       <node concept="3clFbF" id="4t6qIYSNRZn" role="3cqZAp">
                         <node concept="2OqwBi" id="4t6qIYSNRZo" role="3clFbG">
                           <node concept="37vLTw" id="4t6qIYSNRZp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKRA" />
+                            <ref role="3cqZAo" node="6E5fMGvfKRA" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4t6qIYSNRZq" role="2OqNvi">
                             <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
@@ -1858,7 +1858,7 @@
                       <node concept="2OqwBi" id="4t6qIYSOZas" role="3clFbG">
                         <node concept="2OqwBi" id="4t6qIYSOYFY" role="2Oq$k0">
                           <node concept="37vLTw" id="4t6qIYSOYuG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKRC" />
+                            <ref role="3cqZAo" node="6E5fMGvfKRC" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4t6qIYSOYPK" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2977,7 +2977,7 @@
                       <node concept="3clFbF" id="4e0TwrfERyZ" role="3cqZAp">
                         <node concept="2OqwBi" id="4e0TwrfERFB" role="3clFbG">
                           <node concept="37vLTw" id="4e0TwrfERyY" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKRE" />
+                            <ref role="3cqZAo" node="6E5fMGvfKRE" resolve="it" />
                           </node>
                           <node concept="2Xjw5R" id="4e0TwrfES9p" role="2OqNvi">
                             <node concept="1xMEDy" id="4e0TwrfES9r" role="1xVPHs">
@@ -3050,7 +3050,7 @@
                       <node concept="liA8E" id="2NnDL4GbYa2" role="2OqNvi">
                         <ref role="37wK5l" to="7ed7:2NnDL4G9WvM" resolve="check" />
                         <node concept="37vLTw" id="2NnDL4GbYcs" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKRG" />
+                          <ref role="3cqZAo" node="6E5fMGvfKRG" resolve="it" />
                         </node>
                       </node>
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index 48c46fac..b7914b74 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -3285,7 +3285,7 @@
                               <node concept="2OqwBi" id="37zP$quAM$V" role="3clFbG">
                                 <node concept="2OqwBi" id="37zP$quAL_Y" role="2Oq$k0">
                                   <node concept="37vLTw" id="37zP$quALoQ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKRI" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKRI" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="37zP$quALOp" role="2OqNvi">
                                     <ref role="37wK5l" to="fqlx:3KN3A4uUhpW" resolve="aspects" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 4a395f13..85a2ae95 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -739,7 +739,7 @@
                   <node concept="3clFbF" id="1RYTbd7BDAv" role="3cqZAp">
                     <node concept="2OqwBi" id="1RYTbd7BDPq" role="3clFbG">
                       <node concept="37vLTw" id="1RYTbd7BDAu" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKSi" />
+                        <ref role="3cqZAo" node="6E5fMGvfKSi" resolve="it" />
                       </node>
                       <node concept="liA8E" id="1RYTbd7BE9H" role="2OqNvi">
                         <ref role="37wK5l" to="tj24:5HVB6JS1Tc9" resolve="clearAllCaches" />
@@ -788,7 +788,7 @@
                   <node concept="3clFbF" id="1PdMG9nvdbc" role="3cqZAp">
                     <node concept="2OqwBi" id="1PdMG9nvj$i" role="3clFbG">
                       <node concept="37vLTw" id="1PdMG9nvdbb" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKSk" />
+                        <ref role="3cqZAo" node="6E5fMGvfKSk" resolve="it" />
                       </node>
                       <node concept="liA8E" id="1PdMG9nvqNo" role="2OqNvi">
                         <ref role="37wK5l" to="tj24:5HVB6JS1Tc9" resolve="clearAllCaches" />
@@ -1256,7 +1256,7 @@
                       <node concept="3clFbF" id="51ek2rRUDCl" role="3cqZAp">
                         <node concept="2OqwBi" id="51ek2rRUDCm" role="3clFbG">
                           <node concept="37vLTw" id="51ek2rRUDCn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKSm" />
+                            <ref role="3cqZAo" node="6E5fMGvfKSm" resolve="it" />
                           </node>
                           <node concept="liA8E" id="51ek2rRUDCo" role="2OqNvi">
                             <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
@@ -1292,7 +1292,7 @@
                           <node concept="3clFbF" id="51ek2rRUQuq" role="3cqZAp">
                             <node concept="2OqwBi" id="51ek2rRUQur" role="3clFbG">
                               <node concept="37vLTw" id="51ek2rRUQus" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKSo" />
+                                <ref role="3cqZAo" node="6E5fMGvfKSo" resolve="it" />
                               </node>
                               <node concept="liA8E" id="51ek2rRUQut" role="2OqNvi">
                                 <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
@@ -1328,7 +1328,7 @@
                     <node concept="3clFbF" id="51ek2rR52s5" role="3cqZAp">
                       <node concept="2OqwBi" id="51ek2rR52s6" role="3clFbG">
                         <node concept="37vLTw" id="51ek2rR52s7" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKSq" />
+                          <ref role="3cqZAo" node="6E5fMGvfKSq" resolve="it" />
                         </node>
                         <node concept="liA8E" id="51ek2rR52s8" role="2OqNvi">
                           <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
@@ -2495,7 +2495,7 @@
                               <node concept="3clFbF" id="3CzfQ_oofi7" role="3cqZAp">
                                 <node concept="2OqwBi" id="3CzfQ_oolB9" role="3clFbG">
                                   <node concept="37vLTw" id="3CzfQ_oofi6" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKSs" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKSs" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="3CzfQ_oouwT" role="2OqNvi">
                                     <ref role="37wK5l" to="1ka:~TypeAccessListener.typeAccessed(org.jetbrains.mps.openapi.model.SNode)" resolve="typeAccessed" />
@@ -3511,7 +3511,7 @@
                         <node concept="3clFbF" id="51h1DIGjVpC" role="3cqZAp">
                           <node concept="2OqwBi" id="51h1DIGjVpD" role="3clFbG">
                             <node concept="37vLTw" id="51h1DIGjVpE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKSu" />
+                              <ref role="3cqZAo" node="6E5fMGvfKSu" resolve="it" />
                             </node>
                             <node concept="1P9Npp" id="51h1DIGjVpF" role="2OqNvi">
                               <node concept="2ShNRf" id="51h1DIGjVpG" role="1P9ThW">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 21dafbd8..c282d47c 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -1137,7 +1137,7 @@
                                       <node concept="2OqwBi" id="27bTNFfaZ2a" role="3clFbG">
                                         <node concept="2OqwBi" id="27bTNFfaZ2b" role="2Oq$k0">
                                           <node concept="37vLTw" id="27bTNFfaZ2c" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6E5fMGvfKRK" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKRK" resolve="it" />
                                           </node>
                                           <node concept="3CFZ6_" id="27bTNFfaZ2d" role="2OqNvi">
                                             <node concept="3CFYIy" id="27bTNFfaZ2e" role="3CFYIz">
@@ -1162,11 +1162,11 @@
                                   <node concept="3clFbF" id="27bTNFfaZ2l" role="3cqZAp">
                                     <node concept="1Ls8ON" id="4ZGicUZd20k" role="3clFbG">
                                       <node concept="37vLTw" id="4ZGicUZd7b5" role="1Lso8e">
-                                        <ref role="3cqZAo" node="6E5fMGvfKRM" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKRM" resolve="it" />
                                       </node>
                                       <node concept="2OqwBi" id="27bTNFfaZ2m" role="1Lso8e">
                                         <node concept="37vLTw" id="27bTNFfaZ2n" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6E5fMGvfKRM" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKRM" resolve="it" />
                                         </node>
                                         <node concept="3CFZ6_" id="27bTNFfaZ2o" role="2OqNvi">
                                           <node concept="3CFYIy" id="27bTNFfaZ2p" role="3CFYIz">
@@ -1212,7 +1212,7 @@
                                             <property role="3cmrfH" value="1" />
                                           </node>
                                           <node concept="37vLTw" id="27bTNFfaZ2G" role="1LFl5Q">
-                                            <ref role="3cqZAo" node="6E5fMGvfKRO" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKRO" resolve="it" />
                                           </node>
                                         </node>
                                         <node concept="iZEcu" id="4ZGicUZ8BCD" role="2OqNvi" />
@@ -1257,7 +1257,7 @@
                                           <node concept="3clFbC" id="pupwRqCJ0A" role="3uHU7w">
                                             <node concept="2OqwBi" id="pupwRqCCts" role="3uHU7B">
                                               <node concept="37vLTw" id="pupwRqC_jS" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6E5fMGvfKRQ" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKRQ" resolve="it" />
                                               </node>
                                               <node concept="liA8E" id="pupwRqCGt8" role="2OqNvi">
                                                 <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
@@ -1273,7 +1273,7 @@
                                               <ref role="3uigEE" node="1FOQehwovmW" resolve="TypecheckingReportItem" />
                                             </node>
                                             <node concept="37vLTw" id="pupwRqCVNc" role="2ZW6bz">
-                                              <ref role="3cqZAo" node="6E5fMGvfKRQ" />
+                                              <ref role="3cqZAo" node="6E5fMGvfKRQ" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
@@ -1296,7 +1296,7 @@
                                             <ref role="3uigEE" node="1FOQehwovmW" resolve="TypecheckingReportItem" />
                                           </node>
                                           <node concept="37vLTw" id="pupwRqDDEy" role="0kSFX">
-                                            <ref role="3cqZAo" node="6E5fMGvfKRS" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKRS" resolve="it" />
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="pupwRqEfoW" role="2OqNvi">
@@ -1785,7 +1785,7 @@
                                               <property role="3cmrfH" value="1" />
                                             </node>
                                             <node concept="37vLTw" id="27bTNFfaZ4D" role="1LFl5Q">
-                                              <ref role="3cqZAo" node="6E5fMGvfKRU" />
+                                              <ref role="3cqZAo" node="6E5fMGvfKRU" resolve="it" />
                                             </node>
                                           </node>
                                           <node concept="iZEcu" id="4ZGicUZ9Sop" role="2OqNvi" />
@@ -1870,13 +1870,13 @@
                                       <node concept="1Ls8ON" id="61G6TdDrEBZ" role="3clFbG">
                                         <node concept="2OqwBi" id="61G6TdDrEC0" role="1Lso8e">
                                           <node concept="37vLTw" id="61G6TdDrEC1" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6E5fMGvfKRW" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKRW" resolve="it" />
                                           </node>
                                           <node concept="3AY5_j" id="61G6TdDrEC2" role="2OqNvi" />
                                         </node>
                                         <node concept="2OqwBi" id="61G6TdDrEC3" role="1Lso8e">
                                           <node concept="37vLTw" id="61G6TdDrEC4" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6E5fMGvfKRW" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKRW" resolve="it" />
                                           </node>
                                           <node concept="3AV6Ez" id="61G6TdDrEC5" role="2OqNvi" />
                                         </node>
@@ -2177,7 +2177,7 @@
                                                 <property role="3cmrfH" value="0" />
                                               </node>
                                               <node concept="37vLTw" id="4ZGicUZjSK5" role="1LFl5Q">
-                                                <ref role="3cqZAo" node="6E5fMGvfKRY" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKRY" resolve="it" />
                                               </node>
                                             </node>
                                             <node concept="iZEcu" id="4ZGicUZjSK6" role="2OqNvi" />
@@ -2328,7 +2328,7 @@
                         <node concept="3JPx81" id="4AYiKM_M2Qq" role="2OqNvi">
                           <node concept="2OqwBi" id="4AYiKM_M35K" role="25WWJ7">
                             <node concept="37vLTw" id="4AYiKM_M2Ut" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKS0" />
+                              <ref role="3cqZAo" node="6E5fMGvfKS0" resolve="it" />
                             </node>
                             <node concept="iZEcu" id="4AYiKM_M3ej" role="2OqNvi" />
                           </node>
@@ -3302,7 +3302,7 @@
                           <node concept="3clFbF" id="5Qx6_65aZYh" role="3cqZAp">
                             <node concept="2OqwBi" id="5Qx6_65b0n$" role="3clFbG">
                               <node concept="37vLTw" id="5Qx6_65aZYg" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKS2" />
+                                <ref role="3cqZAo" node="6E5fMGvfKS2" resolve="it" />
                               </node>
                               <node concept="3AV6Ez" id="5Qx6_65b0ES" role="2OqNvi" />
                             </node>
@@ -4142,7 +4142,7 @@
                           </node>
                           <node concept="3JPx81" id="1tzntNAaac9" role="2OqNvi">
                             <node concept="37vLTw" id="1tzntNAaeJF" role="25WWJ7">
-                              <ref role="3cqZAo" node="6E5fMGvfKS4" />
+                              <ref role="3cqZAo" node="6E5fMGvfKS4" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -4187,7 +4187,7 @@
                             </node>
                             <node concept="3JPx81" id="6DQTzHy8QO_" role="2OqNvi">
                               <node concept="37vLTw" id="6DQTzHy8QOA" role="25WWJ7">
-                                <ref role="3cqZAo" node="6E5fMGvfKS6" />
+                                <ref role="3cqZAo" node="6E5fMGvfKS6" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -9917,7 +9917,7 @@
                     <node concept="3clFbF" id="At0yqN0ZB7" role="3cqZAp">
                       <node concept="2OqwBi" id="At0yqN0ZB8" role="3clFbG">
                         <node concept="37vLTw" id="At0yqN0ZB9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKS8" />
+                          <ref role="3cqZAo" node="6E5fMGvfKS8" resolve="it" />
                         </node>
                         <node concept="liA8E" id="At0yqN0ZBa" role="2OqNvi">
                           <ref role="37wK5l" node="At0yqMRQt2" resolve="anyNeedsUpdate" />
@@ -10099,7 +10099,7 @@
                   <node concept="3clFbF" id="7i3KM7g2ilG" role="3cqZAp">
                     <node concept="2OqwBi" id="7i3KM7g2iun" role="3clFbG">
                       <node concept="37vLTw" id="7i3KM7g2ilF" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKSa" />
+                        <ref role="3cqZAo" node="6E5fMGvfKSa" resolve="it" />
                       </node>
                       <node concept="liA8E" id="7i3KM7g2iDH" role="2OqNvi">
                         <ref role="37wK5l" node="7i3KM7g2fvr" resolve="clearAll" />
@@ -14017,7 +14017,7 @@
                         <node concept="3clFbF" id="4XsNDZYknc1" role="3cqZAp">
                           <node concept="2OqwBi" id="4XsNDZYknHH" role="3clFbG">
                             <node concept="37vLTw" id="4XsNDZYknc0" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKSc" />
+                              <ref role="3cqZAo" node="6E5fMGvfKSc" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4XsNDZYkoPM" role="2OqNvi">
                               <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="getTemplateRef" />
@@ -15982,7 +15982,7 @@
                                   <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
                                 </node>
                                 <node concept="37vLTw" id="2xx8OBy14SJ" role="2ZW6bz">
-                                  <ref role="3cqZAo" node="6E5fMGvfKSe" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKSe" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -16073,7 +16073,7 @@
                                 <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
                               </node>
                               <node concept="37vLTw" id="2xx8OBy1bmw" role="2ZW6bz">
-                                <ref role="3cqZAo" node="6E5fMGvfKSg" />
+                                <ref role="3cqZAo" node="6E5fMGvfKSg" resolve="it" />
                               </node>
                             </node>
                           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 16779ac3..14dd4ea6 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -886,7 +886,7 @@
                       </node>
                       <node concept="2OqwBi" id="3mz2_dYDL1p" role="3uHU7B">
                         <node concept="37vLTw" id="3mz2_dYDKYB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKSw" />
+                          <ref role="3cqZAo" node="6E5fMGvfKSw" resolve="it" />
                         </node>
                         <node concept="2OwXpG" id="3mz2_dYDL6O" role="2OqNvi">
                           <ref role="2Oxat5" node="3mz2_dYDlU7" resolve="mpsProject" />
@@ -1180,7 +1180,7 @@
                                                 <property role="3cmrfH" value="0" />
                                               </node>
                                               <node concept="37vLTw" id="3mz2_dYCun4" role="1LFl5Q">
-                                                <ref role="3cqZAo" node="6E5fMGvfKSy" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKSy" resolve="it" />
                                               </node>
                                             </node>
                                           </node>
@@ -1680,7 +1680,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="3mz2_dYCo91" role="1LFl5Q">
-                            <ref role="3cqZAo" node="6E5fMGvfKS$" />
+                            <ref role="3cqZAo" node="6E5fMGvfKS$" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -2967,7 +2967,7 @@
                         <node concept="1rXfSq" id="1n2ZgJ3LNAE" role="3clFbG">
                           <ref role="37wK5l" node="1n2ZgJ3LkPO" resolve="debugString" />
                           <node concept="37vLTw" id="1n2ZgJ3LOia" role="37wK5m">
-                            <ref role="3cqZAo" node="6E5fMGvfKSA" />
+                            <ref role="3cqZAo" node="6E5fMGvfKSA" resolve="a" />
                           </node>
                         </node>
                       </node>
@@ -14602,7 +14602,7 @@
               <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="2ShNRf" id="3IJoaDJeWz9" role="37wK5m">
                 <node concept="1pGfFk" id="3IJoaDJeWza" role="2ShVmc">
-                  <ref role="37wK5l" node="3IJoaDJegcg" resolve="ToggleShowEmptyTemplates" />
+                  <ref role="37wK5l" node="3IJoaDJegcg" resolve="TraceTab.ToggleShowEmptyTemplates" />
                   <node concept="37vLTw" id="3IJoaDJeWzb" role="37wK5m">
                     <ref role="3cqZAo" node="4XsNDZYBNRm" resolve="ttRef" />
                   </node>
@@ -28119,7 +28119,7 @@
                                   <ref role="3uigEE" to="31yc:3mz2_dYafX3" resolve="Snapshot" />
                                 </node>
                                 <node concept="37vLTw" id="3sb6QlvdFVV" role="10QFUP">
-                                  <ref role="3cqZAo" node="6E5fMGvfKSC" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKSC" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -28215,7 +28215,7 @@
                               <node concept="3clFbC" id="3sb6QlvdzOe" role="3clFbG">
                                 <node concept="2OqwBi" id="3sb6QlvdzOf" role="3uHU7w">
                                   <node concept="37vLTw" id="3sb6QlvdzOg" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKSG" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKSG" resolve="logical" />
                                   </node>
                                   <node concept="liA8E" id="3sb6QlvdzOh" role="2OqNvi">
                                     <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
@@ -28223,7 +28223,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="3sb6QlvdzOi" role="3uHU7B">
                                   <node concept="37vLTw" id="3sb6QlvdzOj" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKSE" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKSE" resolve="selLogical" />
                                   </node>
                                   <node concept="liA8E" id="3sb6QlvdzOk" role="2OqNvi">
                                     <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
@@ -29688,7 +29688,7 @@
                 <ref role="37wK5l" to="hano:6YRY30_KxAD" resolve="totalChildren" />
                 <node concept="Rm8GO" id="6YRY30_L_hr" role="37wK5m">
                   <ref role="Rm8GQ" to="hano:4Q576Rbj$_2" resolve="Node" />
-                  <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="PointKind" />
+                  <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
                 </node>
               </node>
             </node>
@@ -29706,7 +29706,7 @@
                 <ref role="37wK5l" to="hano:6YRY30_KxAD" resolve="totalChildren" />
                 <node concept="Rm8GO" id="6YRY30_LAGe" role="37wK5m">
                   <ref role="Rm8GQ" to="hano:4Q576RbjAsm" resolve="Template" />
-                  <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="PointKind" />
+                  <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
                 </node>
               </node>
             </node>
@@ -29745,7 +29745,7 @@
                 <node concept="3clFbC" id="4Q576Rc7mDb" role="3uHU7B">
                   <node concept="Rm8GO" id="4Q576Rc7tQo" role="3uHU7w">
                     <ref role="Rm8GQ" to="hano:4Q576RbjAsm" resolve="Template" />
-                    <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="PointKind" />
+                    <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
                   </node>
                   <node concept="2OqwBi" id="4Q576Rc7jXF" role="3uHU7B">
                     <node concept="37vLTw" id="4Q576Rc7hpR" role="2Oq$k0">
@@ -29783,7 +29783,7 @@
             </node>
             <node concept="Rm8GO" id="3IJoaDJdbIy" role="3uHU7w">
               <ref role="Rm8GQ" to="hano:4Q576Rbj$_2" resolve="Node" />
-              <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="PointKind" />
+              <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
             </node>
           </node>
           <node concept="3eNFk2" id="3IJoaDJdflQ" role="3eNLev">
@@ -29818,7 +29818,7 @@
                   <node concept="3clFbC" id="6YRY30_Mxqj" role="3uHU7B">
                     <node concept="Rm8GO" id="6YRY30_MA9C" role="3uHU7w">
                       <ref role="Rm8GQ" to="hano:4Q576Rbj$_2" resolve="Node" />
-                      <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="PointKind" />
+                      <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
                     </node>
                     <node concept="2OqwBi" id="6YRY30_Mxql" role="3uHU7B">
                       <node concept="37vLTw" id="6YRY30_Mxqm" role="2Oq$k0">
@@ -29856,7 +29856,7 @@
               </node>
               <node concept="Rm8GO" id="3IJoaDJdD_V" role="3uHU7w">
                 <ref role="Rm8GQ" to="hano:4Q576RbjAsm" resolve="Template" />
-                <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="PointKind" />
+                <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
               </node>
             </node>
           </node>
@@ -31724,7 +31724,7 @@
       </node>
       <node concept="10M0yZ" id="3IJoaDITZOW" role="33vP2m">
         <ref role="3cqZAo" to="z2i8:~AllIcons$Nodes.Tag" resolve="Tag" />
-        <ref role="1PxDUh" to="z2i8:~AllIcons$Nodes" resolve="Nodes" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Nodes" resolve="AllIcons.Nodes" />
       </node>
     </node>
     <node concept="Wx3nA" id="4Q576Rc2bqx" role="jymVt">
@@ -31963,7 +31963,7 @@
         <node concept="3cpWs6" id="3IJoaDISMk1" role="3cqZAp">
           <node concept="10M0yZ" id="3IJoaDIT7yl" role="3cqZAk">
             <ref role="3cqZAo" to="z2i8:~AllIcons$FileTypes.Unknown" resolve="Unknown" />
-            <ref role="1PxDUh" to="z2i8:~AllIcons$FileTypes" resolve="FileTypes" />
+            <ref role="1PxDUh" to="z2i8:~AllIcons$FileTypes" resolve="AllIcons.FileTypes" />
           </node>
         </node>
       </node>
@@ -32244,7 +32244,7 @@
                             </node>
                             <node concept="2OqwBi" id="6GMlsrka0S5" role="33vP2m">
                               <node concept="37vLTw" id="6GMlsrka0S6" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKSI" />
+                                <ref role="3cqZAo" node="6E5fMGvfKSI" resolve="it" />
                               </node>
                               <node concept="liA8E" id="6GMlsrka0S7" role="2OqNvi">
                                 <ref role="37wK5l" to="et5u:~IMessage.getHintObject()" resolve="getHintObject" />
@@ -32577,7 +32577,7 @@
                       </node>
                       <node concept="2OqwBi" id="6GMlsrk9LOh" role="33vP2m">
                         <node concept="37vLTw" id="6GMlsrk9LOi" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKSK" />
+                          <ref role="3cqZAo" node="6E5fMGvfKSK" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6GMlsrk9LOj" role="2OqNvi">
                           <ref role="37wK5l" to="et5u:~IMessage.getHintObject()" resolve="getHintObject" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index 12a1c757..cf78be75 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -3761,7 +3761,7 @@
                                     <ref role="3uigEE" node="3mz2_dYafX3" resolve="Snapshot" />
                                   </node>
                                   <node concept="37vLTw" id="3sb6Qlvdmx5" role="10QFUP">
-                                    <ref role="3cqZAo" node="6E5fMGvfKSY" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKSY" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -4720,7 +4720,7 @@
                       <node concept="1rXfSq" id="3mz2_dYcgIT" role="3clFbG">
                         <ref role="37wK5l" node="19wqdqOpJ_z" resolve="argSnapshot" />
                         <node concept="37vLTw" id="3mz2_dYcgWo" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKT0" />
+                          <ref role="3cqZAo" node="6E5fMGvfKT0" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -4773,7 +4773,7 @@
                       <node concept="1rXfSq" id="3mz2_dYf3g3" role="3clFbG">
                         <ref role="37wK5l" node="19wqdqOpJ_z" resolve="argSnapshot" />
                         <node concept="37vLTw" id="3mz2_dYf3g4" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKT2" />
+                          <ref role="3cqZAo" node="6E5fMGvfKT2" resolve="it" />
                         </node>
                       </node>
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 3d8b3bf8..a0209dc3 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -735,7 +735,7 @@
                                   <node concept="3clFbF" id="7kTeLbPtnTA" role="3cqZAp">
                                     <node concept="2OqwBi" id="7kTeLbPtsHz" role="3clFbG">
                                       <node concept="37vLTw" id="7kTeLbPtnTC" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKSM" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKSM" resolve="it" />
                                       </node>
                                       <node concept="3x8VRR" id="7kTeLbPty85" role="2OqNvi" />
                                     </node>
@@ -4799,7 +4799,7 @@
                         <ref role="37wK5l" node="6kREIVkdKgX" resolve="handleFailure" />
                         <node concept="2OqwBi" id="4BHjwwGi7Iw" role="37wK5m">
                           <node concept="37vLTw" id="4BHjwwGi7Ix" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKSO" />
+                            <ref role="3cqZAo" node="6E5fMGvfKSO" resolve="it" />
                           </node>
                           <node concept="liA8E" id="4BHjwwGi7Iy" role="2OqNvi">
                             <ref role="37wK5l" node="Hg6EnccFiY" resolve="doSchedule" />
@@ -6621,7 +6621,7 @@
                         <node concept="2OqwBi" id="6BMBBPCXDF7" role="3clFbG">
                           <node concept="2OqwBi" id="6BMBBPCXDF8" role="2Oq$k0">
                             <node concept="37vLTw" id="6BMBBPCXDF9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKSQ" />
+                              <ref role="3cqZAo" node="6E5fMGvfKSQ" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6BMBBPCXDFa" role="2OqNvi">
                               <ref role="37wK5l" node="RZQG990rDX" resolve="key" />
@@ -6766,7 +6766,7 @@
                         <node concept="3JPx81" id="19OC8ZQvVf" role="2OqNvi">
                           <node concept="2OqwBi" id="19OC8ZQw$t" role="25WWJ7">
                             <node concept="37vLTw" id="19OC8ZQwdA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKSS" />
+                              <ref role="3cqZAo" node="6E5fMGvfKSS" resolve="it" />
                             </node>
                             <node concept="liA8E" id="19OC8ZQx5P" role="2OqNvi">
                               <ref role="37wK5l" node="RZQG990rDX" resolve="key" />
@@ -6808,7 +6808,7 @@
                                     <node concept="3JPx81" id="19OC8ZQKYE" role="2OqNvi">
                                       <node concept="2OqwBi" id="19OC8ZQKYF" role="25WWJ7">
                                         <node concept="37vLTw" id="19OC8ZQKYG" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6E5fMGvfKSU" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKSU" resolve="it" />
                                         </node>
                                         <node concept="liA8E" id="19OC8ZQKYH" role="2OqNvi">
                                           <ref role="37wK5l" node="RZQG990rDX" resolve="key" />
@@ -6874,7 +6874,7 @@
                       <node concept="2OqwBi" id="6BMBBPCTavx" role="3clFbG">
                         <node concept="2OqwBi" id="6BMBBPCT9Yx" role="2Oq$k0">
                           <node concept="37vLTw" id="6BMBBPCT9E2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKSW" />
+                            <ref role="3cqZAo" node="6E5fMGvfKSW" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6BMBBPCTad$" role="2OqNvi">
                             <ref role="37wK5l" node="RZQG990rDX" resolve="key" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index 7950471b..b9862376 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -608,7 +608,7 @@
                         <node concept="3clFbF" id="IFW4V2x0en" role="3cqZAp">
                           <node concept="2OqwBi" id="IFW4V2x0jv" role="3clFbG">
                             <node concept="37vLTw" id="IFW4V2x0em" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKT4" />
+                              <ref role="3cqZAo" node="6E5fMGvfKT4" resolve="it" />
                             </node>
                             <node concept="liA8E" id="IFW4V2x0ta" role="2OqNvi">
                               <ref role="37wK5l" node="IFW4V2uEay" resolve="tearDown" />
@@ -2156,7 +2156,7 @@
                                 <node concept="2OqwBi" id="9UUIHLXF_w" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="9UUIHLXF_x" role="2Oq$k0">
                                     <node concept="37vLTw" id="9UUIHLXF_y" role="2JrQYb">
-                                      <ref role="3cqZAo" node="6E5fMGvfKT6" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKT6" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="9UUIHLXF_z" role="2OqNvi">
@@ -2200,7 +2200,7 @@
                                   <node concept="3clFbF" id="9UUIHLXF_P" role="3cqZAp">
                                     <node concept="2OqwBi" id="9UUIHLXF_Q" role="3clFbG">
                                       <node concept="37vLTw" id="9UUIHLXF_R" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKT8" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKT8" resolve="it" />
                                       </node>
                                       <node concept="2z74zc" id="9UUIHLXF_S" role="2OqNvi" />
                                     </node>
@@ -2219,7 +2219,7 @@
                                 <node concept="3clFbF" id="9UUIHLXF_Y" role="3cqZAp">
                                   <node concept="2OqwBi" id="9UUIHLXF_Z" role="3clFbG">
                                     <node concept="37vLTw" id="9UUIHLXFA0" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKTa" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKTa" resolve="ref" />
                                     </node>
                                     <node concept="2ZHEkA" id="9UUIHLXFA1" role="2OqNvi" />
                                   </node>
@@ -2240,7 +2240,7 @@
                             <node concept="3clFbF" id="9UUIHLXFA8" role="3cqZAp">
                               <node concept="2OqwBi" id="9UUIHLXFA9" role="3clFbG">
                                 <node concept="37vLTw" id="9UUIHLXFAa" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKTc" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKTc" resolve="it" />
                                 </node>
                                 <node concept="I4A8Y" id="9UUIHLXFAb" role="2OqNvi" />
                               </node>
@@ -2267,7 +2267,7 @@
                               <node concept="1rXfSq" id="9UUIHLXFAm" role="25WWJ7">
                                 <ref role="37wK5l" node="500mE4_soZN" resolve="usedLanguages" />
                                 <node concept="37vLTw" id="9UUIHLXFAn" role="37wK5m">
-                                  <ref role="3cqZAo" node="6E5fMGvfKTe" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKTe" resolve="m" />
                                 </node>
                               </node>
                             </node>
@@ -2324,7 +2324,7 @@
                           <node concept="1rXfSq" id="9UUIHMPZj7" role="3clFbG">
                             <ref role="37wK5l" node="9UUIHMLp7b" resolve="langRT" />
                             <node concept="37vLTw" id="9UUIHMPZj8" role="37wK5m">
-                              <ref role="3cqZAo" node="6E5fMGvfKTg" />
+                              <ref role="3cqZAo" node="6E5fMGvfKTg" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -4510,7 +4510,7 @@
                             <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                             <node concept="2OqwBi" id="1LBj9wAL9oI" role="37wK5m">
                               <node concept="37vLTw" id="1LBj9wAL97J" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKTi" />
+                                <ref role="3cqZAo" node="6E5fMGvfKTi" resolve="it" />
                               </node>
                               <node concept="2OwXpG" id="1LBj9wAL9QC" role="2OqNvi">
                                 <ref role="2Oxat5" node="3KN3A4uUwms" resolve="lang" />
@@ -4728,7 +4728,7 @@
                                         <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                                         <node concept="2OqwBi" id="1LBj9wALar6" role="37wK5m">
                                           <node concept="37vLTw" id="1LBj9wAJNTG" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="6E5fMGvfKTk" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKTk" resolve="it" />
                                           </node>
                                           <node concept="2OwXpG" id="1LBj9wALb3d" role="2OqNvi">
                                             <ref role="2Oxat5" node="3KN3A4uUwms" resolve="lang" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 1f80453e..d9931859 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -3431,7 +3431,7 @@
                                   <node concept="3clFbF" id="2hQbw6HlXgP" role="3cqZAp">
                                     <node concept="2OqwBi" id="2hQbw6HlXgQ" role="3clFbG">
                                       <node concept="37vLTw" id="2hQbw6HlXgR" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6E5fMGvfKTm" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKTm" resolve="it" />
                                       </node>
                                       <node concept="liA8E" id="2hQbw6HlXgS" role="2OqNvi">
                                         <ref role="37wK5l" node="36tQV5BD$_p" resolve="require" />
@@ -3512,7 +3512,7 @@
                             <node concept="3clFbF" id="2hQbw6HlH$1" role="3cqZAp">
                               <node concept="2OqwBi" id="2hQbw6HlH$2" role="3clFbG">
                                 <node concept="37vLTw" id="2hQbw6HlH$3" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKTo" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKTo" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="2hQbw6HlH$4" role="2OqNvi">
                                   <ref role="37wK5l" node="36tQV5BD$_p" resolve="require" />
@@ -5389,7 +5389,7 @@
                                             <node concept="3clFbF" id="500mE4_xdA5" role="3cqZAp">
                                               <node concept="2OqwBi" id="500mE4_xdA6" role="3clFbG">
                                                 <node concept="37vLTw" id="500mE4_xdA7" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="6E5fMGvfKTq" />
+                                                  <ref role="3cqZAo" node="6E5fMGvfKTq" resolve="it" />
                                                 </node>
                                                 <node concept="liA8E" id="500mE4_xdA8" role="2OqNvi">
                                                   <ref role="37wK5l" to="6exd:104EUzFOBnD" resolve="acceptVisitor" />
diff --git a/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.controlflow.mps b/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.controlflow.mps
index 1712350b..37f0df9b 100644
--- a/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.controlflow.mps
+++ b/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.controlflow.mps
@@ -6145,19 +6145,19 @@
                                     <ref role="3AqCNq" node="xaaVXuK7s8" resolve="merge" />
                                     <node concept="37jhX" id="1TH_SRmhrsl" role="3AunhB">
                                       <node concept="37vLTw" id="79EwspgJFgX" role="37jj2">
-                                        <ref role="3cqZAo" node="6E5fMGvfKNX" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKNX" resolve="b" />
                                       </node>
                                     </node>
                                     <node concept="37jhX" id="1TH_SRmhrsm" role="3AunhB">
                                       <node concept="37vLTw" id="79EwspgJFbS" role="37jj2">
-                                        <ref role="3cqZAo" node="6E5fMGvfKNV" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKNV" resolve="a" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="3clFbF" id="79EwspgLcUs" role="3cqZAp">
                                   <node concept="37vLTw" id="79EwspgLcUq" role="3clFbG">
-                                    <ref role="3cqZAo" node="6E5fMGvfKNX" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKNX" resolve="b" />
                                   </node>
                                 </node>
                               </node>
@@ -6201,19 +6201,19 @@
                                     <ref role="3AqCNq" node="xaaVXuK7s8" resolve="merge" />
                                     <node concept="37jhX" id="1TH_SRmhrsn" role="3AunhB">
                                       <node concept="37vLTw" id="79EwspgJS4d" role="37jj2">
-                                        <ref role="3cqZAo" node="6E5fMGvfKO1" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKO1" resolve="b" />
                                       </node>
                                     </node>
                                     <node concept="37jhX" id="1TH_SRmhrso" role="3AunhB">
                                       <node concept="37vLTw" id="79EwspgJS9e" role="37jj2">
-                                        <ref role="3cqZAo" node="6E5fMGvfKNZ" />
+                                        <ref role="3cqZAo" node="6E5fMGvfKNZ" resolve="a" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="3clFbF" id="79EwspgLd1$" role="3cqZAp">
                                   <node concept="37vLTw" id="79EwspgLd1y" role="3clFbG">
-                                    <ref role="3cqZAo" node="6E5fMGvfKO1" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKO1" resolve="b" />
                                   </node>
                                 </node>
                               </node>
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 5139c4c5..894d01cf 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -848,7 +848,7 @@
                                                 <ref role="cht4Q" to="bw37:2DPo4JTRwsM" resolve="Variable" />
                                               </node>
                                               <node concept="37vLTw" id="3w0n0hzn02W" role="1m5AlR">
-                                                <ref role="3cqZAo" node="6E5fMGvfKO3" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKO3" resolve="it" />
                                               </node>
                                             </node>
                                             <node concept="3TrcHB" id="3w0n0hzn02X" role="2OqNvi">
@@ -935,7 +935,7 @@
                                           <node concept="3clFbF" id="2cLnr$rF6YR" role="3cqZAp">
                                             <node concept="2OqwBi" id="2cLnr$rF6YS" role="3clFbG">
                                               <node concept="37vLTw" id="2cLnr$rF6YT" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6E5fMGvfKO5" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKO5" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="2cLnr$rF6YU" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1626,7 +1626,7 @@
                                                 <ref role="cht4Q" to="bw37:2DPo4JTRwsM" resolve="Variable" />
                                               </node>
                                               <node concept="37vLTw" id="3w0n0hznwAF" role="1m5AlR">
-                                                <ref role="3cqZAo" node="6E5fMGvfKO7" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKO7" resolve="it" />
                                               </node>
                                             </node>
                                             <node concept="3TrcHB" id="3w0n0hznwAG" role="2OqNvi">
@@ -1713,7 +1713,7 @@
                                           <node concept="3clFbF" id="3w0n0hznwBh" role="3cqZAp">
                                             <node concept="2OqwBi" id="3w0n0hznwBi" role="3clFbG">
                                               <node concept="37vLTw" id="3w0n0hznwBj" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6E5fMGvfKO9" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKO9" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="3w0n0hznwBk" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index c6d3443f..25815ce6 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -1041,7 +1041,7 @@
                                           <ref role="1Pybhc" node="Vo$tzLFdFq" resolve="VariableUtil" />
                                           <node concept="2OqwBi" id="2CF5XF5sRot" role="37wK5m">
                                             <node concept="37vLTw" id="2CF5XF5sRow" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6E5fMGvfKOc" />
+                                              <ref role="3cqZAo" node="6E5fMGvfKOc" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="2CF5XF5sRox" role="2OqNvi">
                                               <ref role="3Tt5mk" to="jfgh:2aBGSFggvpT" resolve="conclusion" />
@@ -1587,7 +1587,7 @@
                                             <ref role="cht4Q" to="bw37:2DPo4JTRwsM" resolve="Variable" />
                                           </node>
                                           <node concept="37vLTw" id="2CF5XF5un$T" role="1m5AlR">
-                                            <ref role="3cqZAo" node="6E5fMGvfKOe" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKOe" resolve="it" />
                                           </node>
                                         </node>
                                         <node concept="3TrcHB" id="2CF5XF5un$U" role="2OqNvi">
@@ -1684,7 +1684,7 @@
                                           <node concept="3clFbF" id="2cLnr$rF6YR" role="3cqZAp">
                                             <node concept="2OqwBi" id="2cLnr$rF6YS" role="3clFbG">
                                               <node concept="37vLTw" id="2cLnr$rF6YT" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6E5fMGvfKOg" />
+                                                <ref role="3cqZAo" node="6E5fMGvfKOg" resolve="it" />
                                               </node>
                                               <node concept="3TrcHB" id="2cLnr$rF6YU" role="2OqNvi">
                                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2732,7 +2732,7 @@
                           <node concept="1rXfSq" id="Vo$tzLFyPB" role="3clFbG">
                             <ref role="37wK5l" node="Vo$tzLFdPG" resolve="collectFreeVarsFromTerm" />
                             <node concept="37vLTw" id="Vo$tzLFz2V" role="37wK5m">
-                              <ref role="3cqZAo" node="6E5fMGvfKOi" />
+                              <ref role="3cqZAo" node="6E5fMGvfKOi" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="Vo$tzLGcRW" role="37wK5m">
                               <ref role="3cqZAo" node="Vo$tzLFdOO" resolve="names" />
@@ -2942,7 +2942,7 @@
                         <node concept="1rXfSq" id="Vo$tzLGwlY" role="3clFbG">
                           <ref role="37wK5l" node="Vo$tzLFdJV" resolve="collectFreeVars" />
                           <node concept="37vLTw" id="Vo$tzLGwlZ" role="37wK5m">
-                            <ref role="3cqZAo" node="6E5fMGvfKOk" />
+                            <ref role="3cqZAo" node="6E5fMGvfKOk" resolve="it" />
                           </node>
                           <node concept="37vLTw" id="Vo$tzLGwm0" role="37wK5m">
                             <ref role="3cqZAo" node="Vo$tzLFdOO" resolve="names" />
@@ -3026,7 +3026,7 @@
                               <node concept="1rXfSq" id="2CF5XF5pm2v" role="3clFbG">
                                 <ref role="37wK5l" node="Vo$tzLFdPG" resolve="collectFreeVarsFromTerm" />
                                 <node concept="37vLTw" id="2CF5XF5pm2w" role="37wK5m">
-                                  <ref role="3cqZAo" node="6E5fMGvfKOm" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKOm" resolve="it" />
                                 </node>
                                 <node concept="37vLTw" id="2CF5XF5pm2x" role="37wK5m">
                                   <ref role="3cqZAo" node="2CF5XF5pm27" resolve="names" />
@@ -3307,7 +3307,7 @@
                         <node concept="1rXfSq" id="2CF5XF5pm3W" role="3clFbG">
                           <ref role="37wK5l" node="2CF5XF5pm24" resolve="collectFreeVars" />
                           <node concept="37vLTw" id="2CF5XF5pm3X" role="37wK5m">
-                            <ref role="3cqZAo" node="6E5fMGvfKOo" />
+                            <ref role="3cqZAo" node="6E5fMGvfKOo" resolve="it" />
                           </node>
                           <node concept="37vLTw" id="2CF5XF5pm3Y" role="37wK5m">
                             <ref role="3cqZAo" node="2CF5XF5pm27" resolve="names" />
@@ -3384,7 +3384,7 @@
                       <node concept="3clFbF" id="Vo$tzLGzRX" role="3cqZAp">
                         <node concept="2OqwBi" id="Vo$tzLGzRY" role="3clFbG">
                           <node concept="37vLTw" id="Vo$tzLGzRZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKOq" />
+                            <ref role="3cqZAo" node="6E5fMGvfKOq" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="Vo$tzLGzS0" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/samples/fitch/languages/samples.fitch/models/constraints.mps b/samples/fitch/languages/samples.fitch/models/constraints.mps
index d83bfd2a..f197c120 100644
--- a/samples/fitch/languages/samples.fitch/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch/models/constraints.mps
@@ -207,7 +207,7 @@
                                 <ref role="cht4Q" to="jfgh:3JXBM6C3UQB" resolve="Node" />
                               </node>
                               <node concept="37vLTw" id="3JXBM6C5wNt" role="1m5AlR">
-                                <ref role="3cqZAo" node="6E5fMGvfKOu" />
+                                <ref role="3cqZAo" node="6E5fMGvfKOu" resolve="it" />
                               </node>
                             </node>
                             <node concept="3TrcHB" id="3JXBM6C5wNu" role="2OqNvi">
@@ -313,7 +313,7 @@
                       <node concept="3cpWs3" id="3JXBM6C4GzK" role="3clFbG">
                         <node concept="2OqwBi" id="3JXBM6C4H4O" role="3uHU7w">
                           <node concept="37vLTw" id="3JXBM6C4GzU" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKOw" />
+                            <ref role="3cqZAo" node="6E5fMGvfKOw" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3JXBM6C4Hw1" role="2OqNvi">
                             <ref role="3TsBF5" to="jfgh:3JXBM6C4nuA" resolve="contentSize" />
@@ -481,7 +481,7 @@
                       <node concept="3cpWs3" id="3JXBM6C4VsY" role="3clFbG">
                         <node concept="2OqwBi" id="3JXBM6C4VsZ" role="3uHU7w">
                           <node concept="37vLTw" id="3JXBM6C4Vt0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKOy" />
+                            <ref role="3cqZAo" node="6E5fMGvfKOy" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3JXBM6C4Vt1" role="2OqNvi">
                             <ref role="3TsBF5" to="jfgh:3JXBM6C4nuA" resolve="contentSize" />
diff --git a/samples/fitch/languages/samples.fitch/models/editor.mps b/samples/fitch/languages/samples.fitch/models/editor.mps
index 08c3a8e9..8bf9070f 100644
--- a/samples/fitch/languages/samples.fitch/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch/models/editor.mps
@@ -985,7 +985,7 @@
                               <node concept="22lmx$" id="5jVx7S2079J" role="3clFbG">
                                 <node concept="2OqwBi" id="5jVx7S2079K" role="3uHU7w">
                                   <node concept="37vLTw" id="5jVx7S2079L" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKO$" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKO$" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="5jVx7S2079M" role="2OqNvi">
                                     <node concept="chp4Y" id="5jVx7S2079N" role="cj9EA">
@@ -995,7 +995,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="5jVx7S2079O" role="3uHU7B">
                                   <node concept="37vLTw" id="5jVx7S2079P" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKO$" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKO$" resolve="it" />
                                   </node>
                                   <node concept="1mIQ4w" id="5jVx7S2079Q" role="2OqNvi">
                                     <node concept="chp4Y" id="5jVx7S2079R" role="cj9EA">
@@ -1049,7 +1049,7 @@
                                   <ref role="cht4Q" to="jfgh:3JXBM6C3OtS" resolve="Reasoning" />
                                 </node>
                                 <node concept="37vLTw" id="5jVx7S1Zz6N" role="1m5AlR">
-                                  <ref role="3cqZAo" node="6E5fMGvfKOA" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKOA" resolve="it" />
                                 </node>
                               </node>
                             </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
index e85fda16..0aa3f730 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
@@ -359,7 +359,7 @@
                                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                               </node>
                               <node concept="37vLTw" id="48ZGLP7qtlQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKOD" />
+                                <ref role="3cqZAo" node="6E5fMGvfKOD" resolve="it" />
                               </node>
                             </node>
                           </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
index d48d8005..94f30cb1 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
@@ -818,7 +818,7 @@
                           <node concept="3clFbF" id="2O9ahh6yYwg" role="3cqZAp">
                             <node concept="2OqwBi" id="2O9ahh6z0gj" role="3clFbG">
                               <node concept="37vLTw" id="2O9ahh6yYwf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKOF" />
+                                <ref role="3cqZAo" node="6E5fMGvfKOF" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="2O9ahh6z2CE" role="2OqNvi">
                                 <ref role="3Tt5mk" to="8tt8:2O9ahh6mHnH" resolve="annVar" />
@@ -1816,7 +1816,7 @@
                               <node concept="3JPx81" id="3TFdEPZgruq" role="2OqNvi">
                                 <node concept="2OqwBi" id="3TFdEPZgrur" role="25WWJ7">
                                   <node concept="37vLTw" id="3TFdEPZgrus" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKOH" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKOH" resolve="it" />
                                   </node>
                                   <node concept="3TrcHB" id="3TFdEPZgrut" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1866,7 +1866,7 @@
                         <node concept="3clFbF" id="1GKPrS22KhM" role="3cqZAp">
                           <node concept="2OqwBi" id="1GKPrS22KhN" role="3clFbG">
                             <node concept="37vLTw" id="1GKPrS22KhO" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKOJ" />
+                              <ref role="3cqZAo" node="6E5fMGvfKOJ" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1GKPrS22KhP" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2245,7 +2245,7 @@
                           <node concept="3y3z36" id="2O9ahh6F1K2" role="3clFbG">
                             <node concept="3kakTB" id="2O9ahh6F2eg" role="3uHU7w" />
                             <node concept="37vLTw" id="2O9ahh6F1Zc" role="3uHU7B">
-                              <ref role="3cqZAo" node="6E5fMGvfKOL" />
+                              <ref role="3cqZAo" node="6E5fMGvfKOL" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -2263,7 +2263,7 @@
                       <node concept="3clFbF" id="2O9ahh6FjgX" role="3cqZAp">
                         <node concept="2OqwBi" id="2O9ahh6FjzZ" role="3clFbG">
                           <node concept="37vLTw" id="2O9ahh6FjgW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKON" />
+                            <ref role="3cqZAo" node="6E5fMGvfKON" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2O9ahh6FvL8" role="2OqNvi">
                             <ref role="3Tt5mk" to="8tt8:2O9ahh6mHnX" resolve="proto" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 27f5fdd9..14a93635 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -9873,7 +9873,7 @@
                         <node concept="2OqwBi" id="47xL5G3udo6" role="3uHU7B">
                           <node concept="2OqwBi" id="47tET_WADUo" role="2Oq$k0">
                             <node concept="37vLTw" id="47tET_WADHF" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKOP" />
+                              <ref role="3cqZAo" node="6E5fMGvfKOP" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="47tET_WAHHN" role="2OqNvi">
                               <ref role="3Tt5mk" to="8tt8:2O9ahh6mHo2" resolve="typeclass" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
index 1465bc56..b698e8b2 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
@@ -1305,7 +1305,7 @@
                                     <node concept="3clFbF" id="1uV2bz2c2O4" role="3cqZAp">
                                       <node concept="2OqwBi" id="1uV2bz2c3jb" role="3clFbG">
                                         <node concept="37vLTw" id="1uV2bz2c2O3" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6E5fMGvfKOS" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKOS" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="1uV2bz2c46O" role="2OqNvi">
                                           <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
@@ -1382,7 +1382,7 @@
                                     <node concept="3clFbF" id="1uV2bz2capD" role="3cqZAp">
                                       <node concept="2OqwBi" id="1uV2bz2caxk" role="3clFbG">
                                         <node concept="37vLTw" id="1uV2bz2capC" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6E5fMGvfKOU" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKOU" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="1uV2bz2caMT" role="2OqNvi">
                                           <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
@@ -1481,7 +1481,7 @@
                                     <node concept="3fqX7Q" id="1uV2bz2bJVN" role="3clFbG">
                                       <node concept="2OqwBi" id="1uV2bz2bJVP" role="3fr31v">
                                         <node concept="37vLTw" id="1uV2bz2bJVQ" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6E5fMGvfKOW" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKOW" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="1uV2bz2bJVR" role="2OqNvi">
                                           <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
@@ -1524,7 +1524,7 @@
                           <ref role="cht4Q" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
                         </node>
                         <node concept="37vLTw" id="1aCOVac0qUo" role="1m5AlR">
-                          <ref role="3cqZAo" node="6E5fMGvfKOY" />
+                          <ref role="3cqZAo" node="6E5fMGvfKOY" resolve="it" />
                         </node>
                       </node>
                       <node concept="2qgKlT" id="1aCOVac0y0X" role="2OqNvi">
@@ -2312,7 +2312,7 @@
                               <node concept="3clFbF" id="1uV2bz28AQr" role="3cqZAp">
                                 <node concept="2OqwBi" id="1uV2bz28AQs" role="3clFbG">
                                   <node concept="37vLTw" id="1uV2bz28AQt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKP0" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKP0" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="1uV2bz28AQu" role="2OqNvi">
                                     <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
@@ -4000,7 +4000,7 @@
                     <node concept="1rXfSq" id="4Z0pyZIETPJ" role="3clFbG">
                       <ref role="37wK5l" node="4Z0pyZIEL8V" resolve="isVoid" />
                       <node concept="37vLTw" id="4Z0pyZIETPK" role="37wK5m">
-                        <ref role="3cqZAo" node="6E5fMGvfKP2" />
+                        <ref role="3cqZAo" node="6E5fMGvfKP2" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -4033,7 +4033,7 @@
                       <node concept="1rXfSq" id="4yZzE4kNFIA" role="3fr31v">
                         <ref role="37wK5l" node="4Z0pyZIEL8V" resolve="isVoid" />
                         <node concept="37vLTw" id="4yZzE4kNFIB" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKP4" />
+                          <ref role="3cqZAo" node="6E5fMGvfKP4" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -4321,7 +4321,7 @@
                   <node concept="3clFbF" id="1aCOVabZhaY" role="3cqZAp">
                     <node concept="2OqwBi" id="1aCOVabZhaZ" role="3clFbG">
                       <node concept="37vLTw" id="1aCOVabZhb0" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKP6" />
+                        <ref role="3cqZAo" node="6E5fMGvfKP6" resolve="it" />
                       </node>
                       <node concept="32TBzR" id="1aCOVabZhb1" role="2OqNvi" />
                     </node>
@@ -4747,7 +4747,7 @@
                           <node concept="3clFbF" id="7hlgk9K_Jpp" role="3cqZAp">
                             <node concept="2OqwBi" id="7hlgk9K_Jpq" role="3clFbG">
                               <node concept="37vLTw" id="7hlgk9K_Jpr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKP8" />
+                                <ref role="3cqZAo" node="6E5fMGvfKP8" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="7hlgk9K_Jps" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -5333,7 +5333,7 @@
                           <node concept="3clFbF" id="554EtBH_$Cr" role="3cqZAp">
                             <node concept="2OqwBi" id="554EtBH_$Cs" role="3clFbG">
                               <node concept="37vLTw" id="554EtBH_$Ct" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKPa" />
+                                <ref role="3cqZAo" node="6E5fMGvfKPa" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="554EtBH_$Cu" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -15364,7 +15364,7 @@
                           <node concept="1Wc70l" id="3DgB4rOyq23" role="3clFbG">
                             <node concept="2OqwBi" id="3DgB4rOyq24" role="3uHU7w">
                               <node concept="37vLTw" id="3DgB4rOyq25" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKPc" />
+                                <ref role="3cqZAo" node="6E5fMGvfKPc" resolve="m" />
                               </node>
                               <node concept="2qgKlT" id="3DgB4rOyq26" role="2OqNvi">
                                 <ref role="37wK5l" to="tpek:28P2dHxCoRl" resolve="isAnAbstractMethod" />
@@ -15379,7 +15379,7 @@
                                   <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                   <node concept="2OqwBi" id="3DgB4rOyq2b" role="37wK5m">
                                     <node concept="37vLTw" id="3DgB4rOyq2c" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6E5fMGvfKPc" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKPc" resolve="m" />
                                     </node>
                                     <node concept="3TrcHB" id="3DgB4rOyq2d" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps
index 1c711247..76677c57 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps
@@ -424,7 +424,7 @@
                             <node concept="2OqwBi" id="5kd4gAC0X5G" role="2JrQYb">
                               <node concept="2OqwBi" id="5kd4gAC0X5H" role="2Oq$k0">
                                 <node concept="37vLTw" id="5kd4gAC0X5I" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKPe" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKPe" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="5kd4gAC0X5J" role="2OqNvi">
                                   <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
@@ -450,7 +450,7 @@
                       <node concept="2OqwBi" id="5kd4gAC0X5R" role="3clFbG">
                         <node concept="2OqwBi" id="5kd4gAC0X5S" role="2Oq$k0">
                           <node concept="37vLTw" id="5kd4gAC0X5T" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKPg" />
+                            <ref role="3cqZAo" node="6E5fMGvfKPg" resolve="ctr" />
                           </node>
                           <node concept="3TrEf2" id="5kd4gAC0X5U" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
@@ -472,7 +472,7 @@
                       <node concept="2OqwBi" id="5kd4gAC0X60" role="3clFbG">
                         <node concept="2OqwBi" id="5kd4gAC0X61" role="2Oq$k0">
                           <node concept="37vLTw" id="5kd4gAC0X62" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKPg" />
+                            <ref role="3cqZAo" node="6E5fMGvfKPg" resolve="ctr" />
                           </node>
                           <node concept="3Tsc0h" id="5kd4gAC0X63" role="2OqNvi">
                             <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
@@ -575,7 +575,7 @@
                               <node concept="2JrnkZ" id="4s_lMmHgaBU" role="2Oq$k0">
                                 <node concept="2OqwBi" id="4s_lMmHg9UP" role="2JrQYb">
                                   <node concept="37vLTw" id="4s_lMmHg9_c" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKPi" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKPi" resolve="it" />
                                   </node>
                                   <node concept="iZEcu" id="4s_lMmHgahh" role="2OqNvi" />
                                 </node>
@@ -646,7 +646,7 @@
                           <node concept="3clFbF" id="5kd4gAC0X3T" role="3cqZAp">
                             <node concept="2OqwBi" id="5kd4gAC0X3U" role="3clFbG">
                               <node concept="37vLTw" id="5kd4gAC0X3V" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKPk" />
+                                <ref role="3cqZAo" node="6E5fMGvfKPk" resolve="it" />
                               </node>
                               <node concept="2Rf3mk" id="5kd4gAC0X3W" role="2OqNvi">
                                 <node concept="1xMEDy" id="5kd4gAC0X3X" role="1xVPHs">
@@ -686,7 +686,7 @@
                               <node concept="2OqwBi" id="5kd4gAC0X4c" role="2JrQYb">
                                 <node concept="2OqwBi" id="5kd4gAC0X4d" role="2Oq$k0">
                                   <node concept="37vLTw" id="5kd4gAC0X4e" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKPm" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKPm" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5kd4gAC0X4f" role="2OqNvi">
                                     <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index ae06e21d..668e7b52 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -2184,7 +2184,7 @@
                       <node concept="3clFbF" id="3CquOVr5kV5" role="3cqZAp">
                         <node concept="2OqwBi" id="3CquOVr5leJ" role="3clFbG">
                           <node concept="37vLTw" id="3CquOVr5kV4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKPo" />
+                            <ref role="3cqZAo" node="6E5fMGvfKPo" resolve="it" />
                           </node>
                           <node concept="liA8E" id="3CquOVr5lvh" role="2OqNvi">
                             <ref role="37wK5l" node="6$6scRbYuZ5" resolve="iterate" />
@@ -2205,7 +2205,7 @@
                     <node concept="3clFbF" id="3CquOVr5xTs" role="3cqZAp">
                       <node concept="2OqwBi" id="3CquOVr5ybj" role="3clFbG">
                         <node concept="37vLTw" id="3CquOVr5xTr" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKPq" />
+                          <ref role="3cqZAo" node="6E5fMGvfKPq" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3CquOVr5yJg" role="2OqNvi">
                           <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
@@ -3232,7 +3232,7 @@
                                       <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
                                     </node>
                                     <node concept="37vLTw" id="5ygLqKOK4t$" role="1m5AlR">
-                                      <ref role="3cqZAo" node="6E5fMGvfKPs" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKPs" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="2qgKlT" id="5ygLqKOKnnE" role="2OqNvi">
@@ -31816,7 +31816,7 @@
                         <node concept="2OqwBi" id="3sbALnUg7X_" role="3clFbG">
                           <node concept="2OqwBi" id="3sbALnUg7vm" role="2Oq$k0">
                             <node concept="37vLTw" id="3sbALnUg7nj" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKPu" />
+                              <ref role="3cqZAo" node="6E5fMGvfKPu" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3sbALnUg7EZ" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:hf$I4rk" resolve="expression" />
@@ -38619,7 +38619,7 @@
                                       <ref role="37wK5l" node="4JBuioHVoYX" resolve="resolveAll" />
                                       <node concept="2OqwBi" id="3bgqfmlJj83" role="37wK5m">
                                         <node concept="37vLTw" id="3bgqfmlJj84" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6E5fMGvfKPw" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKPw" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="3bgqfmlJj85" role="2OqNvi">
                                           <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -38664,7 +38664,7 @@
                               <node concept="3clFbF" id="1GAclsBExjE" role="3cqZAp">
                                 <node concept="2OqwBi" id="1GAclsBExNz" role="3clFbG">
                                   <node concept="37vLTw" id="1GAclsBExjD" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKPy" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKPy" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="1GAclsBEyRE" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
@@ -49565,7 +49565,7 @@
                             <node concept="1rXfSq" id="4AOWlUn0tr8" role="3clFbG">
                               <ref role="37wK5l" node="rZZ6I4eK8" resolve="identity" />
                               <node concept="37vLTw" id="4AOWlUn0tr9" role="37wK5m">
-                                <ref role="3cqZAo" node="6E5fMGvfKP$" />
+                                <ref role="3cqZAo" node="6E5fMGvfKP$" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -49649,7 +49649,7 @@
                       <node concept="2OqwBi" id="4AOWlUn0ttC" role="3clFbG">
                         <node concept="2OqwBi" id="4AOWlUn0ttD" role="2Oq$k0">
                           <node concept="37vLTw" id="4AOWlUn0ttE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKPA" />
+                            <ref role="3cqZAo" node="6E5fMGvfKPA" resolve="it" />
                           </node>
                           <node concept="liA8E" id="4AOWlUn0ttF" role="2OqNvi">
                             <ref role="37wK5l" node="6$6scRbYuZ5" resolve="iterate" />
@@ -49776,7 +49776,7 @@
                                           <property role="3cmrfH" value="0" />
                                         </node>
                                         <node concept="37vLTw" id="4AOWlUn66OC" role="1LFl5Q">
-                                          <ref role="3cqZAo" node="6E5fMGvfKPC" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKPC" resolve="it" />
                                         </node>
                                       </node>
                                       <node concept="3uibUv" id="4AOWlUn67fq" role="10QFUM">
@@ -49802,7 +49802,7 @@
                                           <property role="3cmrfH" value="1" />
                                         </node>
                                         <node concept="37vLTw" id="4AOWlUn6b4P" role="1LFl5Q">
-                                          <ref role="3cqZAo" node="6E5fMGvfKPC" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKPC" resolve="it" />
                                         </node>
                                       </node>
                                       <node concept="3uibUv" id="4AOWlUn6blx" role="10QFUM">
@@ -50026,7 +50026,7 @@
                             <property role="3cmrfH" value="0" />
                           </node>
                           <node concept="37vLTw" id="6$6scRbP83O" role="1LFl5Q">
-                            <ref role="3cqZAo" node="6E5fMGvfKPE" />
+                            <ref role="3cqZAo" node="6E5fMGvfKPE" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -50200,7 +50200,7 @@
                               <node concept="3JPx81" id="6$6scRbLhGK" role="2OqNvi">
                                 <node concept="2OqwBi" id="6$6scRbLhGL" role="25WWJ7">
                                   <node concept="37vLTw" id="6$6scRbLhGM" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKPG" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKPG" resolve="it" />
                                   </node>
                                   <node concept="3AY5_j" id="6$6scRbLhGN" role="2OqNvi" />
                                 </node>
@@ -50222,7 +50222,7 @@
                       <node concept="3clFbF" id="6$6scRbLhGT" role="3cqZAp">
                         <node concept="2OqwBi" id="6$6scRbLhGU" role="3clFbG">
                           <node concept="37vLTw" id="6$6scRbLhGV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKPI" />
+                            <ref role="3cqZAo" node="6E5fMGvfKPI" resolve="it" />
                           </node>
                           <node concept="3AV6Ez" id="6$6scRbLhGW" role="2OqNvi" />
                         </node>
@@ -51476,7 +51476,7 @@
                         <node concept="3EllGN" id="74XSvywJCdB" role="33vP2m">
                           <node concept="2OqwBi" id="74XSvywJCdC" role="3ElVtu">
                             <node concept="37vLTw" id="74XSvywJCdD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKPK" />
+                              <ref role="3cqZAo" node="6E5fMGvfKPK" resolve="tvRef" />
                             </node>
                             <node concept="3TrEf2" id="74XSvywJCdE" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:g96sUm1" resolve="typeVariableDeclaration" />
@@ -51491,7 +51491,7 @@
                     <node concept="3clFbF" id="74XSvywJCdG" role="3cqZAp">
                       <node concept="2OqwBi" id="74XSvywJCdH" role="3clFbG">
                         <node concept="37vLTw" id="74XSvywJCdI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKPK" />
+                          <ref role="3cqZAo" node="6E5fMGvfKPK" resolve="tvRef" />
                         </node>
                         <node concept="1P9Npp" id="74XSvywJCdJ" role="2OqNvi">
                           <node concept="3K4zz7" id="74XSvywJCdK" role="1P9ThW">
@@ -51502,7 +51502,7 @@
                               <node concept="1$rogu" id="74XSvywJCdN" role="2OqNvi" />
                             </node>
                             <node concept="37vLTw" id="74XSvywJCdO" role="3K4GZi">
-                              <ref role="3cqZAo" node="6E5fMGvfKPK" />
+                              <ref role="3cqZAo" node="6E5fMGvfKPK" resolve="tvRef" />
                             </node>
                             <node concept="2OqwBi" id="74XSvywJCdP" role="3K4Cdx">
                               <node concept="37vLTw" id="74XSvywJCdQ" role="2Oq$k0">
@@ -52427,7 +52427,7 @@
                                                         <node concept="1rXfSq" id="3bgqfmlGP7Z" role="3clFbG">
                                                           <ref role="37wK5l" node="rZZ6Hi$jy" resolve="getBoundCopy" />
                                                           <node concept="37vLTw" id="3bgqfmlGP80" role="37wK5m">
-                                                            <ref role="3cqZAo" node="6E5fMGvfKPM" />
+                                                            <ref role="3cqZAo" node="6E5fMGvfKPM" resolve="it" />
                                                           </node>
                                                         </node>
                                                       </node>
@@ -52478,7 +52478,7 @@
                                                   <node concept="liA8E" id="74XSvywK1it" role="2OqNvi">
                                                     <ref role="37wK5l" node="74XSvywJzAV" resolve="substituteTypeVariables" />
                                                     <node concept="37vLTw" id="74XSvywK1yg" role="37wK5m">
-                                                      <ref role="3cqZAo" node="6E5fMGvfKPO" />
+                                                      <ref role="3cqZAo" node="6E5fMGvfKPO" resolve="it" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -52593,7 +52593,7 @@
                                             <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
                                           </node>
                                           <node concept="37vLTw" id="z9rjE_0Rwc" role="33vP2m">
-                                            <ref role="3cqZAo" node="6E5fMGvfKPS" />
+                                            <ref role="3cqZAo" node="6E5fMGvfKPS" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
@@ -52644,7 +52644,7 @@
                                                           <node concept="1rXfSq" id="z9rjE_0Rw_" role="3clFbG">
                                                             <ref role="37wK5l" node="rZZ6Hi$jy" resolve="getBoundCopy" />
                                                             <node concept="37vLTw" id="z9rjE_0RwA" role="37wK5m">
-                                                              <ref role="3cqZAo" node="6E5fMGvfKPQ" />
+                                                              <ref role="3cqZAo" node="6E5fMGvfKPQ" resolve="it" />
                                                             </node>
                                                           </node>
                                                         </node>
@@ -56311,7 +56311,7 @@
                     <node concept="3clFbF" id="3rrtTcSliT2" role="3cqZAp">
                       <node concept="2OqwBi" id="3rrtTcSlj5g" role="3clFbG">
                         <node concept="37vLTw" id="3rrtTcSliT1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKPU" />
+                          <ref role="3cqZAo" node="6E5fMGvfKPU" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3rrtTcSljo2" role="2OqNvi">
                           <ref role="3Tt5mk" to="tpee:fzcqZ_G" resolve="expression" />
@@ -56397,7 +56397,7 @@
                           <node concept="3clFbF" id="3rrtTcSlml7" role="3cqZAp">
                             <node concept="2OqwBi" id="3rrtTcSlml8" role="3clFbG">
                               <node concept="37vLTw" id="3rrtTcSlml9" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKPW" />
+                                <ref role="3cqZAo" node="6E5fMGvfKPW" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="3rrtTcSlmla" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpee:fzcqZ_G" resolve="expression" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index 6d7cc9fa..e8e24b78 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -1752,7 +1752,7 @@
                   <node concept="3clFbF" id="51ek2rSdkrO" role="3cqZAp">
                     <node concept="2OqwBi" id="51ek2rSdkBj" role="3clFbG">
                       <node concept="37vLTw" id="51ek2rSdkrN" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKPY" />
+                        <ref role="3cqZAo" node="6E5fMGvfKPY" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="51ek2rSdkPH" role="2OqNvi">
                         <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
@@ -1784,7 +1784,7 @@
                   <node concept="3clFbF" id="51ek2rSdqLh" role="3cqZAp">
                     <node concept="2OqwBi" id="51ek2rSdqXp" role="3clFbG">
                       <node concept="37vLTw" id="51ek2rSdqLg" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKQ0" />
+                        <ref role="3cqZAo" node="6E5fMGvfKQ0" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="51ek2rSdrfb" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
index e40a0fab..d4d3d26a 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
@@ -339,7 +339,7 @@
                                       <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                       <node concept="2OqwBi" id="6suuiWXKFO1" role="37wK5m">
                                         <node concept="37vLTw" id="6suuiWXKFO2" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6E5fMGvfKQ2" />
+                                          <ref role="3cqZAo" node="6E5fMGvfKQ2" resolve="it" />
                                         </node>
                                         <node concept="3TrcHB" id="6suuiWXKFO3" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps
index 8f174bce..d84bdc44 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps
@@ -1294,10 +1294,10 @@
                 <node concept="3clFbF" id="554EtBHzhw8" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHzhHU" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHzhLS" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTu" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTu" resolve="itS" />
                     </node>
                     <node concept="37vLTw" id="554EtBHzhzS" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKTs" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTs" resolve="itT" />
                     </node>
                   </node>
                 </node>
@@ -1364,10 +1364,10 @@
                 <node concept="3clFbF" id="554EtBHMN20" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHMN21" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHMNkQ" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTw" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTw" resolve="itT" />
                     </node>
                     <node concept="37vLTw" id="554EtBHMNgJ" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKTy" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTy" resolve="itS" />
                     </node>
                   </node>
                 </node>
@@ -1394,10 +1394,10 @@
                 <node concept="3clFbF" id="554EtBHOuZT" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHOuZU" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHOvr2" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTA" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTA" resolve="itS" />
                     </node>
                     <node concept="37vLTw" id="554EtBHOvtN" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKT$" />
+                      <ref role="3cqZAo" node="6E5fMGvfKT$" resolve="itT" />
                     </node>
                   </node>
                 </node>
@@ -1423,10 +1423,10 @@
                 <node concept="3clFbF" id="554EtBHODg5" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHODg6" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHODg7" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTE" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTE" resolve="itS" />
                     </node>
                     <node concept="37vLTw" id="554EtBHODg8" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKTC" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTC" resolve="itT" />
                     </node>
                   </node>
                 </node>
@@ -1452,10 +1452,10 @@
                 <node concept="3clFbF" id="554EtBHFrrB" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHFrrC" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHFrrD" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTI" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTI" resolve="itC" />
                     </node>
                     <node concept="37vLTw" id="554EtBHFrrE" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKTG" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTG" resolve="itB" />
                     </node>
                   </node>
                 </node>
@@ -1479,10 +1479,10 @@
                 <node concept="3clFbF" id="554EtBHOlwk" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHOlwl" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHOlQq" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTK" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTK" resolve="itB" />
                     </node>
                     <node concept="37vLTw" id="554EtBHOlPv" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKTM" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTM" resolve="itC" />
                     </node>
                     <node concept="1U20sH" id="554EtBHOlZe" role="lGtFl">
                       <property role="1U20sK" value="error" />
@@ -1518,10 +1518,10 @@
                 <node concept="3clFbF" id="554EtBHOnp8" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHOnp9" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHOnpa" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTQ" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTQ" resolve="itC" />
                     </node>
                     <node concept="37vLTw" id="554EtBHOnpb" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKTO" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTO" resolve="itB" />
                     </node>
                   </node>
                 </node>
@@ -1547,10 +1547,10 @@
                 <node concept="3clFbF" id="554EtBHOAXZ" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHOAY0" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHOAY1" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTU" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTU" resolve="itC" />
                     </node>
                     <node concept="37vLTw" id="554EtBHOAY2" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKTS" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTS" resolve="itB" />
                     </node>
                   </node>
                 </node>
@@ -1618,10 +1618,10 @@
                 <node concept="3clFbF" id="554EtBHU6Y_" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHU6YA" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHU6YB" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKTY" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTY" resolve="itC" />
                     </node>
                     <node concept="37vLTw" id="554EtBHU6YC" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKTW" />
+                      <ref role="3cqZAo" node="6E5fMGvfKTW" resolve="itB" />
                     </node>
                   </node>
                 </node>
@@ -1645,10 +1645,10 @@
                 <node concept="3clFbF" id="554EtBHU6YL" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHU6YM" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHU6YN" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKU0" />
+                      <ref role="3cqZAo" node="6E5fMGvfKU0" resolve="itB" />
                     </node>
                     <node concept="37vLTw" id="554EtBHU6YO" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKU2" />
+                      <ref role="3cqZAo" node="6E5fMGvfKU2" resolve="itC" />
                     </node>
                     <node concept="1U20sH" id="554EtBHU6YP" role="lGtFl">
                       <property role="1U20sK" value="error" />
@@ -1684,10 +1684,10 @@
                 <node concept="3clFbF" id="554EtBHU6Z1" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHU6Z2" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHU6Z3" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKU6" />
+                      <ref role="3cqZAo" node="6E5fMGvfKU6" resolve="itC" />
                     </node>
                     <node concept="37vLTw" id="554EtBHU6Z4" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKU4" />
+                      <ref role="3cqZAo" node="6E5fMGvfKU4" resolve="itB" />
                     </node>
                   </node>
                 </node>
@@ -1713,10 +1713,10 @@
                 <node concept="3clFbF" id="554EtBHU6Ze" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHU6Zf" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHU6Zg" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKUa" />
+                      <ref role="3cqZAo" node="6E5fMGvfKUa" resolve="itC" />
                     </node>
                     <node concept="37vLTw" id="554EtBHU6Zh" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKU8" />
+                      <ref role="3cqZAo" node="6E5fMGvfKU8" resolve="itB" />
                     </node>
                   </node>
                 </node>
@@ -1754,10 +1754,10 @@
                 <node concept="3clFbF" id="554EtBHPowJ" role="3cqZAp">
                   <node concept="37vLTI" id="554EtBHPowK" role="3clFbG">
                     <node concept="37vLTw" id="554EtBHPowL" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKUe" />
+                      <ref role="3cqZAo" node="6E5fMGvfKUe" resolve="itS" />
                     </node>
                     <node concept="37vLTw" id="554EtBHPowM" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKUc" />
+                      <ref role="3cqZAo" node="6E5fMGvfKUc" resolve="itT" />
                     </node>
                   </node>
                 </node>
@@ -1942,7 +1942,7 @@
                   <node concept="37vLTI" id="6yxoGioiBsG" role="3clFbG">
                     <node concept="10Nm6u" id="6yxoGioiBsH" role="37vLTx" />
                     <node concept="37vLTw" id="6yxoGioiBsI" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKUg" />
+                      <ref role="3cqZAo" node="6E5fMGvfKUg" resolve="itS" />
                     </node>
                   </node>
                 </node>
@@ -1968,7 +1968,7 @@
                       <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
                     </node>
                     <node concept="37vLTw" id="6yxoGioiBsT" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKUi" />
+                      <ref role="3cqZAo" node="6E5fMGvfKUi" resolve="itS" />
                     </node>
                   </node>
                 </node>
@@ -2038,7 +2038,7 @@
                     <node concept="37vLTI" id="6yxoGioiBt2" role="3clFbG">
                       <node concept="10Nm6u" id="6yxoGioiBt3" role="37vLTx" />
                       <node concept="37vLTw" id="6yxoGioiBt4" role="37vLTJ">
-                        <ref role="3cqZAo" node="6E5fMGvfKUk" />
+                        <ref role="3cqZAo" node="6E5fMGvfKUk" resolve="itS" />
                       </node>
                     </node>
                   </node>
@@ -2113,7 +2113,7 @@
                         <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
                       </node>
                       <node concept="37vLTw" id="6yxoGioiBtf" role="37vLTx">
-                        <ref role="3cqZAo" node="6E5fMGvfKUm" />
+                        <ref role="3cqZAo" node="6E5fMGvfKUm" resolve="itS" />
                       </node>
                     </node>
                   </node>
@@ -2143,7 +2143,7 @@
                       <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
                     </node>
                     <node concept="37vLTw" id="6yxoGioiBtq" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKUo" />
+                      <ref role="3cqZAo" node="6E5fMGvfKUo" resolve="itS" />
                     </node>
                   </node>
                 </node>
@@ -2261,10 +2261,10 @@
                 <node concept="3clFbF" id="6yxoGioiQwO" role="3cqZAp">
                   <node concept="37vLTI" id="6yxoGioiQwP" role="3clFbG">
                     <node concept="37vLTw" id="6yxoGioiQwQ" role="37vLTx">
-                      <ref role="3cqZAo" node="6E5fMGvfKUs" />
+                      <ref role="3cqZAo" node="6E5fMGvfKUs" resolve="itC" />
                     </node>
                     <node concept="37vLTw" id="6yxoGioiQwR" role="37vLTJ">
-                      <ref role="3cqZAo" node="6E5fMGvfKUq" />
+                      <ref role="3cqZAo" node="6E5fMGvfKUq" resolve="itB" />
                     </node>
                   </node>
                 </node>
@@ -2497,10 +2497,10 @@
                   <node concept="3clFbF" id="6yxoGioiQUG" role="3cqZAp">
                     <node concept="37vLTI" id="6yxoGioiQUH" role="3clFbG">
                       <node concept="37vLTw" id="6yxoGioiQUI" role="37vLTx">
-                        <ref role="3cqZAo" node="6E5fMGvfKUw" />
+                        <ref role="3cqZAo" node="6E5fMGvfKUw" resolve="itC" />
                       </node>
                       <node concept="37vLTw" id="6yxoGioiQUJ" role="37vLTJ">
-                        <ref role="3cqZAo" node="6E5fMGvfKUu" />
+                        <ref role="3cqZAo" node="6E5fMGvfKUu" resolve="itB" />
                       </node>
                     </node>
                   </node>
@@ -2529,7 +2529,7 @@
                   <node concept="3clFbF" id="3ZtutRa2Rea" role="3cqZAp">
                     <node concept="37vLTI" id="3ZtutRa2Reb" role="3clFbG">
                       <node concept="37vLTw" id="3ZtutRa2Rec" role="37vLTx">
-                        <ref role="3cqZAo" node="6E5fMGvfKUy" />
+                        <ref role="3cqZAo" node="6E5fMGvfKUy" resolve="itC" />
                       </node>
                       <node concept="37vLTw" id="3ZtutRa2SEJ" role="37vLTJ">
                         <ref role="3cqZAo" node="3ZtutRa2SqM" resolve="cc1" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps
index c13dcf3c..6ddd911a 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps
@@ -7092,7 +7092,7 @@
                   <node concept="3clFbS" id="3Z1xyIwnYRl" role="1bW5cS">
                     <node concept="3clFbF" id="3Z1xyIwnYY4" role="3cqZAp">
                       <node concept="37vLTw" id="3Z1xyIwnYY3" role="3clFbG">
-                        <ref role="3cqZAo" node="6E5fMGvfKUS" />
+                        <ref role="3cqZAo" node="6E5fMGvfKUS" resolve="aa" />
                       </node>
                     </node>
                   </node>
@@ -7123,7 +7123,7 @@
                   <node concept="3clFbS" id="3Z1xyIwnZn8" role="1bW5cS">
                     <node concept="3clFbF" id="3Z1xyIwnZsw" role="3cqZAp">
                       <node concept="37vLTw" id="3Z1xyIwnZsv" role="3clFbG">
-                        <ref role="3cqZAo" node="6E5fMGvfKUY" />
+                        <ref role="3cqZAo" node="6E5fMGvfKUY" resolve="bb" />
                       </node>
                     </node>
                   </node>
@@ -7184,7 +7184,7 @@
                     <node concept="3clFbF" id="3Z1xyIwo47O" role="3cqZAp">
                       <node concept="2OqwBi" id="3Z1xyIwo4e8" role="3clFbG">
                         <node concept="37vLTw" id="3Z1xyIwo47N" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKV2" />
+                          <ref role="3cqZAo" node="6E5fMGvfKV2" resolve="it" />
                         </node>
                         <node concept="liA8E" id="3Z1xyIwo4kx" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -7670,7 +7670,7 @@
                 <node concept="3clFbS" id="3Z1xyIwoaHM" role="1bW5cS">
                   <node concept="3clFbF" id="3Z1xyIwoaHN" role="3cqZAp">
                     <node concept="37vLTw" id="3Z1xyIwok7c" role="3clFbG">
-                      <ref role="3cqZAo" node="6E5fMGvfKVA" />
+                      <ref role="3cqZAo" node="6E5fMGvfKVA" resolve="it" />
                     </node>
                   </node>
                 </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps
index 68cd9dd7..fcca9d1a 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps
@@ -310,7 +310,7 @@
                     <node concept="3clFbF" id="2uP4pEPl0A" role="3cqZAp">
                       <node concept="2OqwBi" id="2uP4pEPl0B" role="3clFbG">
                         <node concept="37vLTw" id="2uP4pEPl0C" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKVC" />
+                          <ref role="3cqZAo" node="6E5fMGvfKVC" resolve="it" />
                         </node>
                         <node concept="2qgKlT" id="2uP4pEPl0D" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:28P2dHxCoRl" resolve="isAnAbstractMethod" />
@@ -2381,7 +2381,7 @@
                       <node concept="3clFbS" id="MSv3owsdoR" role="1bW5cS">
                         <node concept="3cpWs6" id="MSv3owse$9" role="3cqZAp">
                           <node concept="37vLTw" id="MSv3owsw_9" role="3cqZAk">
-                            <ref role="3cqZAo" node="6E5fMGvfKVE" />
+                            <ref role="3cqZAo" node="6E5fMGvfKVE" resolve="it" />
                             <node concept="3xLA65" id="MSv3ows_Ek" role="lGtFl">
                               <property role="TrG5h" value="it1_ref" />
                             </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index 5c24b833..8dff8b6f 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -786,7 +786,7 @@
                               <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                             </node>
                             <node concept="37vLTw" id="3FGJ5nvnyWB" role="2ZW6bz">
-                              <ref role="3cqZAo" node="6E5fMGvfKVG" />
+                              <ref role="3cqZAo" node="6E5fMGvfKVG" resolve="it" />
                             </node>
                           </node>
                           <node concept="3y3z36" id="3FGJ5nvnLZ8" role="3uHU7w">
@@ -797,7 +797,7 @@
                                   <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                                 </node>
                                 <node concept="37vLTw" id="3FGJ5nvnLBd" role="0kSFX">
-                                  <ref role="3cqZAo" node="6E5fMGvfKVG" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKVG" resolve="it" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="3Pxu0s8fl0p" role="2OqNvi">
@@ -816,7 +816,7 @@
                                 <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
                               </node>
                               <node concept="37vLTw" id="3FGJ5nvn_U6" role="0kSFX">
-                                <ref role="3cqZAo" node="6E5fMGvfKVG" />
+                                <ref role="3cqZAo" node="6E5fMGvfKVG" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="3Pxu0s8foMV" role="2OqNvi">
@@ -882,7 +882,7 @@
                           <node concept="2OqwBi" id="e$ws1zVjl2" role="3clFbG">
                             <node concept="2OqwBi" id="e$ws1zVi1A" role="2Oq$k0">
                               <node concept="37vLTw" id="e$ws1zVhHi" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKVI" />
+                                <ref role="3cqZAo" node="6E5fMGvfKVI" resolve="it" />
                               </node>
                               <node concept="liA8E" id="e$ws1zVj2t" role="2OqNvi">
                                 <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
@@ -985,7 +985,7 @@
                         <node concept="3clFbF" id="6DQTzHz3qmG" role="3cqZAp">
                           <node concept="2OqwBi" id="6DQTzHz3qmH" role="3clFbG">
                             <node concept="37vLTw" id="6DQTzHz3qmI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKVK" />
+                              <ref role="3cqZAo" node="6E5fMGvfKVK" resolve="it" />
                             </node>
                             <node concept="liA8E" id="6DQTzHz3qmJ" role="2OqNvi">
                               <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
@@ -2549,7 +2549,7 @@
                   <node concept="3clFbF" id="tc9pc3xOH8" role="3cqZAp">
                     <node concept="2OqwBi" id="tc9pc3xOH9" role="3clFbG">
                       <node concept="37vLTw" id="tc9pc3xOHa" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKVM" />
+                        <ref role="3cqZAo" node="6E5fMGvfKVM" resolve="it" />
                       </node>
                       <node concept="liA8E" id="tc9pc3ze1P" role="2OqNvi">
                         <ref role="37wK5l" to="6exd:104EUzFOBnD" resolve="acceptVisitor" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 053b510a..ff599a31 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -1104,7 +1104,7 @@
                       <node concept="2OqwBi" id="3bgqfmm8ioN" role="33vP2m">
                         <node concept="2OqwBi" id="z9rjE$ON_x" role="2Oq$k0">
                           <node concept="37vLTw" id="3bgqfmm8ioP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKVQ" />
+                            <ref role="3cqZAo" node="6E5fMGvfKVQ" resolve="p" />
                           </node>
                           <node concept="liA8E" id="z9rjE$OO1N" role="2OqNvi">
                             <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -1119,7 +1119,7 @@
                                   <node concept="2XshWL" id="3bgqfmm8ioX" role="2OqNvi">
                                     <ref role="2WH_rO" node="rZZ6HVEx_" resolve="ctypeAsTerm" />
                                     <node concept="37vLTw" id="3bgqfmm8ioY" role="2XxRq1">
-                                      <ref role="3cqZAo" node="6E5fMGvfKVO" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKVO" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -1142,7 +1142,7 @@
                       <node concept="liA8E" id="3bgqfmm8k9r" role="2OqNvi">
                         <ref role="37wK5l" to="kqnc:3bgqfmm0H0x" resolve="addTermPath" />
                         <node concept="37vLTw" id="3bgqfmm8klq" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKVQ" />
+                          <ref role="3cqZAo" node="6E5fMGvfKVQ" resolve="p" />
                         </node>
                         <node concept="2YIFZM" id="3bgqfmm8osU" role="37wK5m">
                           <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
@@ -1217,7 +1217,7 @@
                             <ref role="2WH_rO" node="rZZ6HVEx_" resolve="ctypeAsTerm" />
                             <node concept="2OqwBi" id="rZZ6I0jyQ" role="2XxRq1">
                               <node concept="37vLTw" id="rZZ6I0jyR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKVS" />
+                                <ref role="3cqZAo" node="6E5fMGvfKVS" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="rZZ6I0jyS" role="2OqNvi">
                                 <ref role="37wK5l" to="tpek:2RtWPFZ12w7" resolve="getThisType" />
@@ -1559,7 +1559,7 @@
                                 <node concept="2XshWL" id="74XSvyw_ZXS" role="2OqNvi">
                                   <ref role="2WH_rO" node="74XSvyw_B5j" resolve="ctype" />
                                   <node concept="37vLTw" id="74XSvyw_ZXT" role="2XxRq1">
-                                    <ref role="3cqZAo" node="6E5fMGvfKVU" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKVU" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -1591,7 +1591,7 @@
                               <node concept="2OqwBi" id="z9rjE$UQnP" role="3clFbG">
                                 <node concept="2OqwBi" id="z9rjE$UPta" role="2Oq$k0">
                                   <node concept="37vLTw" id="z9rjE$UPaG" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E5fMGvfKVW" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKVW" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="z9rjE$UPV3" role="2OqNvi">
                                     <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -1696,7 +1696,7 @@
                             <node concept="2OqwBi" id="z9rjE$UUC5" role="3clFbG">
                               <node concept="2OqwBi" id="z9rjE$UTuP" role="2Oq$k0">
                                 <node concept="37vLTw" id="z9rjE$UT4J" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKVY" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKVY" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="z9rjE$UU2e" role="2OqNvi">
                                   <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -1765,7 +1765,7 @@
                                 <node concept="2XshWL" id="74XSvyw_Ppa" role="2OqNvi">
                                   <ref role="2WH_rO" node="74XSvyw_B5j" resolve="ctype" />
                                   <node concept="37vLTw" id="74XSvyw_P$z" role="2XxRq1">
-                                    <ref role="3cqZAo" node="6E5fMGvfKW0" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKW0" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -1839,7 +1839,7 @@
                                 <node concept="2XshWL" id="74XSvywAEbR" role="2OqNvi">
                                   <ref role="2WH_rO" node="74XSvyw_B5j" resolve="ctype" />
                                   <node concept="37vLTw" id="74XSvywAEbS" role="2XxRq1">
-                                    <ref role="3cqZAo" node="6E5fMGvfKW2" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKW2" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -1948,7 +1948,7 @@
                             <node concept="2OqwBi" id="z9rjE$UZMT" role="3clFbG">
                               <node concept="2OqwBi" id="z9rjE$UYrC" role="2Oq$k0">
                                 <node concept="37vLTw" id="z9rjE$UXQH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKW4" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKW4" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="z9rjE$UZ5Y" role="2OqNvi">
                                   <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -2020,7 +2020,7 @@
                                 <node concept="2XshWL" id="74XSvywBe8V" role="2OqNvi">
                                   <ref role="2WH_rO" node="74XSvyw_B5j" resolve="ctype" />
                                   <node concept="37vLTw" id="74XSvywBe8W" role="2XxRq1">
-                                    <ref role="3cqZAo" node="6E5fMGvfKW6" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKW6" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -2097,7 +2097,7 @@
                                 <node concept="2XshWL" id="74XSvywBAdi" role="2OqNvi">
                                   <ref role="2WH_rO" node="74XSvyw_B5j" resolve="ctype" />
                                   <node concept="37vLTw" id="74XSvywBAdj" role="2XxRq1">
-                                    <ref role="3cqZAo" node="6E5fMGvfKW8" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKW8" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -2168,7 +2168,7 @@
                                 <node concept="2XshWL" id="74XSvywBe9r" role="2OqNvi">
                                   <ref role="2WH_rO" node="74XSvyw_B5j" resolve="ctype" />
                                   <node concept="37vLTw" id="74XSvywBe9s" role="2XxRq1">
-                                    <ref role="3cqZAo" node="6E5fMGvfKWa" />
+                                    <ref role="3cqZAo" node="6E5fMGvfKWa" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -4321,7 +4321,7 @@
                                   <node concept="2XshWL" id="4JBuioGVoKP" role="2OqNvi">
                                     <ref role="2WH_rO" node="4JBuioGUNfv" resolve="typeAsTerm" />
                                     <node concept="37vLTw" id="4JBuioGVoKS" role="2XxRq1">
-                                      <ref role="3cqZAo" node="6E5fMGvfKWc" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKWc" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -4598,7 +4598,7 @@
                       <node concept="2OqwBi" id="3bgqfmm8r0f" role="33vP2m">
                         <node concept="2OqwBi" id="z9rjE$OGxH" role="2Oq$k0">
                           <node concept="37vLTw" id="3bgqfmm8r0g" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKWg" />
+                            <ref role="3cqZAo" node="6E5fMGvfKWg" resolve="p" />
                           </node>
                           <node concept="liA8E" id="z9rjE$OGRN" role="2OqNvi">
                             <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -4613,7 +4613,7 @@
                                   <node concept="2XshWL" id="3bgqfmm8r0n" role="2OqNvi">
                                     <ref role="2WH_rO" node="4JBuioGUNfv" resolve="typeAsTerm" />
                                     <node concept="37vLTw" id="3bgqfmm8r0o" role="2XxRq1">
-                                      <ref role="3cqZAo" node="6E5fMGvfKWe" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKWe" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -4636,7 +4636,7 @@
                       <node concept="liA8E" id="3bgqfmm8r0u" role="2OqNvi">
                         <ref role="37wK5l" to="kqnc:3bgqfmm0H0x" resolve="addTermPath" />
                         <node concept="37vLTw" id="3bgqfmm8r0v" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKWg" />
+                          <ref role="3cqZAo" node="6E5fMGvfKWg" resolve="p" />
                         </node>
                         <node concept="2YIFZM" id="3bgqfmm8r0w" role="37wK5m">
                           <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
@@ -4710,7 +4710,7 @@
                           <node concept="2XshWL" id="4JBuioGUJ2x" role="2OqNvi">
                             <ref role="2WH_rO" node="4JBuioGUNfv" resolve="typeAsTerm" />
                             <node concept="37vLTw" id="4JBuioGUJ2z" role="2XxRq1">
-                              <ref role="3cqZAo" node="6E5fMGvfKWi" />
+                              <ref role="3cqZAo" node="6E5fMGvfKWi" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -5000,7 +5000,7 @@
                             <node concept="2OqwBi" id="z9rjE$Uzmh" role="3clFbG">
                               <node concept="2OqwBi" id="z9rjE$Uykz" role="2Oq$k0">
                                 <node concept="37vLTw" id="z9rjE$UxUj" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKWk" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKWk" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="z9rjE$UyOe" role="2OqNvi">
                                   <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -5203,7 +5203,7 @@
                             <node concept="2OqwBi" id="z9rjE$UBVM" role="3clFbG">
                               <node concept="2OqwBi" id="z9rjE$UAWr" role="2Oq$k0">
                                 <node concept="37vLTw" id="z9rjE$UAEM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKWm" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKWm" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="z9rjE$UBp9" role="2OqNvi">
                                   <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -5453,7 +5453,7 @@
                             <node concept="2OqwBi" id="z9rjE$UFX5" role="3clFbG">
                               <node concept="2OqwBi" id="z9rjE$UF5h" role="2Oq$k0">
                                 <node concept="37vLTw" id="z9rjE$UEKL" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKWo" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKWo" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="z9rjE$UFvO" role="2OqNvi">
                                   <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -5607,7 +5607,7 @@
                             <node concept="2OqwBi" id="z9rjE$UJsL" role="3clFbG">
                               <node concept="2OqwBi" id="z9rjE$UI$M" role="2Oq$k0">
                                 <node concept="37vLTw" id="z9rjE$UIgi" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E5fMGvfKWq" />
+                                  <ref role="3cqZAo" node="6E5fMGvfKWq" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="z9rjE$UIZl" role="2OqNvi">
                                   <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
index 5edfc409..37ffc4e5 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
@@ -635,7 +635,7 @@
                       <node concept="2OqwBi" id="3bgqfmm8r0f" role="33vP2m">
                         <node concept="2OqwBi" id="z9rjE$OTGy" role="2Oq$k0">
                           <node concept="37vLTw" id="3bgqfmm8r0g" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6E5fMGvfKWu" />
+                            <ref role="3cqZAo" node="6E5fMGvfKWu" resolve="p" />
                           </node>
                           <node concept="liA8E" id="z9rjE$OUrt" role="2OqNvi">
                             <ref role="37wK5l" to="kqnc:6$6scRbYuZ5" resolve="iterate" />
@@ -650,7 +650,7 @@
                                   <node concept="2XshWL" id="3bgqfmm8r0n" role="2OqNvi">
                                     <ref role="2WH_rO" node="4JBuioGUNfv" resolve="nodeAsTerm" />
                                     <node concept="37vLTw" id="3bgqfmm8r0o" role="2XxRq1">
-                                      <ref role="3cqZAo" node="6E5fMGvfKWs" />
+                                      <ref role="3cqZAo" node="6E5fMGvfKWs" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
@@ -673,7 +673,7 @@
                       <node concept="liA8E" id="3bgqfmm8r0u" role="2OqNvi">
                         <ref role="37wK5l" to="kqnc:3bgqfmm0H0x" resolve="addTermPath" />
                         <node concept="37vLTw" id="3bgqfmm8r0v" role="37wK5m">
-                          <ref role="3cqZAo" node="6E5fMGvfKWu" />
+                          <ref role="3cqZAo" node="6E5fMGvfKWu" resolve="p" />
                         </node>
                         <node concept="2YIFZM" id="3bgqfmm8r0w" role="37wK5m">
                           <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />