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 30a86617..9b7b5cb6 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
@@ -349,7 +349,7 @@
               <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" />
+                  <ref role="37wK5l" to="h103:3vih52511I4" resolve="getQueryClassfier" />
                 </node>
               </node>
             </node>
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 cf0bf9d7..7e51ea45 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
@@ -151,12 +151,10 @@
     <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" />
@@ -165,34 +163,23 @@
     <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" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <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>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
index c5f89fdc..79e4c139 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
@@ -4,6 +4,7 @@
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -49,14 +50,17 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </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" />
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -66,12 +70,6 @@
       <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" />
@@ -79,6 +77,9 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </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">
@@ -88,18 +89,23 @@
   </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" />
+    <node concept="13i0hz" id="3vih52511I4" role="13h7CS">
+      <property role="TrG5h" value="getQueryClassfier" />
       <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 concept="3Tm1VV" id="3vih52511I5" role="1B3o_S" />
+      <node concept="3Tqbb2" id="3vih52511WY" role="3clF45">
+        <ref role="ehGHo" 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 concept="3clFbS" id="3vih52511I7" role="3clF47">
+        <node concept="3cpWs6" id="3vih52512A3" role="3cqZAp">
+          <node concept="2OqwBi" id="3vih52514Km" role="3cqZAk">
+            <node concept="2c44tf" id="3vih52515Xj" role="2Oq$k0">
+              <node concept="3uibUv" id="3vih52515Xk" role="2c44tc">
+                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="3vih52515pt" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
             </node>
           </node>
         </node>
@@ -114,21 +120,26 @@
     <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 concept="13i0hz" id="3vih525172Q" role="13h7CS">
+      <property role="TrG5h" value="getQueryClassfier" />
+      <ref role="13i0hy" node="3vih52511I4" resolve="getQueryClassfier" />
+      <node concept="3Tm1VV" id="3vih525172R" role="1B3o_S" />
+      <node concept="3clFbS" id="3vih525172Z" role="3clF47">
+        <node concept="3cpWs6" id="3vih52517rm" role="3cqZAp">
+          <node concept="2OqwBi" id="3vih52517rn" role="3cqZAk">
+            <node concept="2c44tf" id="3vih52517ro" role="2Oq$k0">
+              <node concept="3uibUv" id="3vih52517rp" role="2c44tc">
+                <ref role="3uigEE" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="3vih52517rq" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="2sp9CU" id="7lmP5gAXSzY" role="3clF45">
-        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      <node concept="3Tqbb2" id="3vih5251730" role="3clF45">
+        <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
       </node>
     </node>
   </node>
@@ -137,21 +148,26 @@
     <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 concept="13i0hz" id="3vih5251axu" role="13h7CS">
+      <property role="TrG5h" value="getQueryClassfier" />
+      <ref role="13i0hy" node="3vih52511I4" resolve="getQueryClassfier" />
+      <node concept="3Tm1VV" id="3vih5251axv" role="1B3o_S" />
+      <node concept="3clFbS" id="3vih5251axB" role="3clF47">
+        <node concept="3cpWs6" id="3vih5251aC6" role="3cqZAp">
+          <node concept="2OqwBi" id="3vih5251aC7" role="3cqZAk">
+            <node concept="2c44tf" id="3vih5251aC8" role="2Oq$k0">
+              <node concept="3uibUv" id="3vih5251aC9" role="2c44tc">
+                <ref role="3uigEE" to="tj24:1T5MAgP$8dd" resolve="TypeOfQuery" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="3vih5251aCa" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="2sp9CU" id="7lmP5gAXT$F" role="3clF45">
-        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      <node concept="3Tqbb2" id="3vih5251axC" role="3clF45">
+        <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
       </node>
     </node>
   </node>
@@ -187,21 +203,26 @@
     <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 concept="13i0hz" id="3vih52519Gd" role="13h7CS">
+      <property role="TrG5h" value="getQueryClassfier" />
+      <ref role="13i0hy" node="3vih52511I4" resolve="getQueryClassfier" />
+      <node concept="3Tm1VV" id="3vih52519Ge" role="1B3o_S" />
+      <node concept="3clFbS" id="3vih52519Gm" role="3clF47">
+        <node concept="3cpWs6" id="3vih52519SV" role="3cqZAp">
+          <node concept="2OqwBi" id="3vih52519SW" role="3cqZAk">
+            <node concept="2c44tf" id="3vih52519SX" role="2Oq$k0">
+              <node concept="3uibUv" id="3vih52519SY" role="2c44tc">
+                <ref role="3uigEE" to="tj24:5EDW3XDYNS7" resolve="ConvertQuery" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="3vih52519SZ" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="2sp9CU" id="7lmP5gAYJ57" role="3clF45">
-        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      <node concept="3Tqbb2" id="3vih52519Gn" role="3clF45">
+        <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
       </node>
     </node>
   </node>
@@ -210,21 +231,26 @@
     <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 concept="13i0hz" id="3vih52518PI" role="13h7CS">
+      <property role="TrG5h" value="getQueryClassfier" />
+      <ref role="13i0hy" node="3vih52511I4" resolve="getQueryClassfier" />
+      <node concept="3Tm1VV" id="3vih52518PJ" role="1B3o_S" />
+      <node concept="3clFbS" id="3vih52518PR" role="3clF47">
+        <node concept="3cpWs6" id="3vih525190O" role="3cqZAp">
+          <node concept="2OqwBi" id="3vih525190P" role="3cqZAk">
+            <node concept="2c44tf" id="3vih525190Q" role="2Oq$k0">
+              <node concept="3uibUv" id="3vih525190R" role="2c44tc">
+                <ref role="3uigEE" to="tj24:5EDW3XDYNTS" resolve="CoerceQuery" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="3vih525190S" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="2sp9CU" id="7lmP5gAYJr0" role="3clF45">
-        <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+      <node concept="3Tqbb2" id="3vih52518PS" role="3clF45">
+        <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
       </node>
     </node>
   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.actions.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.actions.mps
new file mode 100644
index 00000000..bddc22da
--- /dev/null
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.actions.mps
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:dcb778e7-18e6-4d74-8dc9-cee53a4d3450(jetbrains.mps.lang.typechecking.actions)">
+  <persistence version="9" />
+  <languages>
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" implicit="true" />
+  </imports>
+  <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="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </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="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
+      <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
+      <concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
+        <child id="1158700779049" name="nodeFactory" index="37WGs$" />
+      </concept>
+      <concept id="1158700725281" name="jetbrains.mps.lang.actions.structure.NodeFactory" flags="ig" index="37WvkG">
+        <reference id="1158700943156" name="applicableConcept" index="37XkoT" />
+        <child id="1158701448518" name="setupFunction" index="37ZfLb" />
+      </concept>
+      <concept id="1158701162220" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction" flags="in" index="37Y9Zx" />
+      <concept id="5584396657084912703" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_NewNode" flags="nn" index="1r4Lsj" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
+        <reference id="1139877738879" name="concept" index="1A0vxQ" />
+      </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="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="37WguZ" id="3vih5256zNi">
+    <property role="TrG5h" value="TypecheckingQueries" />
+    <node concept="37WvkG" id="3vih5256zQX" role="37WGs$">
+      <ref role="37XkoT" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+      <node concept="37Y9Zx" id="3vih5256zQY" role="37ZfLb">
+        <node concept="3clFbS" id="3vih5256zQZ" role="2VODD2">
+          <node concept="3clFbF" id="3vih5256zVW" role="3cqZAp">
+            <node concept="2OqwBi" id="3vih5256__l" role="3clFbG">
+              <node concept="2OqwBi" id="3vih5256$3G" role="2Oq$k0">
+                <node concept="1r4Lsj" id="3vih5256zVV" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="3vih5256$bZ" role="2OqNvi">
+                  <ref role="3TtcxE" to="zfi7:7lmP5gALKoA" resolve="template" />
+                </node>
+              </node>
+              <node concept="2DeJg1" id="3vih5256C9c" role="2OqNvi">
+                <ref role="1A0vxQ" to="zfi7:7lmP5gALJQ1" resolve="CheckQueryTemplate" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3vih5256CyM" role="3cqZAp">
+            <node concept="2OqwBi" id="3vih5256CyN" role="3clFbG">
+              <node concept="2OqwBi" id="3vih5256CyO" role="2Oq$k0">
+                <node concept="1r4Lsj" id="3vih5256CyP" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="3vih5256CyQ" role="2OqNvi">
+                  <ref role="3TtcxE" to="zfi7:7lmP5gALKoA" resolve="template" />
+                </node>
+              </node>
+              <node concept="2DeJg1" id="3vih5256CyR" role="2OqNvi">
+                <ref role="1A0vxQ" to="zfi7:7lmP5gALKDQ" resolve="TypeofQueryTemplate" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3vih5256CVr" role="3cqZAp">
+            <node concept="2OqwBi" id="3vih5256CVs" role="3clFbG">
+              <node concept="2OqwBi" id="3vih5256CVt" role="2Oq$k0">
+                <node concept="1r4Lsj" id="3vih5256CVu" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="3vih5256CVv" role="2OqNvi">
+                  <ref role="3TtcxE" to="zfi7:7lmP5gALKoA" resolve="template" />
+                </node>
+              </node>
+              <node concept="2DeJg1" id="3vih5256CVw" role="2OqNvi">
+                <ref role="1A0vxQ" to="zfi7:7lmP5gAYIZq" resolve="ConvertsQueryTemplate" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3vih5256Dko" role="3cqZAp">
+            <node concept="2OqwBi" id="3vih5256Dkp" role="3clFbG">
+              <node concept="2OqwBi" id="3vih5256Dkq" role="2Oq$k0">
+                <node concept="1r4Lsj" id="3vih5256Dkr" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="3vih5256Dks" role="2OqNvi">
+                  <ref role="3TtcxE" to="zfi7:7lmP5gALKoA" resolve="template" />
+                </node>
+              </node>
+              <node concept="2DeJg1" id="3vih5256Dkt" role="2OqNvi">
+                <ref role="1A0vxQ" to="zfi7:7lmP5gAYJev" resolve="CoerceToQueryTemplate" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </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 1233afe0..56cb90c6 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
@@ -21,9 +21,6 @@
         <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>
@@ -46,9 +43,6 @@
       <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">
@@ -88,13 +82,6 @@
     </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>
@@ -111,14 +98,6 @@
         <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" />
@@ -126,8 +105,8 @@
       <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 concept="3Tqbb2" id="3vih5251cHm" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
           </node>
           <node concept="2OqwBi" id="7lmP5gAYjw0" role="33vP2m">
             <node concept="2OqwBi" id="7lmP5gAYjw1" role="2Oq$k0">
@@ -139,60 +118,7 @@
               </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>
+              <ref role="37wK5l" to="h103:3vih52511I4" resolve="getQueryClassfier" />
             </node>
           </node>
         </node>
@@ -214,7 +140,7 @@
                 <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" />
+                  <ref role="3cqZAo" node="7lmP5gAYjvZ" resolve="queryInterface" />
                 </node>
               </node>
             </node>