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 c54aa0e9..c76e9233 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
@@ -9,6 +9,7 @@
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -383,10 +384,6 @@
         <child id="2316688792939428590" name="code" index="3IrJb0" />
       </concept>
       <concept id="965748826975413063" name="jetbrains.mps.lang.typesystem2.structure.RulePartParameterDeclaration" flags="ng" index="3NuqgR" />
-      <concept id="3063948360252660075" name="jetbrains.mps.lang.typesystem2.structure.TypeofConstraint" flags="ng" index="3XxkQB">
-        <child id="3063948360252667312" name="assignedType" index="3Xxm5W" />
-        <child id="3063948360252666228" name="anchor" index="3XxmmS" />
-      </concept>
     </language>
   </registry>
   <node concept="0oKg$" id="3_qfG1EPgcF">
@@ -487,6 +484,15 @@
   </node>
   <node concept="AVZre" id="5dGkjBXlLmT">
     <property role="TrG5h" value="typeOf" />
+    <node concept="3AqmO8" id="4KALGUEgLbG" role="8PkJo">
+      <property role="TrG5h" value="typeOf" />
+      <node concept="1zAUYm" id="4KALGUEgLfk" role="1zAUyy">
+        <property role="TrG5h" value="node" />
+      </node>
+      <node concept="1zAUYm" id="4KALGUEgLfm" role="1zAUyy">
+        <property role="TrG5h" value="type" />
+      </node>
+    </node>
     <node concept="AVZhu" id="492bFERogfi" role="3ArX_J">
       <property role="TrG5h" value="typeOf_TrueConst" />
       <node concept="3Aq9E8" id="492bFERognK" role="3otmyu">
@@ -500,13 +506,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="Cn$NxdZf0f" role="3I6sU7">
-            <node concept="3XxkQB" id="492bFERogoB" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxI" role="3XxmmS">
-                <node concept="3A2sRY" id="2mKpIXwNDxH" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0aV" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0aS" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0aT" role="3BlFb_">
                   <ref role="3A2yKK" node="492bFERogn9" resolve="trueConst" />
                 </node>
               </node>
-              <node concept="a7P8L" id="492bFERogp3" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0aU" role="3AunhB">
                 <ref role="a7OzE" node="492bFERognP" resolve="T" />
               </node>
             </node>
@@ -540,13 +547,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="Cn$NxdZf0Q" role="3I6sU7">
-            <node concept="3XxkQB" id="492bFERojU0" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxi" role="3XxmmS">
-                <node concept="3A2sRY" id="2mKpIXwNDxh" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0aR" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0aO" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0aP" role="3BlFb_">
                   <ref role="3A2yKK" node="492bFERojU5" resolve="falseConst" />
                 </node>
               </node>
-              <node concept="a7P8L" id="492bFERojU3" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0aQ" role="3AunhB">
                 <ref role="a7OzE" node="492bFERojTU" resolve="T" />
               </node>
             </node>
@@ -579,18 +587,19 @@
                 </node>
               </node>
               <node concept="3Aqczg" id="3dV5CmlMdxk" role="3cqZAp">
-                <node concept="3XxkQB" id="3dV5CmlMdxc" role="3Aqpz8">
-                  <node concept="3BlFb$" id="2mKpIXwNDy2" role="3XxmmS">
-                    <node concept="2OqwBi" id="2mKpIXwNDxZ" role="3BlFb_">
-                      <node concept="3A2sRY" id="2mKpIXwNDy0" role="2Oq$k0">
+                <node concept="3Aqt3T" id="4KALGUEh0c3" role="3Aqpz8">
+                  <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+                  <node concept="3BlFb$" id="4KALGUEh0bY" role="3AunhB">
+                    <node concept="2OqwBi" id="4KALGUEh0bZ" role="3BlFb_">
+                      <node concept="3A2sRY" id="4KALGUEh0c0" role="2Oq$k0">
                         <ref role="3A2yKK" node="3dV5CmlMdwE" resolve="lvb" />
                       </node>
-                      <node concept="3TrEf2" id="2mKpIXwNDy1" role="2OqNvi">
+                      <node concept="3TrEf2" id="4KALGUEh0c1" role="2OqNvi">
                         <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQj" resolve="var" />
                       </node>
                     </node>
                   </node>
-                  <node concept="a7P8L" id="492bFERozSn" role="3Xxm5W">
+                  <node concept="a7P8L" id="4KALGUEh0c2" role="3AunhB">
                     <ref role="a7OzE" node="3dV5CmlMdwV" resolve="T" />
                   </node>
                 </node>
@@ -629,18 +638,19 @@
             </node>
           </node>
           <node concept="3I6s7M" id="10BVPEVK65K" role="3I6sU7">
-            <node concept="3XxkQB" id="10BVPEVK65C" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDyk" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDyh" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDyi" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0bt" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0bo" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0bp" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0bq" role="2Oq$k0">
                     <ref role="3A2yKK" node="10BVPEVK4YL" resolve="lvb" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDyj" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0br" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQq" resolve="var" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="6XR$k9E04om" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0bs" role="3AunhB">
                 <ref role="a7OzE" node="6XR$k9E03vG" resolve="G" />
               </node>
             </node>
@@ -651,18 +661,19 @@
         <property role="3ArMco" value="true" />
         <node concept="3I6sU6" id="10BVPEVK4YY" role="3Ip0Jz">
           <node concept="3I6s7M" id="10BVPEVK5Ku" role="3I6sU7">
-            <node concept="3XxkQB" id="10BVPEVK5Kq" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxm" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxj" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDxk" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0bf" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0ba" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0bb" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0bc" role="2Oq$k0">
                     <ref role="3A2yKK" node="10BVPEVK4YL" resolve="lvb" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxl" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0bd" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQs" resolve="expr" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="10BVPEVK64B" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0be" role="3AunhB">
                 <ref role="a7OzE" node="10BVPEVK64u" resolve="E" />
               </node>
             </node>
@@ -704,13 +715,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="G788z3oTvL" role="3I6sU7">
-            <node concept="3XxkQB" id="G788z3oTvH" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDy8" role="3XxmmS">
-                <node concept="3A2sRY" id="2mKpIXwNDy7" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0bX" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0bU" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0bV" role="3BlFb_">
                   <ref role="3A2yKK" node="G788z3oSpi" resolve="let" />
                 </node>
               </node>
-              <node concept="a7P8L" id="RRVBbp7Vbc" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0bW" role="3AunhB">
                 <ref role="a7OzE" node="3Lj6UsgFx9L" resolve="G" />
               </node>
             </node>
@@ -721,18 +733,19 @@
         <property role="3ArMco" value="true" />
         <node concept="3I6sU6" id="G788z3oSps" role="3Ip0Jz">
           <node concept="3I6s7M" id="G788z3oTaY" role="3I6sU7">
-            <node concept="3XxkQB" id="G788z3oTaU" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxM" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxJ" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDxK" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0bP" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0bK" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0bL" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0bM" role="2Oq$k0">
                     <ref role="3A2yKK" node="G788z3oSpi" resolve="let" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxL" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0bN" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQx" resolve="expr" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="G788z3oTv$" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0bO" role="3AunhB">
                 <ref role="a7OzE" node="G788z3oSpw" resolve="E" />
               </node>
             </node>
@@ -774,13 +787,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="7edv2S3cQd_" role="3I6sU7">
-            <node concept="3XxkQB" id="7edv2S3cQdx" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDya" role="3XxmmS">
-                <node concept="3A2sRY" id="2mKpIXwNDy9" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0aB" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0a$" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0a_" role="3BlFb_">
                   <ref role="3A2yKK" node="3TFdEPZe4bq" resolve="varRef" />
                 </node>
               </node>
-              <node concept="a7P8L" id="3Lj6UsgFxmm" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0aA" role="3AunhB">
                 <ref role="a7OzE" node="3Lj6UsgFxlw" resolve="I" />
               </node>
             </node>
@@ -791,18 +805,19 @@
         <property role="3ArMco" value="true" />
         <node concept="3I6sU6" id="7edv2S3cP1Z" role="3Ip0Jz">
           <node concept="3I6s7M" id="7edv2S3cPNW" role="3I6sU7">
-            <node concept="3XxkQB" id="7edv2S3cPNS" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxE" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxB" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDxC" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0bJ" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0bE" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0bF" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0bG" role="2Oq$k0">
                     <ref role="3A2yKK" node="3TFdEPZe4bq" resolve="varRef" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxD" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0bH" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_zMfd$ooos" resolve="def" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="7edv2S3cQds" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0bI" role="3AunhB">
                 <ref role="a7OzE" node="7edv2S3cP28" resolve="T" />
               </node>
             </node>
@@ -873,13 +888,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="Cn$NxdZfml" role="3I6sU7">
-            <node concept="3XxkQB" id="3dV5CmlM9mr" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDy4" role="3XxmmS">
-                <node concept="3A2sRY" id="2mKpIXwNDy3" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0bT" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0bQ" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0bR" role="3BlFb_">
                   <ref role="3A2yKK" node="3dV5CmlM9jX" resolve="lam" />
                 </node>
               </node>
-              <node concept="a7P8L" id="3dV5CmlM9mX" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0bS" role="3AunhB">
                 <ref role="a7OzE" node="3dV5CmlM9lE" resolve="T" />
               </node>
             </node>
@@ -890,40 +906,42 @@
         <property role="3ArMco" value="true" />
         <node concept="3I6sU6" id="Cn$NxdZfc_" role="3Ip0Jz">
           <node concept="3I6s7M" id="Cn$NxdZfcA" role="3I6sU7">
-            <node concept="3XxkQB" id="3dV5CmlM9Xg" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxw" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxr" role="3BlFb_">
-                  <node concept="2OqwBi" id="2mKpIXwNDxs" role="2Oq$k0">
-                    <node concept="3A2sRY" id="2mKpIXwNDxt" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0ch" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0ca" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0cb" role="3BlFb_">
+                  <node concept="2OqwBi" id="4KALGUEh0cc" role="2Oq$k0">
+                    <node concept="3A2sRY" id="4KALGUEh0cd" role="2Oq$k0">
                       <ref role="3A2yKK" node="3dV5CmlM9jX" resolve="lam" />
                     </node>
-                    <node concept="3TrEf2" id="2mKpIXwNDxu" role="2OqNvi">
+                    <node concept="3TrEf2" id="4KALGUEh0ce" role="2OqNvi">
                       <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQg" resolve="binding" />
                     </node>
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxv" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0cf" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQj" resolve="var" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="3dV5CmlMb2U" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0cg" role="3AunhB">
                 <ref role="a7OzE" node="3dV5CmlM9W_" resolve="A" />
               </node>
             </node>
           </node>
           <node concept="3I6s7M" id="Cn$NxdZfcB" role="3I6sU7">
-            <node concept="3XxkQB" id="3dV5CmlMb30" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDye" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDyb" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDyc" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0bD" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0b$" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0b_" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0bA" role="2Oq$k0">
                     <ref role="3A2yKK" node="3dV5CmlM9jX" resolve="lam" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDyd" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0bB" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQl" resolve="expr" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="3dV5CmlMbpc" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0bC" role="3AunhB">
                 <ref role="a7OzE" node="3dV5CmlM9X4" resolve="R" />
               </node>
             </node>
@@ -952,35 +970,37 @@
         <property role="3ArMco" value="true" />
         <node concept="3I6sU6" id="WBEjvSTmqr" role="3Ip0Jz">
           <node concept="3I6s7M" id="WBEjvSTmqs" role="3I6sU7">
-            <node concept="3XxkQB" id="44a9n8ErXaL" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxU" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxR" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDxS" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0c9" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0c4" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0c5" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0c6" role="2Oq$k0">
                     <ref role="3A2yKK" node="44a9n8ErWrh" resolve="app" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxT" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0c7" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGPL" resolve="fun" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="44a9n8ErXJ7" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0c8" role="3AunhB">
                 <ref role="a7OzE" node="44a9n8ErWry" resolve="F" />
               </node>
             </node>
           </node>
           <node concept="3I6s7M" id="WBEjvSTmqt" role="3I6sU7">
-            <node concept="3XxkQB" id="44a9n8ErXJd" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxQ" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxN" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDxO" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0b1" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0aW" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0aX" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0aY" role="2Oq$k0">
                     <ref role="3A2yKK" node="44a9n8ErWrh" resolve="app" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxP" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0aZ" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGPX" resolve="arg" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="44a9n8ErY1E" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0b0" role="3AunhB">
                 <ref role="a7OzE" node="44a9n8ErWrT" resolve="A" />
               </node>
             </node>
@@ -1054,13 +1074,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="WBEjvSTmlM" role="3I6sU7">
-            <node concept="3XxkQB" id="44a9n8Es2FU" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDy6" role="3XxmmS">
-                <node concept="3A2sRY" id="2mKpIXwNDy5" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0b9" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0b6" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0b7" role="3BlFb_">
                   <ref role="3A2yKK" node="44a9n8ErWrh" resolve="app" />
                 </node>
               </node>
-              <node concept="a7P8L" id="44a9n8Es2GE" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0b8" role="3AunhB">
                 <ref role="a7OzE" node="44a9n8Es2Aj" resolve="FR" />
               </node>
             </node>
@@ -1141,52 +1162,55 @@
         <property role="3ArMco" value="true" />
         <node concept="3I6sU6" id="6_p$mL23fz$" role="3Ip0Jz">
           <node concept="3I6s7M" id="6_p$mL23gmk" role="3I6sU7">
-            <node concept="3XxkQB" id="6_p$mL23gmg" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxq" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxn" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDxo" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0bz" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0bu" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0bv" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0bw" role="2Oq$k0">
                     <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxp" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0bx" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:6_p$mL233YL" resolve="cond" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="6_p$mL23gnn" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0by" role="3AunhB">
                 <ref role="a7OzE" node="6_p$mL23gmD" resolve="C" />
               </node>
             </node>
           </node>
           <node concept="3I6s7M" id="6_p$mL23gnQ" role="3I6sU7">
-            <node concept="3XxkQB" id="6_p$mL23gnI" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDx$" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxx" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDxy" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0aH" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0aC" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0aD" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0aE" role="2Oq$k0">
                     <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxz" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0aF" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:6_p$mL233YR" resolve="pos" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="6_p$mL23hBJ" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0aG" role="3AunhB">
                 <ref role="a7OzE" node="6_p$mL23gmM" resolve="P" />
               </node>
             </node>
           </node>
           <node concept="3I6s7M" id="6_p$mL23hCc" role="3I6sU7">
-            <node concept="3XxkQB" id="6_p$mL23hC4" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxY" role="3XxmmS">
-                <node concept="2OqwBi" id="2mKpIXwNDxV" role="3BlFb_">
-                  <node concept="3A2sRY" id="2mKpIXwNDxW" role="2Oq$k0">
+            <node concept="3Aqt3T" id="4KALGUEh0aN" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0aI" role="3AunhB">
+                <node concept="2OqwBi" id="4KALGUEh0aJ" role="3BlFb_">
+                  <node concept="3A2sRY" id="4KALGUEh0aK" role="2Oq$k0">
                     <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                   </node>
-                  <node concept="3TrEf2" id="2mKpIXwNDxX" role="2OqNvi">
+                  <node concept="3TrEf2" id="4KALGUEh0aL" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:6_p$mL233YU" resolve="neg" />
                   </node>
                 </node>
               </node>
-              <node concept="a7P8L" id="6_p$mL23i1_" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0aM" role="3AunhB">
                 <ref role="a7OzE" node="6_p$mL23gn7" resolve="N" />
               </node>
             </node>
@@ -1222,13 +1246,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="6_p$mL23i1M" role="3I6sU7">
-            <node concept="3XxkQB" id="6_p$mL23i1I" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDyg" role="3XxmmS">
-                <node concept="3A2sRY" id="2mKpIXwNDyf" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0b5" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0b2" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0b3" role="3BlFb_">
                   <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                 </node>
               </node>
-              <node concept="a7P8L" id="6XR$k9E0joI" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0b4" role="3AunhB">
                 <ref role="a7OzE" node="6_p$mL23gmM" resolve="P" />
               </node>
             </node>
@@ -1329,13 +1354,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="1YCbHn1AKBE" role="3I6sU7">
-            <node concept="3XxkQB" id="1YCbHn1AKBA" role="3I6s78">
-              <node concept="3BlFb$" id="2mKpIXwNDxG" role="3XxmmS">
-                <node concept="3A2sRY" id="2mKpIXwNDxF" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0bj" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0bg" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0bh" role="3BlFb_">
                   <ref role="3A2yKK" node="1YCbHn1AJ$P" resolve="fix" />
                 </node>
               </node>
-              <node concept="a7P8L" id="1YCbHn1AQr7" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0bi" role="3AunhB">
                 <ref role="a7OzE" node="1YCbHn1AQkt" resolve="F" />
               </node>
             </node>
@@ -1721,13 +1747,14 @@
             </node>
           </node>
           <node concept="3I6s7M" id="PoGdiA6hZC" role="3I6sU7">
-            <node concept="3XxkQB" id="PoGdiA6hZw" role="3I6s78">
-              <node concept="3BlFb$" id="PoGdiA6hZy" role="3XxmmS">
-                <node concept="3A2sRY" id="PoGdiA6hZN" role="3BlFb_">
+            <node concept="3Aqt3T" id="4KALGUEh0bn" role="3I6s78">
+              <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+              <node concept="3BlFb$" id="4KALGUEh0bk" role="3AunhB">
+                <node concept="3A2sRY" id="4KALGUEh0bl" role="3BlFb_">
                   <ref role="3A2yKK" node="4dPZ2m2jBj9" resolve="tpbl" />
                 </node>
               </node>
-              <node concept="a7P8L" id="PoGdiA6hZV" role="3Xxm5W">
+              <node concept="a7P8L" id="4KALGUEh0bm" role="3AunhB">
                 <ref role="a7OzE" node="4dPZ2m2jBjz" resolve="Type" />
               </node>
             </node>
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
index d1e2fae2..dea9ff54 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
@@ -30,6 +30,7 @@
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" 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:942985d5-7bcf-46ee-8b79-7b662eaebb4e:jetbrains.mps.dataform" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />