diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 03e26c0c..8b5417b2 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -32,6 +32,7 @@
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+        <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
         <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index dbf5178c..21b7b403 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -65,7 +65,7 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="16" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index ba6233d4..f0f3a557 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:65f97255-4bb1-4783-acd6-a4ed5a1088e2(jetbrains.mps.typechecking.testlang.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="16" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
@@ -176,6 +176,10 @@
         <child id="8908809128802132746" name="parameter" index="3tC56T" />
         <child id="8908809128801952514" name="body" index="3unh6L" />
       </concept>
+      <concept id="4057204182462594788" name="jetbrains.mps.lang.coderules.structure.IVisible" flags="ng" index="4DQHh">
+        <child id="4057204182462594789" name="visibility" index="4DQHg" />
+      </concept>
+      <concept id="4057204182462608179" name="jetbrains.mps.lang.coderules.structure.PublicVisibility" flags="ng" index="4DUq6" />
       <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
         <child id="3026409000515988658" name="parameter" index="2_cLD1" />
@@ -288,6 +292,7 @@
     <ref role="2YbDB9" node="7mB3viLbCp8" resolve="Typeof" />
     <node concept="3AqmO8" id="7lt0LtPOZVl" role="8PkJo">
       <property role="TrG5h" value="recover" />
+      <node concept="4DUq6" id="1Z2HYz9jjP0" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="7lt0LtPOZWJ" role="8PkJo">
       <property role="TrG5h" value="typeNode" />
@@ -297,6 +302,7 @@
       <node concept="1zAUYm" id="7lt0LtPP10I" role="1zAUyy">
         <property role="TrG5h" value="expression" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjP1" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="7lt0LtPOZVh" role="1nK1Vg">
       <property role="TrG5h" value="recoverExpr" />
@@ -578,6 +584,7 @@
       <node concept="1zAUYm" id="3IIf9OArhmR" role="1zAUyy">
         <property role="TrG5h" value="supertype" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjP2" role="4DQHg" />
     </node>
   </node>
   <node concept="92CTh" id="6OXbTD$fzih">
@@ -625,6 +632,7 @@
       <node concept="1zAUYm" id="7mB3viLbCpd" role="1zAUyy">
         <property role="TrG5h" value="type" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjP3" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="7lt0LtPHRZ8" role="1nK1Vg">
       <property role="TrG5h" value="exprTypeof" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 46b806ab..ca1f5ffe 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:a40f7100-fd07-4b1c-98c5-112d92c92128(samples.fitch.firstOrderLogic.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="16" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
index 49577766..cc0fc8f2 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -67,7 +67,7 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="16" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 8fff2571..b0953ea4 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:2e585daf-c5c7-4735-a41f-b2044cd9b207(samples.fitch.herbrandLogic.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="16" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
index c47d4437..42493272 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -68,7 +68,7 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="16" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index c4f813e0..7b4b3d3d 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(samples.fitch.propositionalLogic.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="16" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
@@ -183,6 +183,10 @@
         <child id="8908809128802132746" name="parameter" index="3tC56T" />
         <child id="8908809128801952514" name="body" index="3unh6L" />
       </concept>
+      <concept id="4057204182462594788" name="jetbrains.mps.lang.coderules.structure.IVisible" flags="ng" index="4DQHh">
+        <child id="4057204182462594789" name="visibility" index="4DQHg" />
+      </concept>
+      <concept id="4057204182462608179" name="jetbrains.mps.lang.coderules.structure.PublicVisibility" flags="ng" index="4DUq6" />
       <concept id="4992889260816483106" name="jetbrains.mps.lang.coderules.structure.Condition" flags="ng" index="cBwPQ" />
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
@@ -841,6 +845,7 @@
           <property role="3SKdUp" value="sentence is the reasoning's conclusion" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjP8" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="2YqrT$P7RE$" role="8PkJo">
       <property role="TrG5h" value="goal" />
@@ -855,6 +860,7 @@
           <property role="3SKdUp" value="sentence is the proof's goal" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjP9" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="6$MtiK8H12U" role="1nK1Vg">
       <property role="TrG5h" value="Judgement_conclusion" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
index 8c102866..afce6bb1 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -66,7 +66,7 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="16" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index 2bf2e3cc..7132a996 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(samples.fitch.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="16" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
@@ -80,6 +80,10 @@
       <concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
         <child id="8456919074560454898" name="parameter" index="0eVf_" />
       </concept>
+      <concept id="4057204182462594788" name="jetbrains.mps.lang.coderules.structure.IVisible" flags="ng" index="4DQHh">
+        <child id="4057204182462594789" name="visibility" index="4DQHg" />
+      </concept>
+      <concept id="4057204182462608179" name="jetbrains.mps.lang.coderules.structure.PublicVisibility" flags="ng" index="4DUq6" />
       <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
         <child id="3026409000513569515" name="queryKind" index="2_lZgo" />
@@ -152,15 +156,18 @@
     <property role="TrG5h" value="Check" />
     <node concept="3AqmO8" id="2aBGSFge6lD" role="8PkJo">
       <property role="TrG5h" value="main" />
+      <node concept="4DUq6" id="1Z2HYz9jjPc" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="2aBGSFge6lJ" role="8PkJo">
       <property role="TrG5h" value="checkAll" />
+      <node concept="4DUq6" id="1Z2HYz9jjPd" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="2YqrT$P6Q6Q" role="8PkJo">
       <property role="TrG5h" value="check" />
       <node concept="1zAUYm" id="2YqrT$P6Q72" role="1zAUyy">
         <property role="TrG5h" value="rsn" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPe" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="2YqrT$P7tud" role="8PkJo">
       <property role="TrG5h" value="valid" />
@@ -172,6 +179,7 @@
           <property role="3SKdUp" value="reasoning is valid" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPf" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="6$MtiK8GZEJ" role="1nK1Vg">
       <property role="TrG5h" value="check_Reasoning" />
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 27952cfa..7b526191 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -66,7 +66,7 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="16" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 1ecbec7f..44ae28dd 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(samples.lambdacalc.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="-1" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="16" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
     <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" version="-1" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
@@ -403,6 +403,10 @@
         <child id="8908809128802132746" name="parameter" index="3tC56T" />
         <child id="8908809128801952514" name="body" index="3unh6L" />
       </concept>
+      <concept id="4057204182462594788" name="jetbrains.mps.lang.coderules.structure.IVisible" flags="ng" index="4DQHh">
+        <child id="4057204182462594789" name="visibility" index="4DQHg" />
+      </concept>
+      <concept id="4057204182462608179" name="jetbrains.mps.lang.coderules.structure.PublicVisibility" flags="ng" index="4DUq6" />
       <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
         <child id="3026409000513569515" name="queryKind" index="2_lZgo" />
@@ -1559,6 +1563,7 @@
       <node concept="1zAUYm" id="4KALGUEgLfm" role="1zAUyy">
         <property role="TrG5h" value="type" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPk" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP7ph5I" role="8PkJo">
       <property role="TrG5h" value="newTypeVars" />
@@ -1568,6 +1573,7 @@
       <node concept="1zAUYm" id="48ZGLP7phpp" role="1zAUyy">
         <property role="TrG5h" value="introducedTypeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPl" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="1IKbs5XDAuv" role="1nK1Vg">
       <property role="TrG5h" value="test_rules" />
@@ -4400,9 +4406,11 @@
     <ref role="2YbDB9" node="5dGkjBXlLmT" resolve="typeOf" />
     <node concept="3AqmO8" id="4nAM3Of98gl" role="8PkJo">
       <property role="TrG5h" value="main" />
+      <node concept="4DUq6" id="1Z2HYz9jjPm" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="4dPZ2m2jAgt" role="8PkJo">
       <property role="TrG5h" value="recoverAll" />
+      <node concept="4DUq6" id="1Z2HYz9jjPn" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="JqEP$8kz$w" role="8PkJo">
       <property role="TrG5h" value="varTypeName" />
@@ -4412,6 +4420,7 @@
       <node concept="1zAUYm" id="JqEP$8kzCK" role="1zAUyy">
         <property role="TrG5h" value="name" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPo" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WTCdy" role="8PkJo">
       <property role="TrG5h" value="typeclassName" />
@@ -4421,6 +4430,7 @@
       <node concept="1zAUYm" id="47tET_WTChS" role="1zAUyy">
         <property role="TrG5h" value="name" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPp" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="4dPZ2m2i60v" role="8PkJo">
       <property role="TrG5h" value="recover" />
@@ -4433,6 +4443,7 @@
       <node concept="1zAUYm" id="4dPZ2m2i60F" role="1zAUyy">
         <property role="TrG5h" value="type" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPq" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP7rIE2" role="8PkJo">
       <property role="TrG5h" value="recoverTypeVars" />
@@ -4448,6 +4459,7 @@
       <node concept="1zAUYm" id="48ZGLP7rIKo" role="1zAUyy">
         <property role="TrG5h" value="typeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPr" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WiT7i" role="8PkJo">
       <property role="TrG5h" value="toRecoverConstraints" />
@@ -4457,6 +4469,7 @@
       <node concept="1zAUYm" id="47tET_WiT9B" role="1zAUyy">
         <property role="TrG5h" value="constraintsSet" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPs" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WheG$" role="8PkJo">
       <property role="TrG5h" value="recoverConstraints" />
@@ -4466,6 +4479,7 @@
       <node concept="1zAUYm" id="47tET_WheIH" role="1zAUyy">
         <property role="TrG5h" value="typeVar" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPt" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_Whfh$" role="8PkJo">
       <property role="TrG5h" value="recoverConstraintList" />
@@ -4478,6 +4492,7 @@
       <node concept="1zAUYm" id="47tET_WhhV6" role="1zAUyy">
         <property role="TrG5h" value="consList" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPu" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="47tET_WlKbY" role="1nK1Vg">
       <property role="TrG5h" value="reproduceTypeConstraints_start" />
@@ -6378,6 +6393,7 @@
       <node concept="1zAUYm" id="48ZGLP7O6gr" role="1zAUyy">
         <property role="TrG5h" value="typeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPv" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP7pkwP" role="8PkJo">
       <property role="TrG5h" value="genTV" />
@@ -6390,6 +6406,7 @@
       <node concept="1zAUYm" id="48ZGLP7pkx5" role="1zAUyy">
         <property role="TrG5h" value="freeTypeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPw" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="12dHl3ZCEx3" role="8PkJo">
       <property role="TrG5h" value="inst" />
@@ -6402,6 +6419,7 @@
       <node concept="1zAUYm" id="48ZGLP7zRGc" role="1zAUyy">
         <property role="TrG5h" value="typeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPx" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP7pk5w" role="8PkJo">
       <property role="TrG5h" value="genTypeVars" />
@@ -6411,6 +6429,7 @@
       <node concept="1zAUYm" id="48ZGLP7plaN" role="1zAUyy">
         <property role="TrG5h" value="freeTypeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPy" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP7pAI2" role="8PkJo">
       <property role="TrG5h" value="instTypeVars" />
@@ -6426,6 +6445,7 @@
       <node concept="1zAUYm" id="48ZGLP7zRHp" role="1zAUyy">
         <property role="TrG5h" value="resultTypeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPz" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="48ZGLP7ppHO" role="1nK1Vg">
       <property role="TrG5h" value="genTypeVars_baseCase" />
@@ -7731,9 +7751,11 @@
       <node concept="1zAUYm" id="48ZGLP8pG4A" role="1zAUyy">
         <property role="TrG5h" value="tb" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjP$" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP8SeQb" role="8PkJo">
       <property role="TrG5h" value="subsumedFail" />
+      <node concept="4DUq6" id="1Z2HYz9jjP_" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP92BQW" role="8PkJo">
       <property role="TrG5h" value="renameTypeVars" />
@@ -7743,6 +7765,7 @@
       <node concept="1zAUYm" id="48ZGLP92BR7" role="1zAUyy">
         <property role="TrG5h" value="originalTypeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPA" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="1IKbs5Xw9SC" role="8PkJo">
       <property role="TrG5h" value="tryRenameTypeVars" />
@@ -7752,6 +7775,7 @@
       <node concept="1zAUYm" id="1IKbs5Xw9SE" role="1zAUyy">
         <property role="TrG5h" value="originalTypeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPB" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="1IKbs5XihHK" role="8PkJo">
       <property role="TrG5h" value="checkTypeVars" />
@@ -7761,6 +7785,7 @@
       <node concept="1zAUYm" id="1IKbs5XihHW" role="1zAUyy">
         <property role="TrG5h" value="originalTypeVars" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPC" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="2O9ahh6MeO6" role="1nK1Vg">
       <property role="TrG5h" value="renameTypeVars_check" />
@@ -9143,6 +9168,7 @@
       <node concept="1zAUYm" id="JqEP$8fyZI" role="1zAUyy">
         <property role="TrG5h" value="type" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPD" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="3vXKzDNH4MG" role="8PkJo">
       <property role="TrG5h" value="varTypeDuplicate" />
@@ -9152,6 +9178,7 @@
       <node concept="1zAUYm" id="3vXKzDNH5cq" role="1zAUyy">
         <property role="TrG5h" value="uniVar" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPE" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="3vXKzDNH3tQ" role="1nK1Vg">
       <property role="TrG5h" value="varTypeDuplicate" />
@@ -11548,6 +11575,7 @@
       <node concept="1zAUYm" id="47tET_W4MQs" role="1zAUyy">
         <property role="TrG5h" value="elem" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPF" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_Wrvyw" role="8PkJo">
       <property role="TrG5h" value="setCopy" />
@@ -11557,6 +11585,7 @@
       <node concept="1zAUYm" id="47tET_WrvyK" role="1zAUyy">
         <property role="TrG5h" value="newHandle" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPG" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WsDrE" role="8PkJo">
       <property role="TrG5h" value="isSubset" />
@@ -11569,6 +11598,7 @@
       <node concept="1zAUYm" id="47tET_WsDvc" role="1zAUyy">
         <property role="TrG5h" value="result" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPH" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WsDRa" role="8PkJo">
       <property role="TrG5h" value="isSubsetHelper" />
@@ -11581,6 +11611,7 @@
       <node concept="1zAUYm" id="47tET_WsDRA" role="1zAUyy">
         <property role="TrG5h" value="result" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPI" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_W4NQw" role="8PkJo">
       <property role="TrG5h" value="setToCons" />
@@ -11590,6 +11621,7 @@
       <node concept="1zAUYm" id="47tET_W4NQB" role="1zAUyy">
         <property role="TrG5h" value="consList" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPJ" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_X4c7N" role="8PkJo">
       <property role="TrG5h" value="setToConsCopy" />
@@ -11599,6 +11631,7 @@
       <node concept="1zAUYm" id="47tET_X4c9q" role="1zAUyy">
         <property role="TrG5h" value="consList" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPK" role="4DQHg" />
     </node>
   </node>
   <node concept="AVZre" id="47tET_W6GBd">
@@ -11611,6 +11644,7 @@
       <node concept="1zAUYm" id="47tET_W4MQk" role="1zAUyy">
         <property role="TrG5h" value="set" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPL" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WOmOE" role="8PkJo">
       <property role="TrG5h" value="tdefConstraints" />
@@ -11620,6 +11654,7 @@
       <node concept="1zAUYm" id="47tET_WOmPc" role="1zAUyy">
         <property role="TrG5h" value="set" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPM" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47xL5G3eTpn" role="8PkJo">
       <property role="TrG5h" value="produceTypeConstraints" />
@@ -11629,9 +11664,11 @@
       <node concept="1zAUYm" id="47xL5G3eTpY" role="1zAUyy">
         <property role="TrG5h" value="typeVarDef" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPN" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WlK9C" role="8PkJo">
       <property role="TrG5h" value="reproduceTypeConstraints" />
+      <node concept="4DUq6" id="1Z2HYz9jjPO" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="47tET_W4RYO" role="1nK1Vg">
       <property role="TrG5h" value="typeConstraints_mergeSets" />
@@ -12113,6 +12150,7 @@
       <node concept="1zAUYm" id="47tET_Wgb9Z" role="1zAUyy">
         <property role="TrG5h" value="typeConstraintsSet" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPP" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_Wh9Mr" role="8PkJo">
       <property role="TrG5h" value="strengthCheck" />
@@ -12122,6 +12160,7 @@
       <node concept="1zAUYm" id="47tET_Wh9MJ" role="1zAUyy">
         <property role="TrG5h" value="strongerSet" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPQ" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_Wh6jP" role="8PkJo">
       <property role="TrG5h" value="instanceCheck" />
@@ -12131,6 +12170,7 @@
       <node concept="1zAUYm" id="47tET_Wh6k6" role="1zAUyy">
         <property role="TrG5h" value="typeConstraintSet" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPR" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WsEug" role="8PkJo">
       <property role="TrG5h" value="instanceCheckHelper" />
@@ -12140,6 +12180,7 @@
       <node concept="1zAUYm" id="47tET_WsEuC" role="1zAUyy">
         <property role="TrG5h" value="typeConstraintList" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPS" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WsED9" role="8PkJo">
       <property role="TrG5h" value="checkSingleInstance" />
@@ -12149,6 +12190,7 @@
       <node concept="1zAUYm" id="47tET_WsEDB" role="1zAUyy">
         <property role="TrG5h" value="typeConstraint" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPT" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WFhSG" role="8PkJo">
       <property role="TrG5h" value="discardIfInstanceFound" />
@@ -12158,6 +12200,7 @@
       <node concept="1zAUYm" id="47tET_WFhTb" role="1zAUyy">
         <property role="TrG5h" value="instantiatedTypeScheme" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPU" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WsEA7" role="8PkJo">
       <property role="TrG5h" value="instance" />
@@ -12167,6 +12210,7 @@
       <node concept="1zAUYm" id="47tET_WsEAy" role="1zAUyy">
         <property role="TrG5h" value="instanceTypeScheme" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPV" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="47xL5G3rv_f" role="1nK1Vg">
       <property role="TrG5h" value="checkVarConstraints" />
@@ -12867,6 +12911,7 @@
       <node concept="1zAUYm" id="48ZGLP7ppH1" role="1zAUyy">
         <property role="TrG5h" value="result" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPW" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="3vXKzDNKmVz" role="8PkJo">
       <property role="TrG5h" value="listToCons" />
@@ -12876,6 +12921,7 @@
       <node concept="1zAUYm" id="3vXKzDNKmVZ" role="1zAUyy">
         <property role="TrG5h" value="consList" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPX" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="48ZGLP7ppVx" role="1nK1Vg">
       <property role="TrG5h" value="append" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index 11ae1d91..86b986be 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
@@ -33,7 +33,7 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="16" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index 49d62c9e..a9feee32 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -28,7 +28,7 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="16" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:2e120f68-abfb-4980-bb1c-bc70159b1f95:jetbrains.mps.lang.controlflow" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index c9e5b772..e90e49b1 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -2,7 +2,7 @@
 <model ref="r:6a71ba3e-550e-4491-a65a-abcddca431cd(jetbrains.mps.baseLanguageExt.controlflow)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="16" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="2e120f68-abfb-4980-bb1c-bc70159b1f95" name="jetbrains.mps.lang.controlflow" version="0" />
     <engage id="2e120f68-abfb-4980-bb1c-bc70159b1f95" name="jetbrains.mps.lang.controlflow" />
@@ -242,6 +242,10 @@
       <concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
         <child id="8456919074560454898" name="parameter" index="0eVf_" />
       </concept>
+      <concept id="4057204182462594788" name="jetbrains.mps.lang.coderules.structure.IVisible" flags="ng" index="4DQHh">
+        <child id="4057204182462594789" name="visibility" index="4DQHg" />
+      </concept>
+      <concept id="4057204182462608179" name="jetbrains.mps.lang.coderules.structure.PublicVisibility" flags="ng" index="4DUq6" />
       <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
         <child id="3026409000513569515" name="queryKind" index="2_lZgo" />
@@ -486,12 +490,14 @@
     </node>
     <node concept="3AqmO8" id="AoTMCCZ1rq" role="8PkJo">
       <property role="TrG5h" value="trace" />
+      <node concept="4DUq6" id="1Z2HYz9jjQC" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="FAZzzinzPp" role="8PkJo">
       <property role="TrG5h" value="split" />
       <node concept="1zAUYm" id="FAZzzinzPU" role="1zAUyy">
         <property role="TrG5h" value="node" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQD" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="xaaVXuK7s8" role="8PkJo">
       <property role="TrG5h" value="merge" />
@@ -501,6 +507,7 @@
       <node concept="1zAUYm" id="xaaVXuK7vn" role="1zAUyy">
         <property role="TrG5h" value="node" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQE" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6Yb9hAqKKfy" role="8PkJo">
       <property role="TrG5h" value="follow" />
@@ -510,6 +517,7 @@
       <node concept="1zAUYm" id="6Yb9hAqKKmr" role="1zAUyy">
         <property role="TrG5h" value="succ" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQF" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="79EwspgMiao" role="8PkJo">
       <property role="TrG5h" value="loop" />
@@ -519,6 +527,7 @@
       <node concept="1zAUYm" id="79EwspgMia_" role="1zAUyy">
         <property role="TrG5h" value="node" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQG" role="4DQHg" />
     </node>
   </node>
   <node concept="AVZre" id="6Yb9hAqKRJb">
@@ -1344,24 +1353,28 @@
     </node>
     <node concept="3AqmO8" id="78H58oeAof4" role="8PkJo">
       <property role="TrG5h" value="checkAll" />
+      <node concept="4DUq6" id="1Z2HYz9jjQH" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6Yb9hAqKYIR" role="8PkJo">
       <property role="TrG5h" value="unreachable" />
       <node concept="1zAUYm" id="6Yb9hAqKYME" role="1zAUyy">
         <property role="TrG5h" value="site" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQI" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6Yb9hAqObIb" role="8PkJo">
       <property role="TrG5h" value="uninitializedRead" />
       <node concept="1zAUYm" id="6Yb9hAqObP0" role="1zAUyy">
         <property role="TrG5h" value="site" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQJ" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6Yb9hAqOFjy" role="8PkJo">
       <property role="TrG5h" value="unusedAssignment" />
       <node concept="1zAUYm" id="6Yb9hAqOFpE" role="1zAUyy">
         <property role="TrG5h" value="expr" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQK" role="4DQHg" />
     </node>
   </node>
   <node concept="AVZre" id="6Yb9hAqMDzp">
@@ -6366,6 +6379,7 @@
       <node concept="1zAUYm" id="6Yb9hAqNH_L" role="1zAUyy">
         <property role="TrG5h" value="site" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQL" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6Yb9hAqR6c6" role="8PkJo">
       <property role="TrG5h" value="write" />
@@ -6375,24 +6389,29 @@
       <node concept="1zAUYm" id="6Yb9hAqR6gM" role="1zAUyy">
         <property role="TrG5h" value="site" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQM" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="2Uh$R6pCiqX" role="8PkJo">
       <property role="TrG5h" value="loc" />
       <node concept="1zAUYm" id="2Uh$R6pCirz" role="1zAUyy">
         <property role="TrG5h" value="loc" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQN" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="AoTMCCYnN1" role="8PkJo">
       <property role="TrG5h" value="rw" />
+      <node concept="4DUq6" id="1Z2HYz9jjQO" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="22$xxOvW8Hm" role="8PkJo">
       <property role="TrG5h" value="rw_uses" />
       <node concept="1zAUYm" id="22$xxOvW8HW" role="1zAUyy">
         <property role="TrG5h" value="node" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQP" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="5pIcDR7wSAo" role="8PkJo">
       <property role="TrG5h" value="rw_live" />
+      <node concept="4DUq6" id="1Z2HYz9jjQQ" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="7pxta7vrjE$" role="8PkJo">
       <property role="TrG5h" value="live" />
@@ -6405,6 +6424,7 @@
       <node concept="1zAUYm" id="7pxta7vrjEB" role="1zAUyy">
         <property role="TrG5h" value="rsite" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQR" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="7pxta7vmNbZ" role="8PkJo">
       <property role="TrG5h" value="used" />
@@ -6417,6 +6437,7 @@
       <node concept="1zAUYm" id="7pxta7vmNd0" role="1zAUyy">
         <property role="TrG5h" value="rsite" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQS" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="22$xxOvZhlA" role="8PkJo">
       <property role="TrG5h" value="used_visit" />
@@ -6426,6 +6447,7 @@
       <node concept="1zAUYm" id="7pxta7vvmYi" role="1zAUyy">
         <property role="TrG5h" value="uses" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQT" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="22$xxOw7RKD" role="8PkJo">
       <property role="TrG5h" value="used_visited" />
@@ -6435,6 +6457,7 @@
       <node concept="1zAUYm" id="PYgJzEdeVx" role="1zAUyy">
         <property role="TrG5h" value="uses" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQU" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="5pIcDR7wSAl" role="8PkJo">
       <property role="TrG5h" value="live_visited" />
@@ -6444,6 +6467,7 @@
       <node concept="1zAUYm" id="5pIcDR7$1ZS" role="1zAUyy">
         <property role="TrG5h" value="uses" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQV" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="PYgJzEfhdR" role="8PkJo">
       <property role="TrG5h" value="match_uses" />
@@ -6456,6 +6480,7 @@
       <node concept="1zAUYm" id="PYgJzEfhk2" role="1zAUyy">
         <property role="TrG5h" value="uses" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQW" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="7pxta7vwDws" role="8PkJo">
       <property role="TrG5h" value="append" />
@@ -6465,6 +6490,7 @@
       <node concept="1zAUYm" id="7pxta7vwDy4" role="1zAUyy">
         <property role="TrG5h" value="from" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQX" role="4DQHg" />
     </node>
   </node>
   <node concept="AVZre" id="AoTMCD1vyF">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index da3f3af5..5ead9ab5 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -5,7 +5,7 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="16" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
@@ -611,6 +611,10 @@
         <child id="8908809128802132746" name="parameter" index="3tC56T" />
         <child id="8908809128801952514" name="body" index="3unh6L" />
       </concept>
+      <concept id="4057204182462594788" name="jetbrains.mps.lang.coderules.structure.IVisible" flags="ng" index="4DQHh">
+        <child id="4057204182462594789" name="visibility" index="4DQHg" />
+      </concept>
+      <concept id="4057204182462608179" name="jetbrains.mps.lang.coderules.structure.PublicVisibility" flags="ng" index="4DUq6" />
       <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
         <child id="3026409000515988658" name="parameter" index="2_cLD1" />
@@ -2316,6 +2320,7 @@
     <ref role="2YbDB9" node="34$A1Mf51rY" resolve="TypeOf" />
     <node concept="3AqmO8" id="34$A1MfabR$" role="8PkJo">
       <property role="TrG5h" value="checkAll" />
+      <node concept="4DUq6" id="1Z2HYz9jjQY" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7sng" role="1nK1Vg">
       <property role="TrG5h" value="checkConstructorDeclaration" />
@@ -2609,6 +2614,7 @@
           <property role="3SKdUp" value="yields a list of &quot;subclassing paths&quot;, which all originate at classifier and go up to Object" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjQZ" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="2rIdnPuJSEv" role="1nK1Vg">
       <property role="TrG5h" value="findSubclassPaths_Classifier" />
@@ -6678,6 +6684,7 @@
           <property role="3SKdUp" value="containment relation between two types that are parameters of a classifier type" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR0" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="5moyjRHrosW" role="8PkJo">
       <property role="TrG5h" value="containedInSafe" />
@@ -6699,6 +6706,7 @@
           <property role="3SKdUp" value="containsIn catching errors" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR1" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="5moyjRHrotq" role="1nK1Vg">
       <property role="TrG5h" value="containedIn_safe" />
@@ -9759,6 +9767,7 @@
           <property role="3SKdUp" value="asserts that subtyping relation is necessary for correctness of some program fragment" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR2" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6N2bvv_fIDd" role="8PkJo">
       <property role="TrG5h" value="convertsToAll" />
@@ -9773,6 +9782,7 @@
           <property role="3SKdUp" value="ensures T converts to all of types in the second arg" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR3" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="2rIdnPw236I" role="8PkJo">
       <property role="TrG5h" value="convertsOneTo" />
@@ -9787,6 +9797,7 @@
           <property role="3SKdUp" value="ensures one of the types in the first arg converts to T" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR4" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="3MG3BxoG13Q" role="8PkJo">
       <property role="TrG5h" value="convertsToSafe" />
@@ -9807,6 +9818,7 @@
           <property role="3SKdUp" value="convertsTo catching errors" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR5" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="7AyqXCd_0im" role="8PkJo">
       <property role="TrG5h" value="primConvertsTo" />
@@ -9822,6 +9834,7 @@
           <property role="3SKdUp" value="primitive conversion, including boxing" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR6" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="ONSj15RYDg" role="8PkJo">
       <property role="TrG5h" value="compatibleWith" />
@@ -9837,6 +9850,7 @@
           <property role="3SKdUp" value="equivalent to convertsTo except for any type compatible with void type" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR7" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="34$A1Mf6yuk" role="8PkJo">
       <property role="TrG5h" value="varname" />
@@ -9852,6 +9866,7 @@
           <property role="3SKdUp" value="presence of this constraint in pool indicates that its first argument is Java typesystem variable with some name" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR8" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7shG" role="1nK1Vg">
       <property role="TrG5h" value="compatibleWith_void" />
@@ -12355,6 +12370,7 @@
           <property role="3SKdUp" value="asserts Subtype can be promoted to Supertype, with both being ClassifierType instances" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR9" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6EY0p2x_ytQ" role="8PkJo">
       <property role="TrG5h" value="promoteUnchecked" />
@@ -12370,6 +12386,7 @@
           <property role="3SKdUp" value="promote allowing unchecked conversion" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRa" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="WauyOOvQCY" role="8PkJo">
       <property role="TrG5h" value="dpromote" />
@@ -12388,6 +12405,7 @@
           <property role="3SKdUp" value="asserts promotion from Subtype to Supertype given the raw subtypes path" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRb" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="6EY0p2x_yub" role="1nK1Vg">
       <property role="TrG5h" value="promoteUnchecked_raw" />
@@ -13561,6 +13579,7 @@
           <property role="3SKdUp" value="least upper bound" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRc" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7snI" role="1nK1Vg">
       <property role="TrG5h" value="lub_null_any" />
@@ -14052,6 +14071,7 @@
           <property role="3SKdUp" value="coerce the type to the specific domain" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRd" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7se6" role="1nK1Vg">
       <property role="TrG5h" value="coerceRef_prim_boxed" />
@@ -14641,6 +14661,7 @@
       <node concept="1zAUYm" id="2rIdnPwk1PK" role="1zAUyy">
         <property role="TrG5h" value="cls" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRe" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="2rIdnPwk8q4" role="8PkJo">
       <property role="TrG5h" value="toRawTypes" />
@@ -14650,6 +14671,7 @@
       <node concept="1zAUYm" id="2rIdnPwk8q6" role="1zAUyy">
         <property role="TrG5h" value="classifiers" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRf" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="2rIdnPwjZrG" role="8PkJo">
       <property role="TrG5h" value="toRawTypesRec" />
@@ -14659,6 +14681,7 @@
       <node concept="1zAUYm" id="2rIdnPwjZCx" role="1zAUyy">
         <property role="TrG5h" value="classifiers" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRg" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="2rIdnPwjZHp" role="1nK1Vg">
       <property role="TrG5h" value="createRawTypes" />
@@ -15048,6 +15071,7 @@
           <property role="3SKdUp" value="primitive subtyping relation" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRh" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="7AyqXCdDQnv" role="8PkJo">
       <property role="TrG5h" value="primSubtypeBoxed" />
@@ -15063,6 +15087,7 @@
           <property role="3SKdUp" value="primitive subtyping relation (boxed supertype)" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRi" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7skD" role="1nK1Vg">
       <property role="TrG5h" value="primitive_subtype_reflexive" />
@@ -16833,6 +16858,7 @@
           <property role="3SKdUp" value="greatest lower bound" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRj" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7so6" role="1nK1Vg">
       <property role="TrG5h" value="glb_object_any" />
@@ -17216,6 +17242,7 @@
       <node concept="1zAUYm" id="6txXQySZxen" role="1zAUyy">
         <property role="TrG5h" value="type" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRk" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="35YJGAK4DH_" role="8PkJo">
       <property role="TrG5h" value="unbox" />
@@ -17226,6 +17253,7 @@
       <node concept="1zAUYm" id="35YJGAK4DHB" role="1zAUyy">
         <property role="TrG5h" value="type" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRl" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="1Py6iKEYV7" role="1nK1Vg">
       <property role="TrG5h" value="box_primitive" />
@@ -18310,9 +18338,11 @@
       <node concept="1zAUYm" id="6Qzc0KyJGLF" role="1zAUyy">
         <property role="TrG5h" value="bar" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRm" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="20Zoq4kTOFb" role="8PkJo">
       <property role="TrG5h" value="recoverAll" />
+      <node concept="4DUq6" id="1Z2HYz9jjRn" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6N2bvv_l2qf" role="8PkJo">
       <property role="TrG5h" value="recoverList" />
@@ -18323,6 +18353,7 @@
       <node concept="1zAUYm" id="6N2bvv_l2wW" role="1zAUyy">
         <property role="TrG5h" value="terms" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRo" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="35YJGAJTRng" role="8PkJo">
       <property role="TrG5h" value="expectType" />
@@ -18330,6 +18361,7 @@
         <property role="TrG5h" value="node" />
         <node concept="2sp9CU" id="35YJGAJTTpv" role="3gTf24" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRp" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7seY" role="1nK1Vg">
       <property role="TrG5h" value="expect_typeOf_expression" />
@@ -23442,6 +23474,7 @@
           <property role="3SKdUp" value="capture conversion" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRq" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="3wxtToEiJ2j" role="8PkJo">
       <property role="TrG5h" value="captureWildcard" />
@@ -23460,6 +23493,7 @@
           <property role="3SKdUp" value="used by the capture conversion." />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRr" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7sgt" role="1nK1Vg">
       <property role="TrG5h" value="capture_classifier" />
@@ -25201,6 +25235,7 @@
           <property role="3SKdUp" value="indicates a bound. used only on inference variables" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRs" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="5310cdpUCx3" role="8PkJo">
       <property role="TrG5h" value="intro_hasBound" />
@@ -25215,6 +25250,7 @@
           <property role="3SKdUp" value="introduce bound" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRt" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="12QmIo_7seu" role="1nK1Vg">
       <property role="TrG5h" value="intro_hasBound_existing" />
@@ -25999,6 +26035,7 @@
       <node concept="1zAUYm" id="34$A1MfhdDz" role="1zAUyy">
         <property role="TrG5h" value="type" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRu" role="4DQHg" />
     </node>
   </node>
   <node concept="92CTh" id="6OXbTD$fto2">
@@ -27096,6 +27133,7 @@
       <node concept="1zAUYm" id="2HYHa0WD7Ia" role="1zAUyy">
         <property role="TrG5h" value="InT" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRv" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="35YJGAK4DLM" role="8PkJo">
       <property role="TrG5h" value="binnum_promote" />
@@ -27108,6 +27146,7 @@
       <node concept="1zAUYm" id="35YJGAK4DLQ" role="1zAUyy">
         <property role="TrG5h" value="InT" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRw" role="4DQHg" />
     </node>
   </node>
   <node concept="AVZre" id="2HYHa0WMaIu">
@@ -27246,6 +27285,7 @@
       <node concept="1zAUYm" id="2HYHa0WMaIm" role="1zAUyy">
         <property role="TrG5h" value="PrimT" />
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRx" role="4DQHg" />
     </node>
   </node>
   <node concept="0oKg$" id="1z5AZi8EDS1">
@@ -30174,6 +30214,7 @@
           <property role="3SKdUp" value="a type var has a target" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRy" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6N2bvv_crdr" role="8PkJo">
       <property role="TrG5h" value="hasLowerTarget" />
@@ -30188,6 +30229,7 @@
           <property role="3SKdUp" value="a type var has a target" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjRz" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="6N2bvv_5W0X" role="8PkJo">
       <property role="TrG5h" value="resolve" />
@@ -30199,6 +30241,7 @@
           <property role="3SKdUp" value="start resolving a type variable" />
         </node>
       </node>
+      <node concept="4DUq6" id="1Z2HYz9jjR$" role="4DQHg" />
     </node>
   </node>
 </model>