diff --git a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl b/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
index 98460c5a..6f3d60a0 100644
--- a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
+++ b/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
@@ -33,7 +33,7 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
         <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -48,7 +48,7 @@
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
         <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
       </languageVersions>
@@ -93,12 +93,13 @@
     <usedDevKit>508c56cf-0851-4930-8aac-ed733da47058(jetbrains.mps.execution.devkit)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="fbc14279-5e2a-4c87-a5d1-5f7061e6c456" fqName="jetbrains.mps.debugger.api.lang" version="0" />
@@ -121,7 +122,7 @@
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" fqName="jetbrains.mps.lang.textGen" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
diff --git a/languages/jetbrains.mps.jchr/languageModels/structure.mps b/languages/jetbrains.mps.jchr/languageModels/structure.mps
index b1b4aa45..c3c6f8e9 100644
--- a/languages/jetbrains.mps.jchr/languageModels/structure.mps
+++ b/languages/jetbrains.mps.jchr/languageModels/structure.mps
@@ -2,8 +2,8 @@
 <model ref="r:f36c95e5-e428-4945-91ae-1005e20c7971(jetbrains.mps.jchr.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -18,6 +18,7 @@
         <property id="4628067390765956807" name="final" index="R5$K2" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
@@ -53,6 +54,7 @@
     <property role="TrG5h" value="Handler" />
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="handler" />
+    <property role="1pbfSe" value="210745570" />
     <ref role="1TJDcQ" to="tpee:fz12cDA" resolve="ClassConcept" />
     <node concept="1TJgyi" id="5lJXKmiM$" role="1TKVEl">
       <property role="TrG5h" value="classname" />
@@ -89,6 +91,7 @@
   <node concept="1TIwiD" id="pmDhvH6uQ2">
     <property role="TrG5h" value="UserConstraint" />
     <property role="3GE5qa" value="handler.constraints" />
+    <property role="1pbfSe" value="210726247" />
     <ref role="1TJDcQ" node="5dz6b540Jzm" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="pmDhvH6MRr" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -108,6 +111,7 @@
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="210692941" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="pmDhvH7GDW" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -131,6 +135,7 @@
     <property role="34LRSv" value="==&gt;" />
     <property role="R4oN_" value="propagation rule" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="210690862" />
     <ref role="1TJDcQ" node="pmDhvH6AYs" resolve="Rule" />
     <node concept="1TJgyj" id="pmDhvH7EB6" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -144,6 +149,7 @@
     <property role="34LRSv" value="&lt;=&gt;" />
     <property role="R4oN_" value="simplification rule" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="210690852" />
     <ref role="1TJDcQ" node="pmDhvH6AYs" resolve="Rule" />
     <node concept="1TJgyj" id="pmDhvH7GEp" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -157,6 +163,7 @@
     <property role="34LRSv" value="&lt;=&gt;" />
     <property role="R4oN_" value="simpagation rule" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="210690843" />
     <ref role="1TJDcQ" node="pmDhvH6AYs" resolve="Rule" />
     <node concept="1TJgyj" id="pmDhvH7GFm" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -174,6 +181,7 @@
   <node concept="1TIwiD" id="pmDhvH6BD8">
     <property role="TrG5h" value="LogicVariable" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="210690209" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="PrWs8" id="pmDhvH6MQ7" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
@@ -185,6 +193,7 @@
   <node concept="1TIwiD" id="pmDhvH6MQk">
     <property role="TrG5h" value="ConstraintDeclaration" />
     <property role="3GE5qa" value="handler" />
+    <property role="1pbfSe" value="210644309" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="pmDhvH6MQJ" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -199,6 +208,7 @@
   <node concept="1TIwiD" id="pmDhvH7E_m">
     <property role="TrG5h" value="Head" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="210416019" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="pmDhvH7E_n" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -210,6 +220,7 @@
   <node concept="1TIwiD" id="pmDhvH7EBt">
     <property role="TrG5h" value="Body" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="210415884" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="pmDhvH7EBu" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -221,6 +232,7 @@
   <node concept="1TIwiD" id="pmDhvH7ECa">
     <property role="TrG5h" value="Guard" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="210415839" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="pmDhvH7GBk" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -232,6 +244,7 @@
   <node concept="1TIwiD" id="6SkxsMzH1tK">
     <property role="TrG5h" value="SolverDeclaration" />
     <property role="3GE5qa" value="handler" />
+    <property role="1pbfSe" value="298360124" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6SkxsMzH1PB" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -243,6 +256,7 @@
   <node concept="1TIwiD" id="6SkxsMzMUMd">
     <property role="TrG5h" value="BuiltinConstraint" />
     <property role="3GE5qa" value="handler.constraints" />
+    <property role="1pbfSe" value="299905625" />
     <ref role="1TJDcQ" node="5dz6b540Jzm" resolve="AbstractConstraint" />
     <node concept="1TJgyi" id="6SkxsMzN4ze" role="1TKVEl">
       <property role="TrG5h" value="index" />
@@ -264,6 +278,7 @@
   <node concept="1TIwiD" id="6SkxsM$4Idg">
     <property role="TrG5h" value="LocalDeclaration" />
     <property role="3GE5qa" value="handler.rules" />
+    <property role="1pbfSe" value="304572700" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6SkxsM$4Kd4" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -281,6 +296,7 @@
   <node concept="1TIwiD" id="35Lj3Tj7dO2">
     <property role="TrG5h" value="InfixBuitinConstraint" />
     <property role="3GE5qa" value="handler.constraints" />
+    <property role="1pbfSe" value="2071058112" />
     <ref role="1TJDcQ" node="5dz6b540Jzm" resolve="AbstractConstraint" />
     <node concept="1TJgyi" id="35Lj3Tj7nqC" role="1TKVEl">
       <property role="TrG5h" value="index" />
@@ -308,6 +324,7 @@
   <node concept="1TIwiD" id="5lJXKamzq">
     <property role="TrG5h" value="HandlerType" />
     <property role="3GE5qa" value="handlerType" />
+    <property role="1pbfSe" value="1882111961" />
     <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
     <node concept="1TJgyj" id="5lJXKb74G" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -321,6 +338,7 @@
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="handlerType.operations" />
+    <property role="1pbfSe" value="1882117594" />
     <ref role="1TJDcQ" node="5lJXKhI_g" resolve="ConstraintOperation" />
     <node concept="1TJgyj" id="5lJXKd_HC" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -333,6 +351,7 @@
     <property role="TrG5h" value="HandlerCreator" />
     <property role="34LRSv" value="handler" />
     <property role="3GE5qa" value="handlerType.operations" />
+    <property role="1pbfSe" value="1882182656" />
     <ref role="1TJDcQ" to="tpee:gEShaYr" resolve="AbstractCreator" />
     <node concept="1TJgyj" id="5lJXKlBV_" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -354,12 +373,14 @@
     <property role="TrG5h" value="TellConstraintOperation" />
     <property role="34LRSv" value="tell" />
     <property role="3GE5qa" value="handlerType.operations" />
+    <property role="1pbfSe" value="1883030434" />
     <ref role="1TJDcQ" node="5lJXKanVr" resolve="ParameterizedConstraintOperation" />
   </node>
   <node concept="1TIwiD" id="5lJXKhB3b">
     <property role="TrG5h" value="AllConstraintsOperation" />
     <property role="34LRSv" value="all" />
     <property role="3GE5qa" value="handlerType.operations" />
+    <property role="1pbfSe" value="1884014538" />
     <ref role="1TJDcQ" node="5lJXKhI_g" resolve="ConstraintOperation" />
   </node>
   <node concept="1TIwiD" id="5lJXKhI_g">
@@ -367,6 +388,7 @@
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="handlerType.operations" />
+    <property role="1pbfSe" value="1884045391" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="5lJXKhIHH" role="PzmwI">
       <ref role="PrY4T" to="tpee:hqOqG0K" resolve="IOperation" />
@@ -394,18 +416,21 @@
     <property role="TrG5h" value="AbstractConstraint" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="1754918521" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
   </node>
   <node concept="1TIwiD" id="2q_78a8P9a7">
     <property role="3GE5qa" value="handler.rules" />
     <property role="TrG5h" value="WildcardLogicVariable" />
     <property role="34LRSv" value="_" />
+    <property role="1pbfSe" value="1350979831" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="asaX9" id="6r6omRlnrom" role="lGtFl" />
   </node>
   <node concept="1TIwiD" id="4EfgX2EshHC">
     <property role="3GE5qa" value="handler.constraints" />
     <property role="TrG5h" value="StaticMethodCallConstraint" />
+    <property role="1pbfSe" value="184525000" />
     <ref role="1TJDcQ" node="5dz6b540Jzm" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="hHp56YpiWP" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
diff --git a/languages/jetbrains.mps.jchr/languageModels/textGen.mps b/languages/jetbrains.mps.jchr/languageModels/textGen.mps
index e53ff46b..6545b0ef 100644
--- a/languages/jetbrains.mps.jchr/languageModels/textGen.mps
+++ b/languages/jetbrains.mps.jchr/languageModels/textGen.mps
@@ -24,7 +24,6 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <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" />
@@ -38,11 +37,7 @@
       <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="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -69,6 +64,7 @@
       <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="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -102,12 +98,14 @@
         <property id="1237305576108" name="value" index="lacIc" />
       </concept>
       <concept id="1237306079178" name="jetbrains.mps.lang.textGen.structure.AppendOperation" flags="nn" index="lc7rE">
+        <reference id="3135747254706172356" name="textArea" index="2dFDx7" />
         <child id="1237306115446" name="part" index="lcghm" />
       </concept>
       <concept id="1233670071145" name="jetbrains.mps.lang.textGen.structure.ConceptTextGenDeclaration" flags="ig" index="WtQ9Q">
         <reference id="1233670257997" name="conceptDeclaration" index="WuzLi" />
         <child id="1233749296504" name="textGenBlock" index="11c4hB" />
         <child id="7991274449437422201" name="extension" index="33IsuW" />
+        <child id="3147320813467893228" name="layout" index="3znZDQ" />
       </concept>
       <concept id="1233748055915" name="jetbrains.mps.lang.textGen.structure.NodeParameter" flags="nn" index="117lpO" />
       <concept id="1233749247888" name="jetbrains.mps.lang.textGen.structure.GenerateTextDeclaration" flags="in" index="11bSqf" />
@@ -124,7 +122,11 @@
       <concept id="1236188139846" name="jetbrains.mps.lang.textGen.structure.WithIndentOperation" flags="nn" index="3izx1p">
         <child id="1236188238861" name="list" index="3izTki" />
       </concept>
-      <concept id="1234351783410" name="jetbrains.mps.lang.textGen.structure.BufferParameter" flags="nn" index="1_6nNH" />
+      <concept id="3147320813467893194" name="jetbrains.mps.lang.textGen.structure.LayoutPart" flags="ng" index="3znZDg" />
+      <concept id="3147320813467893193" name="jetbrains.mps.lang.textGen.structure.TextUnitLayout" flags="ng" index="3znZDj">
+        <reference id="3147320813467893197" name="active" index="3znZDn" />
+        <child id="3147320813467893195" name="parts" index="3znZDh" />
+      </concept>
       <concept id="1234529062040" name="jetbrains.mps.lang.textGen.structure.UtilityMethodCall" flags="nn" index="1JECQ7">
         <reference id="1234529163244" name="function" index="1JF1rN" />
         <child id="1234529174917" name="parameter" index="1JF4iq" />
@@ -238,6 +240,21 @@
         </node>
       </node>
     </node>
+    <node concept="3znZDj" id="78ax$kliRMZ" role="3znZDQ">
+      <ref role="3znZDn" node="78ax$kliRRk" resolve="BODY" />
+      <node concept="3znZDg" id="78ax$kliRN0" role="3znZDh">
+        <property role="TrG5h" value="HEADER" />
+      </node>
+      <node concept="3znZDg" id="78ax$kliRRd" role="3znZDh">
+        <property role="TrG5h" value="IMPORTS" />
+      </node>
+      <node concept="3znZDg" id="78ax$kliRRg" role="3znZDh">
+        <property role="TrG5h" value="SEPARATOR" />
+      </node>
+      <node concept="3znZDg" id="78ax$kliRRk" role="3znZDh">
+        <property role="TrG5h" value="BODY" />
+      </node>
+    </node>
   </node>
   <node concept="1bsvg0" id="1kcpyXxAXb9">
     <property role="TrG5h" value="JCHRTextGen" />
@@ -246,70 +263,32 @@
       <property role="TrG5h" value="fileHeader" />
       <node concept="3cqZAl" id="1kcpyXxBknd" role="3clF45" />
       <node concept="3clFbS" id="1kcpyXxBkne" role="3clF47">
-        <node concept="3cpWs8" id="1kcpyXxFI5A" role="3cqZAp">
-          <node concept="3cpWsn" id="1kcpyXxFI5B" role="3cpWs9">
-            <property role="TrG5h" value="currPartId" />
-            <node concept="10Oyi0" id="1kcpyXxFI5C" role="1tU5fm" />
-            <node concept="2OqwBi" id="1kcpyXxFI5D" role="33vP2m">
-              <node concept="1_6nNH" id="1kcpyXxFI5E" role="2Oq$k0" />
-              <node concept="liA8E" id="1kcpyXxFI5F" role="2OqNvi">
-                <ref role="37wK5l" to="yy4t:~TextGenBuffer.selectPart(int):int" resolve="selectPart" />
-                <node concept="10M0yZ" id="1kcpyXxFI5G" role="37wK5m">
-                  <ref role="1PxDUh" to="yy4t:~TextGenBuffer" resolve="TextGenBuffer" />
-                  <ref role="3cqZAo" to="yy4t:~TextGenBuffer.TOP" resolve="TOP" />
+        <node concept="lc7rE" id="i0uAwxl" role="3cqZAp">
+          <ref role="2dFDx7" to="dmyu:3DQwDJfhrW5" resolve="HEADER" />
+          <node concept="l9hG8" id="i0uAwxn" role="lcghm">
+            <node concept="3cpWs3" id="hXZXtBa" role="lb14g">
+              <node concept="Xl_RD" id="hXZXtOa" role="3uHU7w">
+                <property role="Xl_RC" value=";" />
+              </node>
+              <node concept="3cpWs3" id="hXZXqvR" role="3uHU7B">
+                <node concept="Xl_RD" id="hXZXoDF" role="3uHU7B">
+                  <property role="Xl_RC" value="package " />
+                </node>
+                <node concept="1JECQ7" id="hXZXsvn" role="3uHU7w">
+                  <ref role="1JF1rN" to="dmyu:hXZAS9u" resolve="getPackageName" />
+                  <node concept="37vLTw" id="78ax$klglRM" role="1JF4iq">
+                    <ref role="3cqZAo" node="1kcpyXxBnYb" resolve="handler" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="l8MVK" id="i0uAwxo" role="lcghm" />
+          <node concept="l8MVK" id="i0uAwxC" role="lcghm" />
         </node>
-        <node concept="3clFbH" id="1kcpyXxFI5H" role="3cqZAp" />
-        <node concept="3clFbF" id="1kcpyXxFI5I" role="3cqZAp">
-          <node concept="2OqwBi" id="1kcpyXxFI5J" role="3clFbG">
-            <node concept="1_6nNH" id="1kcpyXxFI5K" role="2Oq$k0" />
-            <node concept="liA8E" id="1kcpyXxFI5L" role="2OqNvi">
-              <ref role="37wK5l" to="yy4t:~TextGenBuffer.append(java.lang.String):void" resolve="append" />
-              <node concept="Xl_RD" id="1kcpyXxFIob" role="37wK5m">
-                <property role="Xl_RC" value="package " />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1kcpyXxFI5U" role="3cqZAp">
-          <node concept="2OqwBi" id="1kcpyXxFI5V" role="3clFbG">
-            <node concept="1_6nNH" id="1kcpyXxFI5W" role="2Oq$k0" />
-            <node concept="liA8E" id="1kcpyXxFI5X" role="2OqNvi">
-              <ref role="37wK5l" to="yy4t:~TextGenBuffer.append(java.lang.String):void" resolve="append" />
-              <node concept="1JECQ7" id="1kcpyXxFIOw" role="37wK5m">
-                <ref role="1JF1rN" to="dmyu:hXZAS9u" resolve="getPackageName" />
-                <node concept="37vLTw" id="1kcpyXxFIOx" role="1JF4iq">
-                  <ref role="3cqZAo" node="1kcpyXxBnYb" resolve="handler" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1kcpyXxFI5Z" role="3cqZAp">
-          <node concept="2OqwBi" id="1kcpyXxFI60" role="3clFbG">
-            <node concept="1_6nNH" id="1kcpyXxFI61" role="2Oq$k0" />
-            <node concept="liA8E" id="1kcpyXxFI62" role="2OqNvi">
-              <ref role="37wK5l" to="yy4t:~TextGenBuffer.append(java.lang.String):void" resolve="append" />
-              <node concept="Xl_RD" id="1kcpyXxFI63" role="37wK5m">
-                <property role="Xl_RC" value=";\n" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1kcpyXxFI64" role="3cqZAp" />
-        <node concept="3clFbF" id="1kcpyXxFI65" role="3cqZAp">
-          <node concept="2OqwBi" id="1kcpyXxFI66" role="3clFbG">
-            <node concept="1_6nNH" id="1kcpyXxFI67" role="2Oq$k0" />
-            <node concept="liA8E" id="1kcpyXxFI68" role="2OqNvi">
-              <ref role="37wK5l" to="yy4t:~TextGenBuffer.selectPart(int):int" resolve="selectPart" />
-              <node concept="37vLTw" id="1kcpyXxFI69" role="37wK5m">
-                <ref role="3cqZAo" node="1kcpyXxFI5B" resolve="currPartId" />
-              </node>
-            </node>
-          </node>
+        <node concept="lc7rE" id="v0458vuV4P" role="3cqZAp">
+          <ref role="2dFDx7" to="dmyu:6iQNTbBmlDm" resolve="SEPARATOR" />
+          <node concept="l8MVK" id="v0458vuV5b" role="lcghm" />
         </node>
       </node>
       <node concept="37vLTG" id="1kcpyXxBnYb" role="3clF46">
diff --git a/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd b/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
index fdadb3af..ea9e6758 100644
--- a/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
+++ b/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
@@ -26,7 +26,7 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
diff --git a/languages/jetbrains.mps.jchr/runtime/models/compiler/codeGeneration.mps b/languages/jetbrains.mps.jchr/runtime/models/compiler/codeGeneration.mps
index 883c421e..bb158224 100644
--- a/languages/jetbrains.mps.jchr/runtime/models/compiler/codeGeneration.mps
+++ b/languages/jetbrains.mps.jchr/runtime/models/compiler/codeGeneration.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/languages/jetbrains.mps.jchr/runtime/models/jetbrains/mps/jchr/patch.mps b/languages/jetbrains.mps.jchr/runtime/models/jetbrains/mps/jchr/patch.mps
index 2d41f0e0..72d8c112 100644
--- a/languages/jetbrains.mps.jchr/runtime/models/jetbrains/mps/jchr/patch.mps
+++ b/languages/jetbrains.mps.jchr/runtime/models/jetbrains/mps/jchr/patch.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/languages/jetbrains.mps.jchr/runtime/models/runtime/history.mps b/languages/jetbrains.mps.jchr/runtime/models/runtime/history.mps
index aa71d587..0b801512 100644
--- a/languages/jetbrains.mps.jchr/runtime/models/runtime/history.mps
+++ b/languages/jetbrains.mps.jchr/runtime/models/runtime/history.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd b/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
index b610f2ed..c2e4188f 100644
--- a/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
+++ b/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
@@ -20,7 +20,7 @@
     <usedLanguage>ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
     <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
diff --git a/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps b/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
index 0e9686a8..efa6f2bf 100644
--- a/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
+++ b/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
@@ -5,7 +5,7 @@
     <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="-1" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="562q" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:util(jetbrains.mps.jchr.runtime/)" />
diff --git a/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd b/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
index 7be50ec0..ff11cacb 100644
--- a/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
+++ b/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
@@ -19,7 +19,7 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
diff --git a/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps b/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
index 2b5cb091..1d1c8f6f 100644
--- a/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
+++ b/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 1b959927..6a9f8f4a 100644
--- a/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -38,7 +38,7 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
         <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -52,7 +52,7 @@
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
         <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
         <language id="35320f26-77cb-4c55-be9f-a97a27770af1" fqName="jetbrains.mps.logic" version="0" />
@@ -85,13 +85,14 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" fqName="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" fqName="jetbrains.mps.baseLanguage.regexp" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -107,7 +108,7 @@
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" fqName="jetbrains.mps.logic" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
index e11d9291..6b843d83 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
@@ -3,11 +3,11 @@
   <persistence version="9" />
   <languages>
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="0" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="0" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 70eb1953..7d5d2aa0 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -2,8 +2,8 @@
 <model ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -34,6 +34,7 @@
         <property id="4628067390765956807" name="final" index="R5$K2" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
@@ -71,6 +72,7 @@
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="rule" />
     <property role="34LRSv" value="handler" />
+    <property role="1pbfSe" value="923793682" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6p0DfM0bRQj" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -86,6 +88,7 @@
     <property role="TrG5h" value="NewTypeConstraint" />
     <property role="3GE5qa" value="constraint.typespecific" />
     <property role="34LRSv" value="new type" />
+    <property role="1pbfSe" value="923793061" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="6p0DfM0gdsG" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -118,6 +121,7 @@
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="rule" />
     <property role="34LRSv" value="template" />
+    <property role="1pbfSe" value="923793058" />
     <ref role="1TJDcQ" node="4EfgX2ET3GH" resolve="AbstractRule" />
     <node concept="1TJgyj" id="3KXGt7WSNcl" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -165,6 +169,7 @@
     <property role="3GE5qa" value="rule.component" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="429336513" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6p0DfM0a5m9" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -185,6 +190,7 @@
   <node concept="1TIwiD" id="6p0DfM0a3gA">
     <property role="TrG5h" value="Head" />
     <property role="3GE5qa" value="rule.component" />
+    <property role="1pbfSe" value="429336286" />
     <ref role="1TJDcQ" node="6p0DfM0a3d3" resolve="RuleComponent" />
     <node concept="1TJgyi" id="6p0DfM0bSv$" role="1TKVEl">
       <property role="TrG5h" value="keep" />
@@ -194,15 +200,18 @@
   <node concept="1TIwiD" id="6p0DfM0a3Qe">
     <property role="TrG5h" value="Guard" />
     <property role="3GE5qa" value="rule.component" />
+    <property role="1pbfSe" value="429333878" />
     <ref role="1TJDcQ" node="6p0DfM0a3d3" resolve="RuleComponent" />
   </node>
   <node concept="1TIwiD" id="6p0DfM0a3TO">
     <property role="TrG5h" value="Body" />
     <property role="3GE5qa" value="rule.component" />
+    <property role="1pbfSe" value="429333648" />
     <ref role="1TJDcQ" node="6p0DfM0a3d3" resolve="RuleComponent" />
   </node>
   <node concept="1TIwiD" id="6p0DfM0a6KG">
     <property role="TrG5h" value="EmitConstraintStatement" />
+    <property role="1pbfSe" value="429321944" />
     <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
     <node concept="1TJgyj" id="6p0DfM0ajKO" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -216,11 +225,13 @@
     <property role="3GE5qa" value="constraint" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="429268574" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="6p0DfM0ang5">
     <property role="3GE5qa" value="constraint" />
     <property role="TrG5h" value="UserConstraint" />
+    <property role="1pbfSe" value="429254399" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="6p0DfM0aywA" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -240,6 +251,7 @@
     <property role="TrG5h" value="Solver" />
     <property role="19KtqR" value="true" />
     <property role="34LRSv" value="solver" />
+    <property role="1pbfSe" value="429234237" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6p0DfM0asSt" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -254,6 +266,7 @@
   <node concept="1TIwiD" id="6p0DfM0asBO">
     <property role="3GE5qa" value="constraint.template" />
     <property role="TrG5h" value="ConstraintDeclaration" />
+    <property role="1pbfSe" value="429232400" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="6p0DfM0azKj" role="1TKVEl">
       <property role="TrG5h" value="arity" />
@@ -278,6 +291,7 @@
   <node concept="1TIwiD" id="6p0DfM0ia8T">
     <property role="3GE5qa" value="rule.input" />
     <property role="TrG5h" value="RuleInputDeclaration" />
+    <property role="1pbfSe" value="427210955" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="6p0DfM0iqhH" role="PzmwI">
       <ref role="PrY4T" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
@@ -292,6 +306,7 @@
   <node concept="1TIwiD" id="6p0DfM0im$2">
     <property role="3GE5qa" value="rule.input" />
     <property role="TrG5h" value="RuleInputReference" />
+    <property role="1pbfSe" value="427160066" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="6p0DfM0iCzc" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -303,6 +318,7 @@
   <node concept="1TIwiD" id="6p0DfM0oBcI">
     <property role="3GE5qa" value="constraint.typespecific" />
     <property role="TrG5h" value="AssignConstraint" />
+    <property role="1pbfSe" value="425519062" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="6p0DfM0oEeG" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -319,6 +335,7 @@
   </node>
   <node concept="1TIwiD" id="6p0DfM0pKSO">
     <property role="TrG5h" value="LogicalExpression" />
+    <property role="1pbfSe" value="425217232" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="6p0DfM0pQge" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -331,6 +348,7 @@
     <property role="3GE5qa" value="constraint.typespecific" />
     <property role="TrG5h" value="TypeofConstraint" />
     <property role="34LRSv" value="typeof" />
+    <property role="1pbfSe" value="25521719" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="2E5lcNn035O" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -349,6 +367,7 @@
     <property role="3GE5qa" value="constraint.variable" />
     <property role="TrG5h" value="ParameterDeclarationStatement" />
     <property role="34LRSv" value="parameter" />
+    <property role="1pbfSe" value="26909330" />
     <ref role="1TJDcQ" node="2E5lcNn8iYG" resolve="LogicVariableDeclarationStatement" />
     <node concept="PrWs8" id="7ksQUDZoqiE" role="PzmwI">
       <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
@@ -358,6 +377,7 @@
     <property role="3GE5qa" value="constraint.variable" />
     <property role="TrG5h" value="LocalDeclarationStatement" />
     <property role="34LRSv" value="local" />
+    <property role="1pbfSe" value="27064206" />
     <ref role="1TJDcQ" node="2E5lcNn8iYG" resolve="LogicVariableDeclarationStatement" />
     <node concept="PrWs8" id="7ksQUDZoqiC" role="PzmwI">
       <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
@@ -368,6 +388,7 @@
     <property role="TrG5h" value="LogicVariableDeclarationStatement" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="27690104" />
     <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
     <node concept="PrWs8" id="75vUFrS_9Sh" role="PzmwI">
       <ref role="PrY4T" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
@@ -376,6 +397,7 @@
   <node concept="1TIwiD" id="4laj_h9P4cy">
     <property role="3GE5qa" value="rule.code" />
     <property role="TrG5h" value="Condition" />
+    <property role="1pbfSe" value="1893822090" />
     <ref role="1TJDcQ" node="tIwzd1_CMa" resolve="RuleCodeBlock" />
     <node concept="PrWs8" id="6ntBQ9KFIud" role="PzmwI">
       <ref role="PrY4T" to="tpee:i0zv2NF" resolve="IContainsStatementList" />
@@ -387,6 +409,7 @@
   <node concept="1TIwiD" id="5MHpiylEsuT">
     <property role="TrG5h" value="RuleParameterDeclaration" />
     <property role="3GE5qa" value="rule.code.parameter" />
+    <property role="1pbfSe" value="229167903" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5MHpiylFYj$" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -409,6 +432,7 @@
     <property role="TrG5h" value="RuleParameterBlock" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="228730546" />
     <ref role="1TJDcQ" node="tIwzd1_CMa" resolve="RuleCodeBlock" />
     <node concept="PrWs8" id="5MHpiylGFuy" role="PzmwI">
       <ref role="PrY4T" to="tpee:i0zv2NF" resolve="IContainsStatementList" />
@@ -426,6 +450,7 @@
   <node concept="1TIwiD" id="5MHpiylKSq8">
     <property role="3GE5qa" value="rule.code.parameter" />
     <property role="TrG5h" value="RuleParameterReference" />
+    <property role="1pbfSe" value="227480656" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="5MHpiylKVev" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -438,6 +463,7 @@
     <property role="3GE5qa" value="constraint" />
     <property role="TrG5h" value="JavaConstraint" />
     <property role="34LRSv" value="java" />
+    <property role="1pbfSe" value="1352647430" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyi" id="2q_78a8IMIA" role="1TKVEl">
       <property role="TrG5h" value="template" />
@@ -448,6 +474,7 @@
   <node concept="1TIwiD" id="5NuEpF1if3e">
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="RuleInputSpecification" />
+    <property role="1pbfSe" value="505911912" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5NuEpF1iiA0" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -467,6 +494,7 @@
     <property role="TrG5h" value="LogicVariableConstraint" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="1258885072" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="60B5zVESBfb" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -478,22 +506,26 @@
     <property role="TrG5h" value="IsfreeVariableConstraint" />
     <property role="3GE5qa" value="constraint.variable" />
     <property role="34LRSv" value="isFree" />
+    <property role="1pbfSe" value="1258918640" />
     <ref role="1TJDcQ" node="60B5zVESvAi" resolve="LogicVariableConstraint" />
   </node>
   <node concept="1TIwiD" id="60B5zVEVSFB">
     <property role="3GE5qa" value="constraint.variable" />
     <property role="TrG5h" value="IsboundVariableConstraint" />
     <property role="34LRSv" value="isBound" />
+    <property role="1pbfSe" value="1259774245" />
     <ref role="1TJDcQ" node="60B5zVESvAi" resolve="LogicVariableConstraint" />
   </node>
   <node concept="1TIwiD" id="1zN1RIkNhnM">
     <property role="3GE5qa" value="rule.code.parameter" />
     <property role="TrG5h" value="IterateParameterBlock" />
+    <property role="1pbfSe" value="1379918483" />
     <ref role="1TJDcQ" node="5MHpiylG7gA" resolve="RuleParameterBlock" />
   </node>
   <node concept="1TIwiD" id="1zN1RIkQtcr">
     <property role="3GE5qa" value="rule.code.parameter" />
     <property role="TrG5h" value="BoundParameterBlock" />
+    <property role="1pbfSe" value="1379083626" />
     <ref role="1TJDcQ" node="5MHpiylG7gA" resolve="RuleParameterBlock" />
   </node>
   <node concept="1TIwiD" id="tIwzd1_CMa">
@@ -501,6 +533,7 @@
     <property role="TrG5h" value="RuleCodeBlock" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="1225068221" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="tIwzd1_VRv" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -518,12 +551,14 @@
   <node concept="1TIwiD" id="tIwzd1EOs6">
     <property role="3GE5qa" value="rule.code" />
     <property role="TrG5h" value="RequiredNodeBlock" />
+    <property role="1pbfSe" value="1226426681" />
     <ref role="1TJDcQ" node="tIwzd1_CMa" resolve="RuleCodeBlock" />
   </node>
   <node concept="1TIwiD" id="4EfgX2EvF4i">
     <property role="3GE5qa" value="constraint" />
     <property role="TrG5h" value="ExpressionConstraint" />
     <property role="34LRSv" value="expression" />
+    <property role="1pbfSe" value="183634718" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="4EfgX2EvGcc" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -537,6 +572,7 @@
     <property role="TrG5h" value="AbstractRule" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="176980227" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6wQEDbCCPyR" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -588,11 +624,13 @@
     <property role="3GE5qa" value="constraint" />
     <property role="TrG5h" value="AssertExpressionConstraint" />
     <property role="34LRSv" value="assert" />
+    <property role="1pbfSe" value="373109824" />
     <ref role="1TJDcQ" node="4EfgX2EvF4i" resolve="ExpressionConstraint" />
   </node>
   <node concept="1TIwiD" id="1CgWc1Tyjkw">
     <property role="TrG5h" value="Comment" />
     <property role="3GE5qa" value="comment" />
+    <property role="1pbfSe" value="1818614304" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="1TJgyj" id="5bC6UNlwzV7" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -613,10 +651,12 @@
   <node concept="PlHQZ" id="1CgWc1Tyjkz">
     <property role="TrG5h" value="ICanBeCommented" />
     <property role="3GE5qa" value="comment" />
+    <property role="1pbfSe" value="1818614301" />
   </node>
   <node concept="1TIwiD" id="1CgWc1TyPXm">
     <property role="3GE5qa" value="constraint.template" />
     <property role="TrG5h" value="ConstraintParameterDeclaration" />
+    <property role="1pbfSe" value="1818472426" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="1CgWc1TyPXw" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
@@ -625,6 +665,7 @@
   <node concept="1TIwiD" id="1pPth$m5o9D">
     <property role="TrG5h" value="TypeTermTemplate" />
     <property role="3GE5qa" value="type" />
+    <property role="1pbfSe" value="747304834" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1pPth$m5oa9" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -638,6 +679,7 @@
     <property role="TrG5h" value="TypeFeature" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="747304862" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="1pPth$m5oa7" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
@@ -647,12 +689,14 @@
     <property role="3GE5qa" value="type.feature" />
     <property role="TrG5h" value="ListTypeFeature" />
     <property role="34LRSv" value="list" />
+    <property role="1pbfSe" value="747304863" />
     <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
   </node>
   <node concept="1TIwiD" id="1pPth$m5oae">
     <property role="3GE5qa" value="type.feature" />
     <property role="TrG5h" value="StringTypeFeature" />
     <property role="34LRSv" value="string" />
+    <property role="1pbfSe" value="747304871" />
     <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
     <node concept="1TJgyi" id="2N2MQGCKV7J" role="1TKVEl">
       <property role="TrG5h" value="value" />
@@ -663,12 +707,14 @@
     <property role="3GE5qa" value="type.feature" />
     <property role="TrG5h" value="ReferenceTypeFeature" />
     <property role="34LRSv" value="reference" />
+    <property role="1pbfSe" value="747304901" />
     <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
   </node>
   <node concept="1TIwiD" id="1pPth$m5oaL">
     <property role="3GE5qa" value="type.feature" />
     <property role="TrG5h" value="ChildTypeFeature" />
     <property role="34LRSv" value="child" />
+    <property role="1pbfSe" value="747304906" />
     <ref role="1TJDcQ" node="1pPth$m5oa5" resolve="TypeFeature" />
   </node>
   <node concept="1TIwiD" id="1pPth$m5B4X">
@@ -676,6 +722,7 @@
     <property role="TrG5h" value="TypeTable" />
     <property role="19KtqR" value="true" />
     <property role="34LRSv" value="type table" />
+    <property role="1pbfSe" value="747365974" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1pPth$m5B4Y" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -690,6 +737,7 @@
   <node concept="1TIwiD" id="1pPth$m5Bbz">
     <property role="3GE5qa" value="type" />
     <property role="TrG5h" value="TypeDeclaration" />
+    <property role="1pbfSe" value="747366396" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1pPth$m5BbA" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -704,6 +752,7 @@
   <node concept="1TIwiD" id="2CEQDIDRX6M">
     <property role="3GE5qa" value="type" />
     <property role="TrG5h" value="TypeTerm" />
+    <property role="1pbfSe" value="737498035" />
     <ref role="1TJDcQ" to="5j4j:6$jH9oLmUCq" resolve="Ast" />
     <node concept="1TJgyj" id="2CEQDIDTdBu" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -719,6 +768,7 @@
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="IncludeFragmentClause" />
     <property role="34LRSv" value="include" />
+    <property role="1pbfSe" value="1358624100" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6wQEDbCL4Fj" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -731,11 +781,13 @@
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="Fragment" />
     <property role="34LRSv" value="fragment" />
+    <property role="1pbfSe" value="1357675223" />
     <ref role="1TJDcQ" node="4EfgX2ET3GH" resolve="AbstractRule" />
   </node>
   <node concept="1TIwiD" id="PB1R3Y7Ed7">
     <property role="3GE5qa" value="constraint.variable" />
     <property role="TrG5h" value="RulePartParameterDeclaration" />
+    <property role="1pbfSe" value="193309367" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="75vUFrS_flD" role="PzmwI">
       <ref role="PrY4T" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
index 0dc989db..de2cbbe2 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
@@ -20,7 +20,7 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
index 98743d94..54ffd535 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
@@ -2,7 +2,7 @@
 <model ref="r:2a1eb048-898c-47a3-863b-36b04c4b9f7c(jetbrains.mps.lang.typesystem2.runtime.rule)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd
index c0d88386..bc176fa6 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd
@@ -13,7 +13,7 @@
     <usedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
index 06482949..824d4526 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
@@ -2,7 +2,7 @@
 <model ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.lang.typesystem2.sample.bounds)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports />
   <registry>
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
index 0652f04a..3a5b5e4b 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
index 2a5d556c..b2190985 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
@@ -2,7 +2,7 @@
 <model ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.lang.typesystem2.sample.simpleGenerics)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
index 8c2fb1c6..5b2c93be 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
@@ -2,7 +2,7 @@
 <model ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.lang.typesystem2.sample.slice)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
index b0199416..9f434217 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
@@ -17,9 +17,10 @@
     <usedLanguage>35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" fqName="jetbrains.mps.logic" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
index 461fad61..8be28970 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
index 50f0af2d..d5e7795a 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
@@ -19,13 +19,14 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
index 02752e10..02f23f4c 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
@@ -23,7 +23,7 @@
     <usedLanguage>df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
     <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
index fccfc3a2..aaeeed6c 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
@@ -5,7 +5,7 @@
     <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
index 960b969a..97552e6d 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
@@ -24,7 +24,7 @@
     <usedLanguage>7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
index e5f62c0d..2b62f99c 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
@@ -6,8 +6,8 @@
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
index 230b531a..16d69de7 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
@@ -26,7 +26,7 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
index 9924e6ef..e2f4efb0 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
@@ -31,13 +31,14 @@
     <usedLanguage>3a13115c-633c-4c5c-bbcc-75c4219e9555(jetbrains.mps.lang.quotation)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
index 26f6eb10..ac547164 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
@@ -11,8 +11,8 @@
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
@@ -214,6 +214,7 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1046929382682558545" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteralType" flags="ig" index="9cv3F" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -6561,10 +6562,10 @@
         <node concept="3cpWs8" id="1zN1RIl8gwS" role="3cqZAp">
           <node concept="3cpWsn" id="1zN1RIl8gwT" role="3cpWs9">
             <property role="TrG5h" value="typeWalker" />
-            <node concept="1ajhzC" id="1zN1RIl8gwU" role="1tU5fm">
-              <node concept="26uTi9" id="1zN1RIl8gwV" role="1ajw0F" />
-              <node concept="3Tqbb2" id="1zN1RIl8gwW" role="1ajw0F" />
-              <node concept="3cqZAl" id="1zN1RIl8gwX" role="1ajl9A" />
+            <node concept="9cv3F" id="3LzT4PMaPHX" role="1tU5fm">
+              <node concept="26uTi9" id="3LzT4PMaPHY" role="1ajw0F" />
+              <node concept="3Tqbb2" id="3LzT4PMaPHZ" role="1ajw0F" />
+              <node concept="3cqZAl" id="3LzT4PMaPI0" role="1ajl9A" />
             </node>
             <node concept="10Nm6u" id="1zN1RIl8gwY" role="33vP2m" />
           </node>
@@ -6819,10 +6820,10 @@
         <node concept="3cpWs8" id="7mm1a3qNU50" role="3cqZAp">
           <node concept="3cpWsn" id="7mm1a3qNU51" role="3cpWs9">
             <property role="TrG5h" value="typeWalker" />
-            <node concept="1ajhzC" id="7mm1a3qNU52" role="1tU5fm">
-              <node concept="26uTi9" id="7mm1a3qNU53" role="1ajw0F" />
-              <node concept="3Tqbb2" id="7mm1a3qNU54" role="1ajw0F" />
-              <node concept="3cqZAl" id="7mm1a3qNU55" role="1ajl9A" />
+            <node concept="9cv3F" id="3LzT4PMaQ49" role="1tU5fm">
+              <node concept="26uTi9" id="3LzT4PMaQ4a" role="1ajw0F" />
+              <node concept="3Tqbb2" id="3LzT4PMaQ4b" role="1ajw0F" />
+              <node concept="3cqZAl" id="3LzT4PMaQ4c" role="1ajl9A" />
             </node>
             <node concept="10Nm6u" id="7mm1a3qNU56" role="33vP2m" />
           </node>
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
index 6295e992..b1eec840 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
@@ -40,7 +40,7 @@
     <usedLanguage>35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -48,6 +48,7 @@
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index 1a6d50d2..0a91ed2a 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -12,8 +12,8 @@
     <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/template/jetbrains.mps.lang.typesystem2.template.msd b/languages/jetbrains.mps.lang.typesystem2/template/jetbrains.mps.lang.typesystem2.template.msd
index 358a2169..96deee41 100644
--- a/languages/jetbrains.mps.lang.typesystem2/template/jetbrains.mps.lang.typesystem2.template.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/template/jetbrains.mps.lang.typesystem2.template.msd
@@ -23,7 +23,7 @@
     <usedLanguage>daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps b/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
index ea98a8f5..2e2618ed 100644
--- a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
@@ -5,8 +5,8 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="nc4n" ref="r:2a1eb048-898c-47a3-863b-36b04c4b9f7c(jetbrains.mps.lang.typesystem2.runtime.rule)" />
@@ -2249,7 +2249,7 @@
     <node concept="3clFb_" id="3x8pcoFtaj1" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="isPostProcess" />
-      <property role="IEkAT" value="true" />
+      <property role="IEkAT" value="false" />
       <node concept="10P_77" id="3x8pcoFtaj2" role="3clF45" />
       <node concept="3Tm1VV" id="3x8pcoFtaj3" role="1B3o_S" />
       <node concept="3clFbS" id="3x8pcoFtaj4" role="3clF47" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/type.mps b/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/type.mps
index d974d9c5..04fa4c23 100644
--- a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/type.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/type.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
diff --git a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 66ee6405..3a155a69 100644
--- a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -30,7 +30,7 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
         <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -43,7 +43,7 @@
         <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
         <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
         <language id="35320f26-77cb-4c55-be9f-a97a27770af1" fqName="jetbrains.mps.logic" version="0" />
@@ -91,12 +91,13 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" fqName="jetbrains.mps.baseLanguage.regexp" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -111,7 +112,7 @@
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" fqName="jetbrains.mps.logic" version="0" />
diff --git a/languages/jetbrains.mps.logic/languageModels/constraints.mps b/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 8ca17828..88fd9af6 100644
--- a/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -148,6 +148,7 @@
       <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1046929382682558545" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteralType" flags="ig" index="9cv3F" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
         <child id="1235747002942" name="parameter" index="2SgHGx" />
@@ -465,9 +466,9 @@
           <node concept="3cpWs8" id="6Ng87FPZcv5" role="3cqZAp">
             <node concept="3cpWsn" id="6Ng87FPZcv6" role="3cpWs9">
               <property role="TrG5h" value="parentScope" />
-              <node concept="1ajhzC" id="6Ng87FPZcv7" role="1tU5fm">
-                <node concept="3Tqbb2" id="6Ng87FPZcv8" role="1ajw0F" />
-                <node concept="3uibUv" id="6Ng87FPZcv9" role="1ajl9A">
+              <node concept="9cv3F" id="3LzT4PMaM2V" role="1tU5fm">
+                <node concept="3Tqbb2" id="3LzT4PMaM2W" role="1ajw0F" />
+                <node concept="3uibUv" id="3LzT4PMaM2X" role="1ajl9A">
                   <ref role="3uigEE" to="o8zo:3fifI_xCtN$" resolve="Scope" />
                 </node>
               </node>
diff --git a/languages/jetbrains.mps.logic/languageModels/structure.mps b/languages/jetbrains.mps.logic/languageModels/structure.mps
index 6e0e326a..d023fb75 100644
--- a/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -36,6 +36,7 @@
         <property id="4628067390765956807" name="final" index="R5$K2" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
@@ -69,6 +70,7 @@
   </registry>
   <node concept="1TIwiD" id="6$jH9oLmUCq">
     <property role="TrG5h" value="Ast" />
+    <property role="1pbfSe" value="1703977296" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="6$jH9oLmVNm" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -80,6 +82,7 @@
   <node concept="1TIwiD" id="6$jH9oLmYC_">
     <property role="TrG5h" value="Compound" />
     <property role="3GE5qa" value="atom" />
+    <property role="1pbfSe" value="1703960901" />
     <ref role="1TJDcQ" node="5lJXKARS0" resolve="Atom" />
     <node concept="1TJgyi" id="6dP_abdQoiG" role="1TKVEl">
       <property role="TrG5h" value="kind" />
@@ -97,6 +100,7 @@
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="role" />
+    <property role="1pbfSe" value="1703960837" />
     <ref role="1TJDcQ" node="5lJXKARS0" resolve="Atom" />
     <node concept="1TJgyi" id="6$jH9oLmYHk" role="1TKVEl">
       <property role="TrG5h" value="cardinality" />
@@ -109,6 +113,7 @@
   <node concept="1TIwiD" id="6$jH9oLmYEJ">
     <property role="TrG5h" value="ChildRole" />
     <property role="3GE5qa" value="role" />
+    <property role="1pbfSe" value="1703960763" />
     <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="Role" />
     <node concept="1TJgyj" id="6$jH9oLmYFB" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -133,6 +138,7 @@
   <node concept="1TIwiD" id="6$jH9oLmYI0">
     <property role="TrG5h" value="ValueRole" />
     <property role="3GE5qa" value="role" />
+    <property role="1pbfSe" value="1703960554" />
     <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="Role" />
     <node concept="1TJgyj" id="6$jH9oLmYL8" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -144,6 +150,7 @@
   <node concept="1TIwiD" id="6$jH9oLmYJ_">
     <property role="TrG5h" value="Value" />
     <property role="3GE5qa" value="atom" />
+    <property role="1pbfSe" value="1703960453" />
     <ref role="1TJDcQ" node="5lJXKARS0" resolve="Atom" />
     <node concept="1TJgyi" id="6$jH9oLmYKA" role="1TKVEl">
       <property role="TrG5h" value="value" />
@@ -153,6 +160,7 @@
   <node concept="1TIwiD" id="6$jH9oLnyB1">
     <property role="TrG5h" value="Symbol" />
     <property role="3GE5qa" value="atom" />
+    <property role="1pbfSe" value="1703813545" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="6$jH9oLnyBN" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
@@ -208,17 +216,20 @@
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="atom" />
+    <property role="1pbfSe" value="1889588479" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="2q_78a8W4yS">
     <property role="3GE5qa" value="atom" />
     <property role="TrG5h" value="Wildcard" />
     <property role="34LRSv" value="_" />
+    <property role="1pbfSe" value="1349163718" />
     <ref role="1TJDcQ" node="5lJXKARS0" resolve="Atom" />
   </node>
   <node concept="1TIwiD" id="7E86$tKskWj">
     <property role="TrG5h" value="LogicalValue" />
     <property role="3GE5qa" value="logical" />
+    <property role="1pbfSe" value="352753318" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalClause" />
     <node concept="1TJgyj" id="7E86$tKsqnr" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -232,12 +243,14 @@
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="logical" />
+    <property role="1pbfSe" value="352752820" />
   </node>
   <node concept="1TIwiD" id="7E86$tKsHeX">
     <property role="3GE5qa" value="logical" />
     <property role="TrG5h" value="AbstractLogicalVariable" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="1pbfSe" value="352653820" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalClause" />
     <node concept="1TJgyj" id="7E86$tKsJfa" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -248,6 +261,7 @@
   <node concept="1TIwiD" id="7E86$tKt5sV">
     <property role="3GE5qa" value="logical" />
     <property role="TrG5h" value="ExpressionLogicalVariable" />
+    <property role="1pbfSe" value="352554622" />
     <ref role="1TJDcQ" node="7E86$tKsHeX" resolve="AbstractLogicalVariable" />
     <node concept="1TJgyj" id="7E86$tKt5BI" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -259,6 +273,7 @@
   <node concept="1TIwiD" id="7E86$tKtfM3">
     <property role="3GE5qa" value="logical" />
     <property role="TrG5h" value="LogicalVariableDeclaration" />
+    <property role="1pbfSe" value="352512310" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7E86$tKtioV" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -277,10 +292,12 @@
   <node concept="PlHQZ" id="7E86$tK$Rgo">
     <property role="3GE5qa" value="logical" />
     <property role="TrG5h" value="LogicalVariableScope" />
+    <property role="1pbfSe" value="350515617" />
   </node>
   <node concept="1TIwiD" id="7E86$tK_OxQ">
     <property role="3GE5qa" value="logical" />
     <property role="TrG5h" value="LogicalVariableReference" />
+    <property role="1pbfSe" value="350264643" />
     <ref role="1TJDcQ" node="7E86$tKsHeX" resolve="AbstractLogicalVariable" />
     <node concept="1TJgyj" id="7E86$tK_PaH" role="1TKVEi">
       <property role="20lmBu" value="reference" />
@@ -293,6 +310,7 @@
     <property role="3GE5qa" value="logical" />
     <property role="TrG5h" value="LogicalType" />
     <property role="34LRSv" value="logical" />
+    <property role="1pbfSe" value="1450994455" />
     <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
     <node concept="1TJgyj" id="5zfvpQ71CIE" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -304,6 +322,7 @@
     <property role="TrG5h" value="Splice" />
     <property role="3GE5qa" value="atom" />
     <property role="34LRSv" value="Node Expression" />
+    <property role="1pbfSe" value="2065882555" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="1TJgyj" id="dfChU1zo4I" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -324,6 +343,7 @@
   <node concept="1TIwiD" id="1OShD0HAY6y">
     <property role="3GE5qa" value="atom" />
     <property role="TrG5h" value="List" />
+    <property role="1pbfSe" value="1255417906" />
     <ref role="1TJDcQ" node="5lJXKARS0" resolve="Atom" />
     <node concept="1TJgyj" id="1OShD0HAZ38" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -335,6 +355,7 @@
   <node concept="PlHQZ" id="75vUFrS_9Sg">
     <property role="3GE5qa" value="constraint.variable" />
     <property role="TrG5h" value="LogicalVariableDeclarationContainer" />
+    <property role="1pbfSe" value="1777633478" />
     <node concept="1TJgyj" id="2E5lcNn8k3O" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="declaration" />
diff --git a/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 20054976..ff3c2d06 100644
--- a/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -23,7 +23,7 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
index c8e94b45..d5876cc1 100644
--- a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
+++ b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
@@ -2,7 +2,7 @@
 <model ref="r:729bada4-05fa-458f-8bf8-28b9cb978726(jetbrains.mps.logic.builtin.var)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/constraint.mps b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/constraint.mps
index 5f1a60d7..1d34cfe6 100644
--- a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/constraint.mps
+++ b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/constraint.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
diff --git a/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd b/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd
index f324f8aa..04c582c6 100644
--- a/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd
+++ b/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd
@@ -27,7 +27,7 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
diff --git a/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd b/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd
index 293d56f4..8200d7e9 100644
--- a/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd
+++ b/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd
@@ -18,7 +18,7 @@
     <usedLanguage>35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</usedLanguage>
   </usedLanguages>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
diff --git a/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner.mps b/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner.mps
index 823911e4..baa7cd1c 100644
--- a/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner.mps
+++ b/languages/jetbrains.mps.logic/sandbox/runner/models/jetbrains/mps/logic/sandbox/runner.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="-1" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="3ypq" ref="r:ecf59ef9-2b17-40ee-91aa-e7999d4518f0(jetbrains.mps.unification.sandbox)" />
diff --git a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd b/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd
index 6e81a411..930ceee8 100644
--- a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd
+++ b/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd
@@ -21,7 +21,7 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
diff --git a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps b/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
index 4174c485..a3951ef3 100644
--- a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
+++ b/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification()" />
diff --git a/languages/jetbrains.mps.logic/test/jetbrains.mps.logic.test.msd b/languages/jetbrains.mps.logic/test/jetbrains.mps.logic.test.msd
index 1a783aec..ed0f84ad 100644
--- a/languages/jetbrains.mps.logic/test/jetbrains.mps.logic.test.msd
+++ b/languages/jetbrains.mps.logic/test/jetbrains.mps.logic.test.msd
@@ -27,7 +27,7 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -35,6 +35,7 @@
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
diff --git a/languages/jetbrains.mps.logic/test/models/jetbrains/mps/logic/test/unification.mps b/languages/jetbrains.mps.logic/test/models/jetbrains/mps/logic/test/unification.mps
index 23a69268..67ba059c 100644
--- a/languages/jetbrains.mps.logic/test/models/jetbrains/mps/logic/test/unification.mps
+++ b/languages/jetbrains.mps.logic/test/models/jetbrains/mps/logic/test/unification.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="3" />
   </languages>
   <imports>
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
diff --git a/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index a0798a28..807aef6f 100644
--- a/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -23,7 +23,7 @@
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
       </usedDevKits>
       <languageVersions>
-        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+        <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
         <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -55,12 +55,13 @@
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" fqName="jetbrains.mps.baseLanguage.regexp" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -74,7 +75,7 @@
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
     <language id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" fqName="jetbrains.mps.typechecking.annotation" version="0" />
diff --git a/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps b/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps
index 6b4d4072..bb3db956 100644
--- a/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps
+++ b/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:1070fac4-bb22-4bb6-b0bf-ec58df816edc(jetbrains.mps.typechecking.annotation.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -19,6 +19,7 @@
       </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <property id="1587916991969465369" name="conceptId" index="1pbfSe" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
@@ -40,6 +41,7 @@
   <node concept="1TIwiD" id="7ycTm4q3Xcb">
     <property role="TrG5h" value="TypeAnnotation" />
     <property role="34LRSv" value="type" />
+    <property role="1pbfSe" value="1835222932" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="1TJgyi" id="7ycTm4q4781" role="1TKVEl">
       <property role="TrG5h" value="text" />
diff --git a/solutions/jetbrains.mps.typechecking.handling/jetbrains.mps.typechecking.handling.msd b/solutions/jetbrains.mps.typechecking.handling/jetbrains.mps.typechecking.handling.msd
index 6ffba01a..873ba86a 100644
--- a/solutions/jetbrains.mps.typechecking.handling/jetbrains.mps.typechecking.handling.msd
+++ b/solutions/jetbrains.mps.typechecking.handling/jetbrains.mps.typechecking.handling.msd
@@ -26,12 +26,13 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
@@ -53,7 +54,7 @@
     <language id="0eddeefa-c2d6-4437-bc2c-de50fd4ce470" fqName="jetbrains.mps.lang.script" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" fqName="jetbrains.mps.lang.textGen" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
diff --git a/solutions/jetbrains.mps.typechecking.rules/jetbrains.mps.typechecking.rules.msd b/solutions/jetbrains.mps.typechecking.rules/jetbrains.mps.typechecking.rules.msd
index 37c9f965..e55a359e 100644
--- a/solutions/jetbrains.mps.typechecking.rules/jetbrains.mps.typechecking.rules.msd
+++ b/solutions/jetbrains.mps.typechecking.rules/jetbrains.mps.typechecking.rules.msd
@@ -19,12 +19,13 @@
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
   </usedDevKits>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="2" />
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="3" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
@@ -45,7 +46,7 @@
     <language id="0eddeefa-c2d6-4437-bc2c-de50fd4ce470" fqName="jetbrains.mps.lang.script" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
     <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" fqName="jetbrains.mps.lang.textGen" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />