diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
index c76e9233..2c7cd057 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
@@ -24,6 +24,7 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.typesystem2.program)" />
+    <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -54,6 +55,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
@@ -285,6 +289,10 @@
         <child id="7670825977262353027" name="input" index="3eYTkm" />
         <child id="8908809128801952514" name="body" index="3unh6L" />
       </concept>
+      <concept id="7871500063866331595" name="jetbrains.mps.lang.typesystem2.structure.Query" flags="ng" index="92CTh">
+        <child id="7871500063866331596" name="queryStage" index="92CTm" />
+        <child id="3026409000513569515" name="queryKind" index="2_lZgo" />
+      </concept>
       <concept id="1980609059169917031" name="jetbrains.mps.lang.typesystem2.structure.CopyItem" flags="ng" index="9KH4l">
         <child id="1980609059169917850" name="origin" index="9KHbC" />
       </concept>
@@ -292,6 +300,10 @@
       <concept id="6928531011217258898" name="jetbrains.mps.lang.typesystem2.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
         <child id="6928531011217290187" name="variable" index="2aLmnP" />
       </concept>
+      <concept id="9035818301008609703" name="jetbrains.mps.lang.typesystem2.structure.QueryTemplate" flags="ng" index="2bWyPT">
+        <property id="7871500063866800656" name="stage" index="90Yma" />
+        <child id="7871500063838282362" name="code" index="fHCRw" />
+      </concept>
       <concept id="6958395084019752" name="jetbrains.mps.lang.typesystem2.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
         <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
       </concept>
@@ -306,6 +318,7 @@
       <concept id="8335224865066016388" name="jetbrains.mps.lang.typesystem2.structure.Rule" flags="ng" index="AVZhu" />
       <concept id="8335224865066015764" name="jetbrains.mps.lang.typesystem2.structure.Handler" flags="ng" index="AVZre">
         <property id="2316688792951788157" name="stage" index="3J8TDj" />
+        <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="7368070394767441299" name="rule" index="3ArX_J" />
       </concept>
@@ -319,6 +332,12 @@
       <concept id="7670825977262339471" name="jetbrains.mps.lang.typesystem2.structure.MacroInputDeclaration" flags="ng" index="3eYOCq">
         <child id="7670825977262355988" name="type" index="3eYSA1" />
       </concept>
+      <concept id="3575255234174969639" name="jetbrains.mps.lang.typesystem2.structure.ConstraintRule" flags="ng" index="1nLNMm">
+        <child id="3575255234174969660" name="body" index="1nLNMd" />
+      </concept>
+      <concept id="3575255234174969664" name="jetbrains.mps.lang.typesystem2.structure.ConstraintRuleStatement" flags="ng" index="1nLNNL">
+        <child id="3575255234174969665" name="rule" index="1nLNNK" />
+      </concept>
       <concept id="8908809128804390455" name="jetbrains.mps.lang.typesystem2.structure.MacroLogicalExpression" flags="ng" index="3txIi4" />
       <concept id="8908809128801951589" name="jetbrains.mps.lang.typesystem2.structure.MacroBody" flags="ng" index="3uniRm">
         <child id="8908809128801951594" name="parameter" index="3uniRp" />
@@ -1679,27 +1698,7 @@
   <node concept="AVZre" id="4dPZ2m2i46N">
     <property role="TrG5h" value="recover" />
     <property role="3J8TDj" value="Stage2" />
-    <node concept="AVZhu" id="4dPZ2m2jAOh" role="3ArX_J">
-      <property role="TrG5h" value="recover_all" />
-      <node concept="3Aq9E8" id="4dPZ2m2jAYr" role="3otmyu">
-        <node concept="3I6sU6" id="4dPZ2m2jAYt" role="3Ip0Jz">
-          <node concept="3I6s7M" id="4dPZ2m2jAYv" role="3I6sU7">
-            <node concept="3Aqt3T" id="4dPZ2m2jAYz" role="3I6s78">
-              <ref role="3AqCNq" node="4dPZ2m2jAgt" resolve="recoverAll" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Aq93q" id="4nAM3Of9gIf" role="3orSU4">
-        <node concept="3I6sU6" id="4nAM3Of9gIg" role="3Ip0Jz">
-          <node concept="3I6s7M" id="4nAM3Of9gIk" role="3I6sU7">
-            <node concept="3Aqt3T" id="4nAM3Of9gIj" role="3I6s78">
-              <ref role="3AqCNq" node="4nAM3Of98gl" resolve="main" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
+    <ref role="2YbDB9" node="5dGkjBXlLmT" resolve="typeOf" />
     <node concept="AVZhu" id="4dPZ2m2jB8S" role="3ArX_J">
       <property role="TrG5h" value="expr_typeNode" />
       <node concept="3Aq9E8" id="4dPZ2m2jBn7" role="3otmyu">
@@ -2589,5 +2588,31 @@
       </node>
     </node>
   </node>
+  <node concept="92CTh" id="5Eb7bDWO4vA">
+    <property role="TrG5h" value="Typecheck" />
+    <node concept="2bWyPT" id="5Eb7bDWO9gE" role="92CTm">
+      <property role="TrG5h" value="recover" />
+      <property role="90Yma" value="Stage2" />
+      <node concept="3clFbS" id="5Eb7bDWO9gF" role="fHCRw">
+        <node concept="1nLNNL" id="5Eb7bDWO9jS" role="3cqZAp">
+          <node concept="1nLNMm" id="5Eb7bDWO9jT" role="1nLNNK">
+            <node concept="3Aq9E8" id="5Eb7bDWO9lC" role="1nLNMd">
+              <node concept="3I6sU6" id="5Eb7bDWO9lD" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5Eb7bDWO9lH" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5Eb7bDWO9lG" role="3I6s78">
+                    <ref role="3AqCNq" node="4dPZ2m2jAgt" resolve="recoverAll" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="10M0yZ" id="5Eb7bDWO7EB" role="2_lZgo">
+      <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+    </node>
+  </node>
 </model>
 
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
index dea9ff54..6bf006b2 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
@@ -16,6 +16,7 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -51,7 +52,6 @@
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
     <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="11" />
-    <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
     <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" />
@@ -74,6 +74,8 @@
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" 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" />
+    <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
+    <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
     <module reference="af858d84-85f2-42f4-a854-0b3c6b5cd482(sample.lambdacalc)" version="0" />
   </dependencyVersions>
   <extendedLanguages />