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 fef3f220..5359aef0 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
@@ -322,6 +322,7 @@
         <child id="1219952894531" name="dropRootRule" index="aQYdv" />
         <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
         <child id="1167088157977" name="createRootRule" index="2VS0gm" />
+        <child id="1167172143858" name="weavingMappingRule" index="30SoJX" />
         <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
         <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
         <child id="1195502100749" name="preMappingScript" index="1puA0r" />
@@ -370,6 +371,10 @@
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
+      <concept id="1167171569011" name="jetbrains.mps.lang.generator.structure.Weaving_MappingRule" flags="lg" index="30QchW">
+        <child id="1169570368028" name="ruleConsequence" index="1fOSGc" />
+        <child id="1184616230853" name="contextNodeQuery" index="3gCiVm" />
+      </concept>
       <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
         <reference id="1168285871518" name="applicableConcept" index="3gUMe" />
         <child id="1092060348987" name="contentNode" index="13RCb5" />
@@ -392,6 +397,7 @@
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
+      <concept id="1184616041890" name="jetbrains.mps.lang.generator.structure.Weaving_MappingRule_ContextNodeQuery" flags="in" index="3gB$ML" />
       <concept id="1184690432998" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_outputNode" flags="nn" index="3l3mFP" />
       <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
         <reference id="1167514355421" name="template" index="3lhOvi" />
@@ -455,6 +461,9 @@
       </concept>
     </language>
     <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
+      <concept id="1217881979074" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetPrevInputByLabel" flags="nn" index="2fr3Bp">
+        <reference id="1217881979075" name="label" index="2fr3Bo" />
+      </concept>
       <concept id="1217889725928" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_SessionObjectAccess" flags="nn" index="2fSANN" />
       <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
         <child id="1217890689512" name="userKey" index="2fWi3N" />
@@ -756,10 +765,52 @@
   <node concept="bUwia" id="3YbBykHJQRu">
     <property role="TrG5h" value="rule" />
     <property role="3GE5qa" value="rule" />
+    <node concept="30QchW" id="7lmP5gAPSlJ" role="30SoJX">
+      <ref role="30HIoZ" to="wq2x:5EDW3XE0OAL" resolve="QueryTable" />
+      <node concept="j$656" id="7lmP5gAQ3r1" role="1fOSGc">
+        <ref role="v9R2y" node="7lmP5gAPVzE" resolve="frag_QueryTable_manifest" />
+      </node>
+      <node concept="3gB$ML" id="7lmP5gAPSlL" role="3gCiVm">
+        <node concept="3clFbS" id="7lmP5gAPSlM" role="2VODD2">
+          <node concept="3cpWs8" id="7lmP5gAWcR4" role="3cqZAp">
+            <node concept="3cpWsn" id="7lmP5gAWcR5" role="3cpWs9">
+              <property role="TrG5h" value="bs" />
+              <node concept="3Tqbb2" id="7lmP5gAWb8n" role="1tU5fm">
+                <ref role="ehGHo" to="tpee:fK9aQHR" resolve="BlockStatement" />
+              </node>
+              <node concept="2OqwBi" id="7lmP5gAWcR6" role="33vP2m">
+                <node concept="1iwH7S" id="7lmP5gAWcR7" role="2Oq$k0" />
+                <node concept="1iwH7d" id="7lmP5gAWcR8" role="2OqNvi">
+                  <ref role="1iwH7c" node="7lmP5gAQ0zB" resolve="manifest_queryTables_init" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7lmP5gAQ3tK" role="3cqZAp">
+            <node concept="2OqwBi" id="7lmP5gAWd45" role="3clFbG">
+              <node concept="37vLTw" id="7lmP5gAWcR9" role="2Oq$k0">
+                <ref role="3cqZAo" node="7lmP5gAWcR5" resolve="bs" />
+              </node>
+              <node concept="3TrEf2" id="7lmP5gAWdj8" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpee:fK9aQHS" resolve="statements" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2rT7sh" id="5EDW3XF64MJ" role="2rTMjI">
       <property role="TrG5h" value="manifest" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
     </node>
+    <node concept="2rT7sh" id="7lmP5gAPZzB" role="2rTMjI">
+      <property role="TrG5h" value="manifest_queryTables" />
+      <ref role="2rZz_L" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
+    </node>
+    <node concept="2rT7sh" id="7lmP5gAQ0zB" role="2rTMjI">
+      <property role="TrG5h" value="manifest_queryTables_init" />
+      <ref role="2rZz_L" to="tpee:fK9aQHR" resolve="BlockStatement" />
+    </node>
     <node concept="2rT7sh" id="4MqhgXUaC7X" role="2rTMjI">
       <property role="TrG5h" value="handler_template_class" />
       <ref role="2rTdP9" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
@@ -17971,56 +18022,15 @@
                     </node>
                   </node>
                 </node>
+                <node concept="2ZBi8u" id="7lmP5gAQ1VP" role="lGtFl">
+                  <ref role="2rW$FS" node="7lmP5gAPZzB" resolve="manifest_queryTables" />
+                </node>
               </node>
             </node>
-            <node concept="3clFbF" id="tbauFy4DoC" role="3cqZAp">
-              <node concept="2OqwBi" id="tbauFy4DoD" role="3clFbG">
-                <node concept="37vLTw" id="tbauFy4DoE" role="2Oq$k0">
-                  <ref role="3cqZAo" node="tbauFy4Doy" resolve="qts" />
-                </node>
-                <node concept="TSZUe" id="tbauFy4DoF" role="2OqNvi">
-                  <node concept="2ShNRf" id="tbauFy4DoG" role="25WWJ7">
-                    <node concept="1pGfFk" id="tbauFy4DoH" role="2ShVmc">
-                      <ref role="37wK5l" node="tbauFy51JB" resolve="_QueryTable" />
-                      <node concept="1ZhdrF" id="tbauFy9rRA" role="lGtFl">
-                        <property role="2qtEX8" value="baseMethodDeclaration" />
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                        <node concept="3$xsQk" id="tbauFy9rRB" role="3$ytzL">
-                          <node concept="3clFbS" id="tbauFy9rRC" role="2VODD2">
-                            <node concept="3clFbF" id="tbauFy4DoL" role="3cqZAp">
-                              <node concept="2OqwBi" id="tbauFy4DoM" role="3clFbG">
-                                <node concept="1iwH7S" id="tbauFy4DoN" role="2Oq$k0" />
-                                <node concept="1iwH70" id="tbauFy4DoO" role="2OqNvi">
-                                  <ref role="1iwH77" node="tbauFy55gk" resolve="queryTable_constructor" />
-                                  <node concept="30H73N" id="tbauFy4DoP" role="1iwH7V" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="tbauFy4DoQ" role="lGtFl">
-                <node concept="3JmXsc" id="tbauFy4DoR" role="3Jn$fo">
-                  <node concept="3clFbS" id="tbauFy4DoS" role="2VODD2">
-                    <node concept="3clFbF" id="tbauFy4DoT" role="3cqZAp">
-                      <node concept="2OqwBi" id="tbauFy4DoU" role="3clFbG">
-                        <node concept="2OqwBi" id="tbauFy4DoV" role="2Oq$k0">
-                          <node concept="1iwH7S" id="tbauFy4DoW" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="tbauFy4DoX" role="2OqNvi" />
-                        </node>
-                        <node concept="2SmgA7" id="tbauFy4DoY" role="2OqNvi">
-                          <node concept="chp4Y" id="tbauFy4H0i" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:5EDW3XE0OAL" resolve="QueryTable" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
+            <node concept="9aQIb" id="7lmP5gAPYs_" role="3cqZAp">
+              <node concept="3clFbS" id="7lmP5gAPYsB" role="9aQI4" />
+              <node concept="2ZBi8u" id="7lmP5gAQ2II" role="lGtFl">
+                <ref role="2rW$FS" node="7lmP5gAQ0zB" resolve="manifest_queryTables_init" />
               </node>
             </node>
             <node concept="3clFbF" id="tbauFy4Dp0" role="3cqZAp">
@@ -18457,21 +18467,15 @@
                   <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
                   <node concept="3$xsQk" id="tbauFy5dAa" role="3$ytzL">
                     <node concept="3clFbS" id="tbauFy5dAb" role="2VODD2">
-                      <node concept="3clFbF" id="tbauFy5dAc" role="3cqZAp">
-                        <node concept="2OqwBi" id="tbauFy5dAd" role="3clFbG">
-                          <node concept="1PxgMI" id="tbauFy5dAe" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="chp4Y" id="tbauFy5dAf" role="3oSUPX">
-                              <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
-                            </node>
-                            <node concept="2OqwBi" id="tbauFy5dAg" role="1m5AlR">
-                              <node concept="1iwH7S" id="tbauFy5dAh" role="2Oq$k0" />
-                              <node concept="12$id9" id="tbauFy5dAi" role="2OqNvi">
-                                <node concept="30H73N" id="tbauFy5dAj" role="12$y8L" />
-                              </node>
+                      <node concept="3clFbF" id="7lmP5gAO6SN" role="3cqZAp">
+                        <node concept="2OqwBi" id="7lmP5gAO6SO" role="3clFbG">
+                          <node concept="2OqwBi" id="7lmP5gAO6SP" role="2Oq$k0">
+                            <node concept="1iwH7S" id="7lmP5gAO6SQ" role="2Oq$k0" />
+                            <node concept="2fr3Bp" id="7lmP5gAO6SR" role="2OqNvi">
+                              <ref role="2fr3Bo" node="tbauFy9xOu" resolve="queryTemplate_class" />
                             </node>
                           </node>
-                          <node concept="3TrEf2" id="tbauFy5dAk" role="2OqNvi">
+                          <node concept="3TrEf2" id="7lmP5gAO6SS" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
                           </node>
                         </node>
@@ -18644,21 +18648,15 @@
                 <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
                 <node concept="3$xsQk" id="tbauFy5dBw" role="3$ytzL">
                   <node concept="3clFbS" id="tbauFy5dBx" role="2VODD2">
-                    <node concept="3clFbF" id="tbauFy5dBy" role="3cqZAp">
-                      <node concept="2OqwBi" id="tbauFy5dBz" role="3clFbG">
-                        <node concept="1PxgMI" id="tbauFy5dB$" role="2Oq$k0">
-                          <property role="1BlNFB" value="true" />
-                          <node concept="chp4Y" id="tbauFy5dB_" role="3oSUPX">
-                            <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
-                          </node>
-                          <node concept="2OqwBi" id="tbauFy5dBA" role="1m5AlR">
-                            <node concept="1iwH7S" id="tbauFy5dBB" role="2Oq$k0" />
-                            <node concept="12$id9" id="tbauFy5dBC" role="2OqNvi">
-                              <node concept="30H73N" id="tbauFy5dBD" role="12$y8L" />
-                            </node>
+                    <node concept="3clFbF" id="7lmP5gAO1qV" role="3cqZAp">
+                      <node concept="2OqwBi" id="7lmP5gAO1qW" role="3clFbG">
+                        <node concept="2OqwBi" id="7lmP5gAO1qY" role="2Oq$k0">
+                          <node concept="1iwH7S" id="7lmP5gAO1qZ" role="2Oq$k0" />
+                          <node concept="2fr3Bp" id="7lmP5gAO1r0" role="2OqNvi">
+                            <ref role="2fr3Bo" node="tbauFy9xOu" resolve="queryTemplate_class" />
                           </node>
                         </node>
-                        <node concept="3TrEf2" id="tbauFy5dBE" role="2OqNvi">
+                        <node concept="3TrEf2" id="7lmP5gAO1r1" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
                         </node>
                       </node>
@@ -18704,21 +18702,15 @@
                 <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
                 <node concept="3$xsQk" id="tbauFy5dBU" role="3$ytzL">
                   <node concept="3clFbS" id="tbauFy5dBV" role="2VODD2">
-                    <node concept="3clFbF" id="tbauFy5dBW" role="3cqZAp">
-                      <node concept="2OqwBi" id="tbauFy5dBX" role="3clFbG">
-                        <node concept="1PxgMI" id="tbauFy5dBY" role="2Oq$k0">
-                          <property role="1BlNFB" value="true" />
-                          <node concept="chp4Y" id="tbauFy5dBZ" role="3oSUPX">
-                            <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
-                          </node>
-                          <node concept="2OqwBi" id="tbauFy5dC0" role="1m5AlR">
-                            <node concept="1iwH7S" id="tbauFy5dC1" role="2Oq$k0" />
-                            <node concept="12$id9" id="tbauFy5dC2" role="2OqNvi">
-                              <node concept="30H73N" id="tbauFy5dC3" role="12$y8L" />
-                            </node>
+                    <node concept="3clFbF" id="7lmP5gAO9_m" role="3cqZAp">
+                      <node concept="2OqwBi" id="7lmP5gAO9_n" role="3clFbG">
+                        <node concept="2OqwBi" id="7lmP5gAO9_o" role="2Oq$k0">
+                          <node concept="1iwH7S" id="7lmP5gAO9_p" role="2Oq$k0" />
+                          <node concept="2fr3Bp" id="7lmP5gAO9_q" role="2OqNvi">
+                            <ref role="2fr3Bo" node="tbauFy9xOu" resolve="queryTemplate_class" />
                           </node>
                         </node>
-                        <node concept="3TrEf2" id="tbauFy5dC4" role="2OqNvi">
+                        <node concept="3TrEf2" id="7lmP5gAO9_r" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
                         </node>
                       </node>
@@ -18750,21 +18742,15 @@
                   <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
                   <node concept="3$xsQk" id="tbauFy5uaH" role="3$ytzL">
                     <node concept="3clFbS" id="tbauFy5uaI" role="2VODD2">
-                      <node concept="3clFbF" id="tbauFyayE$" role="3cqZAp">
-                        <node concept="2OqwBi" id="tbauFyazIT" role="3clFbG">
-                          <node concept="1PxgMI" id="tbauFyazjX" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="chp4Y" id="tbauFyazm5" role="3oSUPX">
-                              <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
-                            </node>
-                            <node concept="2OqwBi" id="tbauFyayQj" role="1m5AlR">
-                              <node concept="1iwH7S" id="tbauFyayEy" role="2Oq$k0" />
-                              <node concept="12$id9" id="tbauFyayWy" role="2OqNvi">
-                                <node concept="30H73N" id="tbauFyaz3M" role="12$y8L" />
-                              </node>
+                      <node concept="3clFbF" id="7lmP5gAP2xB" role="3cqZAp">
+                        <node concept="2OqwBi" id="7lmP5gAP2xC" role="3clFbG">
+                          <node concept="2OqwBi" id="7lmP5gAP2xD" role="2Oq$k0">
+                            <node concept="1iwH7S" id="7lmP5gAP2xE" role="2Oq$k0" />
+                            <node concept="2fr3Bp" id="7lmP5gAP2xF" role="2OqNvi">
+                              <ref role="2fr3Bo" node="tbauFy9xOu" resolve="queryTemplate_class" />
                             </node>
                           </node>
-                          <node concept="3TrEf2" id="tbauFya$3L" role="2OqNvi">
+                          <node concept="3TrEf2" id="7lmP5gAP2xG" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
                           </node>
                         </node>
@@ -19333,5 +19319,79 @@
       <node concept="10Nm6u" id="C1f6iElplj" role="gfFT$" />
     </node>
   </node>
+  <node concept="13MO4I" id="7lmP5gAPVzE">
+    <property role="3GE5qa" value="query" />
+    <property role="TrG5h" value="frag_QueryTable_manifest" />
+    <ref role="3gUMe" to="wq2x:5EDW3XE0OAL" resolve="QueryTable" />
+    <node concept="9aQIb" id="7lmP5gAPVKb" role="13RCb5">
+      <node concept="3clFbS" id="7lmP5gAPVKc" role="9aQI4">
+        <node concept="3cpWs8" id="7lmP5gAPVKf" role="3cqZAp">
+          <node concept="3cpWsn" id="7lmP5gAPVKg" role="3cpWs9">
+            <property role="TrG5h" value="qts" />
+            <node concept="_YKpA" id="7lmP5gAPVKh" role="1tU5fm">
+              <node concept="3uibUv" id="7lmP5gAPVKi" role="_ZDj9">
+                <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7lmP5gAPVKj" role="33vP2m">
+              <node concept="Tc6Ow" id="7lmP5gAPVKk" role="2ShVmc">
+                <node concept="3uibUv" id="7lmP5gAPVKl" role="HW$YZ">
+                  <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7lmP5gAPVQF" role="3cqZAp">
+          <node concept="2OqwBi" id="7lmP5gAPWvw" role="3clFbG">
+            <node concept="37vLTw" id="7lmP5gAPVQD" role="2Oq$k0">
+              <ref role="3cqZAo" node="7lmP5gAPVKg" resolve="qts" />
+              <node concept="1ZhdrF" id="7lmP5gAQ3QM" role="lGtFl">
+                <property role="2qtEX8" value="variableDeclaration" />
+                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                <node concept="3$xsQk" id="7lmP5gAQ3QN" role="3$ytzL">
+                  <node concept="3clFbS" id="7lmP5gAQ3QO" role="2VODD2">
+                    <node concept="3clFbF" id="7lmP5gAQ3Y3" role="3cqZAp">
+                      <node concept="2OqwBi" id="7lmP5gAQ48l" role="3clFbG">
+                        <node concept="1iwH7S" id="7lmP5gAQ3Y2" role="2Oq$k0" />
+                        <node concept="1iwH7d" id="7lmP5gAQ4dR" role="2OqNvi">
+                          <ref role="1iwH7c" node="7lmP5gAPZzB" resolve="manifest_queryTables" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="TSZUe" id="7lmP5gAPXaJ" role="2OqNvi">
+              <node concept="2ShNRf" id="7lmP5gAPXzl" role="25WWJ7">
+                <node concept="1pGfFk" id="7lmP5gAPXzm" role="2ShVmc">
+                  <ref role="37wK5l" node="tbauFy51JB" resolve="_QueryTable" />
+                  <node concept="1ZhdrF" id="7lmP5gAPXzn" role="lGtFl">
+                    <property role="2qtEX8" value="baseMethodDeclaration" />
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                    <node concept="3$xsQk" id="7lmP5gAPXzo" role="3$ytzL">
+                      <node concept="3clFbS" id="7lmP5gAPXzp" role="2VODD2">
+                        <node concept="3clFbF" id="7lmP5gAPXzq" role="3cqZAp">
+                          <node concept="2OqwBi" id="7lmP5gAPXzr" role="3clFbG">
+                            <node concept="1iwH7S" id="7lmP5gAPXzs" role="2Oq$k0" />
+                            <node concept="1iwH70" id="7lmP5gAPXzt" role="2OqNvi">
+                              <ref role="1iwH77" node="tbauFy55gk" resolve="queryTable_constructor" />
+                              <node concept="30H73N" id="7lmP5gAPXzu" role="1iwH7V" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="raruj" id="7lmP5gAPXzj" role="lGtFl" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
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 2a6bcd96..30a86617 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
@@ -8,6 +8,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="0" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="23" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
@@ -17,6 +18,10 @@
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" />
     <import index="ba7m" ref="r:4c5ac278-3ad7-4902-ab86-6c60b350f168(jetbrains.mps.lang.aspect.generator.template.main@generator)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
+    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
+    <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" implicit="true" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="h103" ref="r:9c80bc3e-1982-4e7d-8fe4-1b25a1c02635(jetbrains.mps.lang.typechecking.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -38,24 +43,39 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+        <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
+      </concept>
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <child id="1167088157977" name="createRootRule" index="2VS0gm" />
+        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
+        <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
+      </concept>
+      <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
+        <child id="1177093586806" name="templateNode" index="gfFT$" />
       </concept>
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
         <reference id="1112820671508" name="modifiedSwitch" index="phYkn" />
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
+      <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
+        <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
+      </concept>
       <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
         <reference id="5005282049925926522" name="parameter" index="v3LJV" />
       </concept>
@@ -69,20 +89,36 @@
       </concept>
       <concept id="1167087518662" name="jetbrains.mps.lang.generator.structure.CreateRootRule_Condition" flags="in" index="2VP$b9" />
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
+      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
         <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
+      </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
+      <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
+        <reference id="1167514355421" name="template" index="3lhOvi" />
+      </concept>
       <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
+      <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
+      <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
+      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
       <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
         <child id="1805153994415893199" name="type" index="1N15GL" />
       </concept>
+      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
+        <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
+      </concept>
+      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
+        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
+      </concept>
     </language>
     <language id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage">
       <concept id="2030416617761226491" name="jetbrains.mps.lang.slanguage.structure.Model_IsAspectOperation" flags="nn" index="3zA4fs">
@@ -103,26 +139,64 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
+      <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
+      <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
         <reference id="1219352800908" name="referentNode" index="3B5MYn" />
       </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
+        <property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
+        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
+      </concept>
+      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
+        <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
+        <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
+      <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
+        <reference id="6533016889631295418" name="queryType" index="KG3u5" />
+        <child id="7871500063838282362" name="code" index="fHCRw" />
+      </concept>
+      <concept id="6533016889632449861" name="jetbrains.mps.lang.coderules.structure.QueryParameter" flags="ng" index="KwDlU" />
+      <concept id="6533016889629821361" name="jetbrains.mps.lang.coderules.structure.QueryTable" flags="ng" index="KEFAe">
+        <child id="6533016889629824446" name="query" index="KEEm1" />
+      </concept>
+    </language>
   </registry>
   <node concept="bUwia" id="NKt6ynvIZQ">
     <property role="TrG5h" value="main" />
+    <node concept="3aamgX" id="7lmP5gAYBdz" role="3acgRq">
+      <ref role="30HIoZ" to="zfi7:7lmP5gAYc5S" resolve="TypecheckingQueryParameter" />
+      <node concept="gft3U" id="7lmP5gAYBdF" role="1lVwrX">
+        <node concept="KwDlU" id="7lmP5gAYBe1" role="gfFT$" />
+      </node>
+    </node>
+    <node concept="3lhOvk" id="7lmP5gAM1D9" role="3lj3bC">
+      <ref role="30HIoZ" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+      <ref role="3lhOvi" node="7lmP5gAM25d" resolve="_Queries_" />
+    </node>
   </node>
   <node concept="jVnub" id="7km57PkguX9">
     <property role="TrG5h" value="instantiate_aspect_descriptor" />
@@ -207,5 +281,85 @@
       </node>
     </node>
   </node>
+  <node concept="KEFAe" id="7lmP5gAM25d">
+    <property role="TrG5h" value="_Queries_" />
+    <node concept="2bWyPT" id="7lmP5gAM25g" role="KEEm1">
+      <property role="TrG5h" value="query" />
+      <ref role="KG3u5" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
+      <node concept="3clFbS" id="7lmP5gAM25h" role="fHCRw">
+        <node concept="3clFbH" id="7lmP5gAM5gL" role="3cqZAp">
+          <node concept="2b32R4" id="7lmP5gAM5mc" role="lGtFl">
+            <node concept="3JmXsc" id="7lmP5gAM5mf" role="2P8S$">
+              <node concept="3clFbS" id="7lmP5gAM5mg" role="2VODD2">
+                <node concept="3clFbF" id="7lmP5gAM5mm" role="3cqZAp">
+                  <node concept="2OqwBi" id="7lmP5gAM7lZ" role="3clFbG">
+                    <node concept="2OqwBi" id="7lmP5gAM5mh" role="2Oq$k0">
+                      <node concept="3TrEf2" id="7lmP5gAM6Yv" role="2OqNvi">
+                        <ref role="3Tt5mk" to="zfi7:7lmP5gALJP_" resolve="code" />
+                      </node>
+                      <node concept="30H73N" id="7lmP5gAM5ml" role="2Oq$k0" />
+                    </node>
+                    <node concept="3Tsc0h" id="7lmP5gAM7Ej" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1WS0z7" id="7lmP5gAM25l" role="lGtFl">
+        <node concept="3JmXsc" id="7lmP5gAM25o" role="3Jn$fo">
+          <node concept="3clFbS" id="7lmP5gAM25p" role="2VODD2">
+            <node concept="3clFbF" id="7lmP5gAM25v" role="3cqZAp">
+              <node concept="2OqwBi" id="7lmP5gAM25q" role="3clFbG">
+                <node concept="30H73N" id="7lmP5gAM25u" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="7lmP5gAM6rr" role="2OqNvi">
+                  <ref role="3TtcxE" to="zfi7:7lmP5gALKoA" resolve="template" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17Uvod" id="7lmP5gAM2iB" role="lGtFl">
+        <property role="2qtEX9" value="name" />
+        <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+        <node concept="3zFVjK" id="7lmP5gAM2iC" role="3zH0cK">
+          <node concept="3clFbS" id="7lmP5gAM2iD" role="2VODD2">
+            <node concept="3clFbF" id="7lmP5gAM2og" role="3cqZAp">
+              <node concept="2OqwBi" id="7lmP5gAM3t3" role="3clFbG">
+                <node concept="2OqwBi" id="7lmP5gAM2$t" role="2Oq$k0">
+                  <node concept="30H73N" id="7lmP5gAM2of" role="2Oq$k0" />
+                  <node concept="2yIwOk" id="7lmP5gAM39m" role="2OqNvi" />
+                </node>
+                <node concept="3n3YKJ" id="7lmP5gAM3U1" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1ZhdrF" id="7lmP5gAXR_0" role="lGtFl">
+        <property role="2qtEX8" value="queryType" />
+        <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/9035818301008609703/6533016889631295418" />
+        <node concept="3$xsQk" id="7lmP5gAXR_1" role="3$ytzL">
+          <node concept="3clFbS" id="7lmP5gAXR_2" role="2VODD2">
+            <node concept="3clFbF" id="7lmP5gAXRSx" role="3cqZAp">
+              <node concept="2OqwBi" id="7lmP5gAXS4n" role="3clFbG">
+                <node concept="30H73N" id="7lmP5gAXRSw" role="2Oq$k0" />
+                <node concept="2qgKlT" id="7lmP5gAXSi1" role="2OqNvi">
+                  <ref role="37wK5l" to="h103:7lmP5gAXQfi" resolve="getQueryInterface" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="n94m4" id="7lmP5gAM25e" role="lGtFl">
+      <ref role="n9lRv" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+    </node>
+  </node>
 </model>
 
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 ada0e60c..cf0bf9d7 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
@@ -45,7 +45,9 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="23" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+        <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
@@ -57,6 +59,7 @@
         <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
         <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:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="13" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -105,13 +108,27 @@
           <greater-priority-mapping>
             <generator generatorUID="685b46b0-fc2b-411e-954a-af0eeec1a29a(jetbrains.mps.lang.typechecking#01)" />
             <external-mapping>
-              <mapping-node modelUID="r:38071b08-e9ac-4ec1-a326-62b7897beb22(main@generator)" nodeID="*" />
+              <mapping-node modelUID="r:38071b08-e9ac-4ec1-a326-62b7897beb22(main@generator)" nodeID="8436953480441878561" />
             </external-mapping>
           </greater-priority-mapping>
           <lesser-priority-mapping>
             <generator generatorUID="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" />
             <external-mapping>
-              <mapping-node modelUID="r:c0702ee3-be79-48ac-aa39-b7cd0d895de6(jetbrains.mps.lang.coderules.generator.template.main@generator)" nodeID="*" />
+              <mapping-node modelUID="r:c0702ee3-be79-48ac-aa39-b7cd0d895de6(jetbrains.mps.lang.coderules.generator.template.main@generator)" nodeID="4578927328670739934" />
+            </external-mapping>
+          </lesser-priority-mapping>
+        </mapping-priority-rule>
+        <mapping-priority-rule kind="strictly_before">
+          <greater-priority-mapping>
+            <generator generatorUID="685b46b0-fc2b-411e-954a-af0eeec1a29a(jetbrains.mps.lang.typechecking#01)" />
+            <external-mapping>
+              <mapping-node modelUID="r:38071b08-e9ac-4ec1-a326-62b7897beb22(main@generator)" nodeID="932373115432792054" />
+            </external-mapping>
+          </greater-priority-mapping>
+          <lesser-priority-mapping>
+            <generator generatorUID="685b46b0-fc2b-411e-954a-af0eeec1a29a(jetbrains.mps.lang.typechecking#01)" />
+            <external-mapping>
+              <mapping-node modelUID="r:38071b08-e9ac-4ec1-a326-62b7897beb22(main@generator)" nodeID="8436953480441878561" />
             </external-mapping>
           </lesser-priority-mapping>
         </mapping-priority-rule>
@@ -122,6 +139,8 @@
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -132,10 +151,12 @@
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="23" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
     <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
@@ -144,8 +165,13 @@
     <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
     <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
@@ -155,13 +181,18 @@
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
+    <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
+    <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="18" />
     <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:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="1" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
     <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="13" />
     <language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
   </languageVersions>
   <dependencyVersions>
@@ -173,10 +204,14 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
@@ -187,7 +222,10 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
+    <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
   <runtime>
     <dependency reexport="false">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
index 86103856..c5f89fdc 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
@@ -9,7 +9,224 @@
   <imports>
     <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
     <import index="tpeu" ref="r:00000000-0000-4000-0000-011c895902fa(jetbrains.mps.lang.smodel.behavior)" />
+    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
   </imports>
-  <registry />
+  <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
+        <reference id="1225194240799" name="concept" index="13h7C2" />
+        <child id="1225194240805" name="method" index="13h7CS" />
+        <child id="1225194240801" name="constructor" index="13h7CW" />
+      </concept>
+      <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
+      <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
+        <property id="1225194472832" name="isVirtual" index="13i0it" />
+        <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
+      </concept>
+      <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
+        <reference id="7256306938026143658" name="target" index="2aWVGs" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU">
+        <reference id="7400021826771268269" name="concept" index="2sp9C9" />
+      </concept>
+      <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
+        <child id="7400021826774799510" name="ref" index="2tJFKM" />
+      </concept>
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="13h7C7" id="7lmP5gAXQeM">
+    <ref role="13h7C2" to="zfi7:7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+    <node concept="13i0hz" id="7lmP5gAXQfi" role="13h7CS">
+      <property role="TrG5h" value="getQueryInterface" />
+      <property role="13i0it" value="true" />
+      <node concept="3Tm1VV" id="7lmP5gAXQfj" role="1B3o_S" />
+      <node concept="2sp9CU" id="7lmP5gAXSmE" role="3clF45">
+        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      </node>
+      <node concept="3clFbS" id="7lmP5gAXQfl" role="3clF47">
+        <node concept="3cpWs6" id="7lmP5gAXQhD" role="3cqZAp">
+          <node concept="2tJFMh" id="7lmP5gAXQk$" role="3cqZAk">
+            <node concept="ZC_QK" id="7lmP5gAXQmm" role="2tJFKM">
+              <ref role="2aWVGs" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="7lmP5gAXQeN" role="13h7CW">
+      <node concept="3clFbS" id="7lmP5gAXQeO" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="7lmP5gAXSzm">
+    <ref role="13h7C2" to="zfi7:7lmP5gALJQ1" resolve="CheckQueryTemplate" />
+    <node concept="13hLZK" id="7lmP5gAXSzn" role="13h7CW">
+      <node concept="3clFbS" id="7lmP5gAXSzo" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="7lmP5gAXSzQ" role="13h7CS">
+      <property role="TrG5h" value="getQueryInterface" />
+      <ref role="13i0hy" node="7lmP5gAXQfi" resolve="getQueryInterface" />
+      <node concept="3Tm1VV" id="7lmP5gAXSzR" role="1B3o_S" />
+      <node concept="3clFbS" id="7lmP5gAXSzX" role="3clF47">
+        <node concept="3clFbF" id="7lmP5gAXT1d" role="3cqZAp">
+          <node concept="2tJFMh" id="7lmP5gAXT1b" role="3clFbG">
+            <node concept="ZC_QK" id="7lmP5gAXT2X" role="2tJFKM">
+              <ref role="2aWVGs" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2sp9CU" id="7lmP5gAXSzY" role="3clF45">
+        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      </node>
+    </node>
+  </node>
+  <node concept="13h7C7" id="7lmP5gAXT$3">
+    <ref role="13h7C2" to="zfi7:7lmP5gALKDQ" resolve="TypeofQueryTemplate" />
+    <node concept="13hLZK" id="7lmP5gAXT$4" role="13h7CW">
+      <node concept="3clFbS" id="7lmP5gAXT$5" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="7lmP5gAXT$z" role="13h7CS">
+      <property role="TrG5h" value="getQueryInterface" />
+      <ref role="13i0hy" node="7lmP5gAXQfi" resolve="getQueryInterface" />
+      <node concept="3Tm1VV" id="7lmP5gAXT$$" role="1B3o_S" />
+      <node concept="3clFbS" id="7lmP5gAXT$E" role="3clF47">
+        <node concept="3clFbF" id="7lmP5gAXTD2" role="3cqZAp">
+          <node concept="2tJFMh" id="7lmP5gAXTCW" role="3clFbG">
+            <node concept="ZC_QK" id="7lmP5gAXTEM" role="2tJFKM">
+              <ref role="2aWVGs" to="tj24:1T5MAgP$8dd" resolve="TypeOfQuery" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2sp9CU" id="7lmP5gAXT$F" role="3clF45">
+        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      </node>
+    </node>
+  </node>
+  <node concept="13h7C7" id="7lmP5gAYgV9">
+    <ref role="13h7C2" to="zfi7:7lmP5gAYc5S" resolve="TypecheckingQueryParameter" />
+    <node concept="13i0hz" id="7lmP5gAYgVD" role="13h7CS">
+      <property role="TrG5h" value="getTypecheckingQueryTemplate" />
+      <node concept="3Tm1VV" id="7lmP5gAYgVE" role="1B3o_S" />
+      <node concept="3Tqbb2" id="7lmP5gAYgVT" role="3clF45">
+        <ref role="ehGHo" to="zfi7:7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+      </node>
+      <node concept="3clFbS" id="7lmP5gAYgVG" role="3clF47">
+        <node concept="3clFbF" id="7lmP5gAYgZP" role="3cqZAp">
+          <node concept="2OqwBi" id="7lmP5gAYh9z" role="3clFbG">
+            <node concept="13iPFW" id="7lmP5gAYgZO" role="2Oq$k0" />
+            <node concept="2Xjw5R" id="7lmP5gAYhiD" role="2OqNvi">
+              <node concept="1xMEDy" id="7lmP5gAYhiF" role="1xVPHs">
+                <node concept="chp4Y" id="7lmP5gAYhkS" role="ri$Ld">
+                  <ref role="cht4Q" to="zfi7:7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="7lmP5gAYgVa" role="13h7CW">
+      <node concept="3clFbS" id="7lmP5gAYgVb" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="7lmP5gAYJ47">
+    <ref role="13h7C2" to="zfi7:7lmP5gAYIZq" resolve="ConvertsQueryTemplate" />
+    <node concept="13hLZK" id="7lmP5gAYJ48" role="13h7CW">
+      <node concept="3clFbS" id="7lmP5gAYJ49" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="7lmP5gAYJ4Z" role="13h7CS">
+      <property role="TrG5h" value="getQueryInterface" />
+      <ref role="13i0hy" node="7lmP5gAXQfi" resolve="getQueryInterface" />
+      <node concept="3Tm1VV" id="7lmP5gAYJ50" role="1B3o_S" />
+      <node concept="3clFbS" id="7lmP5gAYJ56" role="3clF47">
+        <node concept="3clFbF" id="7lmP5gAYJ9o" role="3cqZAp">
+          <node concept="2tJFMh" id="7lmP5gAYJ9m" role="3clFbG">
+            <node concept="ZC_QK" id="7lmP5gAYJb8" role="2tJFKM">
+              <ref role="2aWVGs" to="tj24:5EDW3XDYNS7" resolve="ConvertQuery" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2sp9CU" id="7lmP5gAYJ57" role="3clF45">
+        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      </node>
+    </node>
+  </node>
+  <node concept="13h7C7" id="7lmP5gAYJq0">
+    <ref role="13h7C2" to="zfi7:7lmP5gAYJev" resolve="CoerceToQueryTemplate" />
+    <node concept="13hLZK" id="7lmP5gAYJq1" role="13h7CW">
+      <node concept="3clFbS" id="7lmP5gAYJq2" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="7lmP5gAYJqS" role="13h7CS">
+      <property role="TrG5h" value="getQueryInterface" />
+      <ref role="13i0hy" node="7lmP5gAXQfi" resolve="getQueryInterface" />
+      <node concept="3Tm1VV" id="7lmP5gAYJqT" role="1B3o_S" />
+      <node concept="3clFbS" id="7lmP5gAYJqZ" role="3clF47">
+        <node concept="3clFbF" id="7lmP5gAYJvh" role="3cqZAp">
+          <node concept="2tJFMh" id="7lmP5gAYJvf" role="3clFbG">
+            <node concept="ZC_QK" id="7lmP5gAYJx1" role="2tJFKM">
+              <ref role="2aWVGs" to="tj24:5EDW3XDYNTS" resolve="CoerceQuery" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2sp9CU" id="7lmP5gAYJr0" role="3clF45">
+        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
index 95c47f1f..475884f2 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
@@ -9,7 +9,324 @@
     <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
+    <import index="vxmb" ref="r:3345f3eb-f61a-42bd-88eb-d9032a80e9a6(jetbrains.mps.lang.coderules.editor)" implicit="true" />
   </imports>
-  <registry />
+  <registry>
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+        <child id="414384289274416996" name="parts" index="3ft7WO" />
+      </concept>
+      <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
+      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
+        <child id="1140524464360" name="cellLayout" index="2czzBx" />
+        <child id="928328222691832421" name="separatorTextQuery" index="2gpyvW" />
+        <child id="1233141163694" name="separatorStyle" index="sWeuL" />
+      </concept>
+      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
+      <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
+      <concept id="1237308012275" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineStyleClassItem" flags="ln" index="ljvvj" />
+      <concept id="709996738298806197" name="jetbrains.mps.lang.editor.structure.QueryFunction_SeparatorText" flags="in" index="2o9xnK" />
+      <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
+      <concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
+      <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+        <child id="8478191136883534238" name="features" index="upBLP" />
+      </concept>
+      <concept id="1177335944525" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_SubstituteString" flags="in" index="uGdhv" />
+      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
+        <child id="1080736633877" name="cellModel" index="2wV5jI" />
+      </concept>
+      <concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
+      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
+        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
+      </concept>
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
+      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
+        <property id="1186414551515" name="flag" index="VOm3f" />
+      </concept>
+      <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
+      <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+        <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
+        <child id="5991739802479788259" name="type" index="22hAXT" />
+      </concept>
+      <concept id="8998492695583125082" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_MatchingText" flags="ng" index="16NfWO">
+        <child id="8998492695583129244" name="query" index="16NeZM" />
+      </concept>
+      <concept id="1154465273778" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ParentNode" flags="nn" index="3bvxqY" />
+      <concept id="7342352913006985483" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Action" flags="ng" index="3eGOop">
+        <child id="8612453216082699922" name="substituteHandler" index="3aKz83" />
+      </concept>
+      <concept id="414384289274418283" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Group" flags="ng" index="3ft6gV">
+        <child id="414384289274424750" name="condition" index="3ft5RY" />
+        <child id="414384289274424751" name="parts" index="3ft5RZ" />
+      </concept>
+      <concept id="414384289274418284" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Condition" flags="ig" index="3ft6gW" />
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
+      </concept>
+      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
+      </concept>
+      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
+        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
+        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
+      </concept>
+      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
+        <property id="1082639509531" name="nullText" index="ilYzB" />
+        <property id="1073389577007" name="text" index="3F0ifm" />
+      </concept>
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+        <child id="1219418656006" name="styleItem" index="3F10Kt" />
+      </concept>
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
+      <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
+      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
+        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
+      <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
+        <child id="1180636770616" name="createdType" index="3zrR0E" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="24kQdi" id="7lmP5gALJrJ">
+    <ref role="1XX52x" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+    <node concept="3EZMnI" id="7lmP5gALJrL" role="2wV5jI">
+      <node concept="PMmxH" id="7lmP5gALJrS" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3F0ifn" id="5EDW3XE0PmJ" role="3EZMnx">
+        <property role="3F0ifm" value="" />
+        <node concept="VPM3Z" id="5EDW3XE0PmK" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="pVoyu" id="5EDW3XE0PmL" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F2HdR" id="7lmP5gALLXW" role="3EZMnx">
+        <ref role="1NtTu8" to="zfi7:7lmP5gALKoA" resolve="template" />
+        <node concept="lj46D" id="7lmP5gALLYk" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="7lmP5gALLYl" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="l2Vlx" id="7lmP5gALLXY" role="2czzBx" />
+        <node concept="tppnM" id="7lmP5gAY_9S" role="sWeuL">
+          <node concept="ljvvj" id="7lmP5gAY_9U" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="2o9xnK" id="7lmP5gAY_SK" role="2gpyvW">
+          <node concept="3clFbS" id="7lmP5gAY_SL" role="2VODD2">
+            <node concept="3clFbF" id="7lmP5gAY_Xp" role="3cqZAp">
+              <node concept="Xl_RD" id="7lmP5gAY_Xo" role="3clFbG">
+                <property role="Xl_RC" value="" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="7lmP5gALJrO" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7lmP5gALJRi">
+    <ref role="1XX52x" to="zfi7:7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+    <node concept="3EZMnI" id="7lmP5gALQbc" role="2wV5jI">
+      <node concept="3F0ifn" id="7lmP5gALQbj" role="3EZMnx">
+        <property role="ilYzB" value="&lt;choose from menu&gt;" />
+        <ref role="1k5W1q" to="tpco:3VARyd8XcQs" resolve="Comment" />
+        <node concept="VPM3Z" id="7lmP5gALRmO" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="VPxyj" id="7lmP5gALRmT" role="3F10Kt" />
+      </node>
+      <node concept="l2Vlx" id="7lmP5gALQbf" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7lmP5gALP1c">
+    <ref role="1XX52x" to="zfi7:7lmP5gALJQ1" resolve="CheckQueryTemplate" />
+    <node concept="PMmxH" id="7lmP5gAYxcx" role="2wV5jI">
+      <ref role="PMmxG" node="7lmP5gAYx5Q" resolve="TypecheckingQueryTemplate_component" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7lmP5gALP8w">
+    <ref role="1XX52x" to="zfi7:7lmP5gALKDQ" resolve="TypeofQueryTemplate" />
+    <node concept="PMmxH" id="7lmP5gAYx6D" role="2wV5jI">
+      <ref role="PMmxG" node="7lmP5gAYx5Q" resolve="TypecheckingQueryTemplate_component" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7lmP5gAYc72">
+    <ref role="1XX52x" to="zfi7:7lmP5gAYc5S" resolve="TypecheckingQueryParameter" />
+    <node concept="3EZMnI" id="5EDW3XEaRlR" role="2wV5jI">
+      <node concept="PMmxH" id="5EDW3XEaRlY" role="3EZMnx">
+        <ref role="1k5W1q" to="vxmb:7ksQUDZqpsE" resolve="InputName" />
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="l2Vlx" id="5EDW3XEaRlU" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="22mcaB" id="7lmP5gAYcrc">
+    <ref role="aqKnT" to="zfi7:7lmP5gAYc5S" resolve="TypecheckingQueryParameter" />
+    <node concept="3ft6gV" id="5EDW3XEaQms" role="3ft7WO">
+      <node concept="3eGOop" id="5EDW3XEc8hU" role="3ft5RZ">
+        <node concept="ucgPf" id="5EDW3XEc8hW" role="3aKz83">
+          <node concept="3clFbS" id="5EDW3XEc8hY" role="2VODD2">
+            <node concept="3clFbF" id="5EDW3XEc8jh" role="3cqZAp">
+              <node concept="2ShNRf" id="5EDW3XEc8jf" role="3clFbG">
+                <node concept="3zrR0B" id="5EDW3XEc9io" role="2ShVmc">
+                  <node concept="3Tqbb2" id="5EDW3XEc9iq" role="3zrR0E">
+                    <ref role="ehGHo" to="zfi7:7lmP5gAYc5S" resolve="TypecheckingQueryParameter" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="16NfWO" id="5EDW3XEcbS2" role="upBLP">
+          <node concept="uGdhv" id="5EDW3XEcbSQ" role="16NeZM">
+            <node concept="3clFbS" id="5EDW3XEcbSS" role="2VODD2">
+              <node concept="3clFbF" id="5EDW3XEcbXN" role="3cqZAp">
+                <node concept="Xl_RD" id="7lmP5gAYtY0" role="3clFbG">
+                  <property role="Xl_RC" value="query" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3ft6gW" id="5EDW3XEaQmu" role="3ft5RY">
+        <node concept="3clFbS" id="5EDW3XEaQmv" role="2VODD2">
+          <node concept="3clFbF" id="5EDW3XEaQqz" role="3cqZAp">
+            <node concept="2OqwBi" id="5EDW3XEaQYy" role="3clFbG">
+              <node concept="2OqwBi" id="5EDW3XEaQun" role="2Oq$k0">
+                <node concept="3bvxqY" id="5EDW3XEaQqy" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5EDW3XEaQA0" role="2OqNvi">
+                  <node concept="1xMEDy" id="5EDW3XEaQA2" role="1xVPHs">
+                    <node concept="chp4Y" id="7lmP5gAYoWj" role="ri$Ld">
+                      <ref role="cht4Q" to="zfi7:7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="5EDW3XEaQNF" role="1xVPHs" />
+                </node>
+              </node>
+              <node concept="3x8VRR" id="5EDW3XEaRfS" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="22hDWj" id="7lmP5gAYcry" role="22hAXT" />
+  </node>
+  <node concept="PKFIW" id="7lmP5gAYx5Q">
+    <property role="TrG5h" value="TypecheckingQueryTemplate_component" />
+    <ref role="1XX52x" to="zfi7:7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+    <node concept="3EZMnI" id="7lmP5gAYx6d" role="2wV5jI">
+      <node concept="l2Vlx" id="7lmP5gAYx6e" role="2iSdaV" />
+      <node concept="PMmxH" id="7lmP5gAYx6f" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        <node concept="Vb9p2" id="7lmP5gAYzQe" role="3F10Kt" />
+      </node>
+      <node concept="3F0ifn" id="7lmP5gAYz$k" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F0ifn" id="7lmP5gAYzQw" role="3EZMnx">
+        <property role="3F0ifm" value="query" />
+        <node concept="Vb9p2" id="7lmP5gAYzQN" role="3F10Kt" />
+      </node>
+      <node concept="3F0ifn" id="7lmP5gAYz$K" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="3F0ifn" id="7lmP5gAYx6g" role="3EZMnx">
+        <property role="3F0ifm" value="{" />
+        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
+        <node concept="ljvvj" id="7lmP5gAYx6h" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="7lmP5gAYx6i" role="3EZMnx">
+        <node concept="lj46D" id="7lmP5gAYx6j" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="VPM3Z" id="7lmP5gAYx6k" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F1sOY" id="7lmP5gAYx6l" role="3EZMnx">
+          <ref role="1NtTu8" to="zfi7:7lmP5gALJP_" resolve="code" />
+        </node>
+        <node concept="l2Vlx" id="7lmP5gAYx6m" role="2iSdaV" />
+      </node>
+      <node concept="3F0ifn" id="7lmP5gAYx6n" role="3EZMnx">
+        <property role="3F0ifm" value="}" />
+        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
+        <node concept="pVoyu" id="7lmP5gAYx6o" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="ljvvj" id="7lmP5gAYx6p" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="7lmP5gAYJ1k">
+    <ref role="1XX52x" to="zfi7:7lmP5gAYIZq" resolve="ConvertsQueryTemplate" />
+    <node concept="PMmxH" id="7lmP5gAYJ23" role="2wV5jI">
+      <ref role="PMmxG" node="7lmP5gAYx5Q" resolve="TypecheckingQueryTemplate_component" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7lmP5gAYJor">
+    <ref role="1XX52x" to="zfi7:7lmP5gAYJev" resolve="CoerceToQueryTemplate" />
+    <node concept="PMmxH" id="7lmP5gAYJpa" role="2wV5jI">
+      <ref role="PMmxG" node="7lmP5gAYx5Q" resolve="TypecheckingQueryTemplate_component" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index 088bab81..88c50e0a 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -9,7 +9,90 @@
   <imports>
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
-  <registry />
+  <registry>
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
+      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
+        <property id="4628067390765956802" name="abstract" index="R5$K7" />
+        <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
+      </concept>
+      <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
+        <property id="1096454100552" name="rootable" index="19KtqR" />
+        <reference id="1071489389519" name="extends" index="1TJDcQ" />
+      </concept>
+      <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
+        <property id="1071599776563" name="role" index="20kJfa" />
+        <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
+        <property id="1071599937831" name="metaClass" index="20lmBu" />
+        <property id="241647608299431140" name="linkId" index="IQ2ns" />
+        <reference id="1071599976176" name="target" index="20lvS9" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1TIwiD" id="7lmP5gALJri">
+    <property role="EcuMT" value="8455178808327599826" />
+    <property role="TrG5h" value="TypecheckingQueries" />
+    <property role="19KtqR" value="true" />
+    <property role="34LRSv" value="typechecking queries" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="7lmP5gALKoA" role="1TKVEi">
+      <property role="IQ2ns" value="8455178808327603750" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="template" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7lmP5gALJP$">
+    <property role="EcuMT" value="8455178808327601508" />
+    <property role="TrG5h" value="TypecheckingQueryTemplate" />
+    <property role="R5$K7" value="true" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="7lmP5gALJP_" role="1TKVEi">
+      <property role="IQ2ns" value="8455178808327601509" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="code" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7lmP5gALJQ1">
+    <property role="EcuMT" value="8455178808327601537" />
+    <property role="TrG5h" value="CheckQueryTemplate" />
+    <property role="34LRSv" value="check" />
+    <ref role="1TJDcQ" node="7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+  </node>
+  <node concept="1TIwiD" id="7lmP5gALKDQ">
+    <property role="EcuMT" value="8455178808327604854" />
+    <property role="TrG5h" value="TypeofQueryTemplate" />
+    <property role="34LRSv" value="typeOf" />
+    <ref role="1TJDcQ" node="7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+  </node>
+  <node concept="1TIwiD" id="7lmP5gAYc5S">
+    <property role="EcuMT" value="8455178808330862968" />
+    <property role="TrG5h" value="TypecheckingQueryParameter" />
+    <property role="34LRSv" value="query" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+  </node>
+  <node concept="1TIwiD" id="7lmP5gAYIZq">
+    <property role="EcuMT" value="8455178808331005914" />
+    <property role="TrG5h" value="ConvertsQueryTemplate" />
+    <property role="34LRSv" value="convertsTo" />
+    <ref role="1TJDcQ" node="7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+  </node>
+  <node concept="1TIwiD" id="7lmP5gAYJev">
+    <property role="EcuMT" value="8455178808331006879" />
+    <property role="TrG5h" value="CoerceToQueryTemplate" />
+    <property role="34LRSv" value="coerceTo" />
+    <ref role="1TJDcQ" node="7lmP5gALJP$" resolve="TypecheckingQueryTemplate" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
index 18b19dde..1233afe0 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
@@ -10,7 +10,222 @@
   </languages>
   <imports>
     <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="h103" ref="r:9c80bc3e-1982-4e7d-8fe4-1b25a1c02635(jetbrains.mps.lang.typechecking.behavior)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
-  <registry />
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
+    </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+        <property id="6489343236075007666" name="label" index="3hQQBS" />
+        <child id="1196350785111" name="expression" index="2c44t1" />
+      </concept>
+      <concept id="1196350785117" name="jetbrains.mps.lang.quotation.structure.ReferenceAntiquotation" flags="ng" index="2c44tb" />
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
+        <child id="1185788644032" name="normalType" index="mwGJk" />
+      </concept>
+      <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
+        <child id="1195213635060" name="body" index="18ibNy" />
+      </concept>
+      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
+        <reference id="1174642800329" name="concept" index="1YaFvo" />
+      </concept>
+      <concept id="1174643105530" name="jetbrains.mps.lang.typesystem.structure.InferenceRule" flags="ig" index="1YbPZF" />
+      <concept id="1174648085619" name="jetbrains.mps.lang.typesystem.structure.AbstractRule" flags="ng" index="1YuPPy">
+        <child id="1174648101952" name="applicableNode" index="1YuTPh" />
+      </concept>
+      <concept id="1174650418652" name="jetbrains.mps.lang.typesystem.structure.ApplicableNodeReference" flags="nn" index="1YBJjd">
+        <reference id="1174650432090" name="applicableNode" index="1YBMHb" />
+      </concept>
+      <concept id="1174657487114" name="jetbrains.mps.lang.typesystem.structure.TypeOfExpression" flags="nn" index="1Z2H0r">
+        <child id="1174657509053" name="term" index="1Z2MuG" />
+      </concept>
+      <concept id="1174658326157" name="jetbrains.mps.lang.typesystem.structure.CreateEquationStatement" flags="nn" index="1Z5TYs" />
+      <concept id="1174660718586" name="jetbrains.mps.lang.typesystem.structure.AbstractEquationStatement" flags="nn" index="1Zf1VF">
+        <child id="1174660783413" name="leftExpression" index="1ZfhK$" />
+        <child id="1174660783414" name="rightExpression" index="1ZfhKB" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU">
+        <reference id="7400021826771268269" name="concept" index="2sp9C9" />
+      </concept>
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </concept>
+      <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
+        <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
+        <property id="1341860900488019036" name="linkId" index="P3scX" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1YbPZF" id="7lmP5gAYhwd">
+    <property role="TrG5h" value="typeof_TypecheckingQueryParameter" />
+    <node concept="3clFbS" id="7lmP5gAYhwe" role="18ibNy">
+      <node concept="3cpWs8" id="7lmP5gAYjvY" role="3cqZAp">
+        <node concept="3cpWsn" id="7lmP5gAYjvZ" role="3cpWs9">
+          <property role="TrG5h" value="queryInterface" />
+          <node concept="2sp9CU" id="7lmP5gAYjtN" role="1tU5fm">
+            <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+          </node>
+          <node concept="2OqwBi" id="7lmP5gAYjw0" role="33vP2m">
+            <node concept="2OqwBi" id="7lmP5gAYjw1" role="2Oq$k0">
+              <node concept="1YBJjd" id="7lmP5gAYjw2" role="2Oq$k0">
+                <ref role="1YBMHb" node="7lmP5gAYhwg" resolve="tqp" />
+              </node>
+              <node concept="2qgKlT" id="7lmP5gAYjw3" role="2OqNvi">
+                <ref role="37wK5l" to="h103:7lmP5gAYgVD" resolve="getTypecheckingQueryTemplate" />
+              </node>
+            </node>
+            <node concept="2qgKlT" id="7lmP5gAYjw4" role="2OqNvi">
+              <ref role="37wK5l" to="h103:7lmP5gAXQfi" resolve="getQueryInterface" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3SKdUt" id="7lmP5gAYlfx" role="3cqZAp">
+        <node concept="1PaTwC" id="7lmP5gAYlfy" role="1aUNEU">
+          <node concept="3oM_SD" id="7lmP5gAYlhb" role="1PaTwD">
+            <property role="3oM_SC" value="FIXME" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYlhd" role="1PaTwD">
+            <property role="3oM_SC" value="no" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYlhg" role="1PaTwD">
+            <property role="3oM_SC" value="other" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYlhk" role="1PaTwD">
+            <property role="3oM_SC" value="way" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYlhp" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYlhv" role="1PaTwD">
+            <property role="3oM_SC" value="get" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYlhA" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYlhI" role="1PaTwD">
+            <property role="3oM_SC" value="required" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYlhR" role="1PaTwD">
+            <property role="3oM_SC" value="repository" />
+          </node>
+          <node concept="3oM_SD" id="7lmP5gAYli1" role="1PaTwD">
+            <property role="3oM_SC" value="atm" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cpWs8" id="7lmP5gAYl45" role="3cqZAp">
+        <node concept="3cpWsn" id="7lmP5gAYl46" role="3cpWs9">
+          <property role="TrG5h" value="cls" />
+          <node concept="3Tqbb2" id="7lmP5gAYl0u" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+          </node>
+          <node concept="2OqwBi" id="7lmP5gAYl47" role="33vP2m">
+            <node concept="37vLTw" id="7lmP5gAYl48" role="2Oq$k0">
+              <ref role="3cqZAo" node="7lmP5gAYjvZ" resolve="queryInterface" />
+            </node>
+            <node concept="Vyspw" id="7lmP5gAYl49" role="2OqNvi">
+              <node concept="2YIFZM" id="7lmP5gAYl4a" role="Vysub">
+                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
+                <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1Z5TYs" id="7lmP5gAYhwJ" role="3cqZAp">
+        <node concept="mw_s8" id="7lmP5gAYhwT" role="1ZfhK$">
+          <node concept="1Z2H0r" id="7lmP5gAYhwP" role="mwGJk">
+            <node concept="1YBJjd" id="7lmP5gAYhxa" role="1Z2MuG">
+              <ref role="1YBMHb" node="7lmP5gAYhwg" resolve="tqp" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="7lmP5gAYir_" role="1ZfhKB">
+          <node concept="2c44tf" id="7lmP5gAYirx" role="mwGJk">
+            <node concept="3uibUv" id="7lmP5gAYiwm" role="2c44tc">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              <node concept="2c44tb" id="7lmP5gAYiyU" role="lGtFl">
+                <property role="2qtEX8" value="classifier" />
+                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
+                <property role="3hQQBS" value="ClassifierType" />
+                <node concept="37vLTw" id="7lmP5gAYlw2" role="2c44t1">
+                  <ref role="3cqZAo" node="7lmP5gAYl46" resolve="cls" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="7lmP5gAYhwg" role="1YuTPh">
+      <property role="TrG5h" value="tqp" />
+      <ref role="1YaFvo" to="zfi7:7lmP5gAYc5S" resolve="TypecheckingQueryParameter" />
+    </node>
+  </node>
 </model>