diff --git a/.mps/migration.xml b/.mps/migration.xml
index ef8763de..e054adb9 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -24,6 +24,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2026_1.UpdateConceptMethodCall" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -32,6 +33,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="253" />
+    <entry key="project.migrated.version" value="261" />
   </component>
 </project>
\ No newline at end of file
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 8691eef8..9bad79df 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -46,6 +46,9 @@
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
       <concept id="1161622665029" name="jetbrains.mps.lang.sharedConcepts.structure.ConceptFunctionParameter_model" flags="nn" index="1Q6Npb" />
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
@@ -294,16 +297,16 @@
       </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1510949579266781519" name="jetbrains.mps.lang.generator.structure.TemplateCallMacro" flags="ln" index="5jKBG">
+      <concept id="1510949579266781519" name="jetbrains.mps.lang.generator.structure.TemplateCallMacro" flags="lg" index="5jKBG">
         <child id="1510949579266801461" name="sourceNodeQuery" index="5jGum" />
       </concept>
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
+      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="lg" index="29HgVG">
         <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
       </concept>
       <concept id="1219952072943" name="jetbrains.mps.lang.generator.structure.DropRootRule" flags="lg" index="aNPBN">
         <reference id="1219952338328" name="applicableConcept" index="aOQi4" />
       </concept>
-      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="lg" index="2b32R4">
         <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
       </concept>
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
@@ -350,7 +353,7 @@
         <reference id="1200923511980" name="label" index="2sBCQV" />
         <reference id="1167087469901" name="templateNode" index="2VPoh2" />
       </concept>
-      <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
+      <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="lg" index="2ZBi8u" />
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
@@ -375,7 +378,7 @@
         <child id="1195158608805" name="conditionFunction" index="150hEN" />
         <child id="1195158637244" name="caseConsequence" index="150oIE" />
       </concept>
-      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="lg" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
       </concept>
       <concept id="1087833466690" name="jetbrains.mps.lang.generator.structure.NodeMacro" flags="lg" index="17VmuZ">
@@ -417,23 +420,23 @@
       <concept id="1167756221419" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_templatePropertyValue" flags="nn" index="3zGtF$" />
       <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
       <concept id="1167945743726" name="jetbrains.mps.lang.generator.structure.IfMacro_Condition" flags="in" index="3IZrLx" />
-      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
+      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="ig" index="3JmXsc" />
       <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
         <child id="8900764248744213871" name="contentNode" index="1Koe22" />
       </concept>
       <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
         <child id="1805153994415893199" name="type" index="1N15GL" />
       </concept>
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-      <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="ln" index="1W57fq">
+      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="ig" index="3NFfHV" />
+      <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="lg" index="1W57fq">
         <child id="1194989344771" name="alternativeConsequence" index="UU_$l" />
         <child id="1167945861827" name="conditionFunction" index="3IZSJc" />
       </concept>
-      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
+      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="lg" index="1WS0z7">
         <property id="7430509679011668804" name="counterVarName" index="1qytDF" />
         <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
       </concept>
-      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
+      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="lg" index="1ZhdrF">
         <child id="1167770376702" name="referentFunction" index="3$ytzL" />
       </concept>
     </language>
@@ -559,7 +562,6 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -5059,7 +5061,7 @@
                           <node concept="3clFbF" id="62MNP_l2$OB" role="3cqZAp">
                             <node concept="2OqwBi" id="62MNP_l2_1Y" role="3clFbG">
                               <node concept="30H73N" id="62MNP_l2$OA" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="62MNP_l2Avw" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og0S" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                               </node>
                             </node>
@@ -6167,7 +6169,7 @@
                   <node concept="3clFbF" id="7mIqwW4ZWGG" role="3cqZAp">
                     <node concept="2OqwBi" id="7mIqwW4ZWWE" role="3clFbG">
                       <node concept="30H73N" id="7mIqwW4ZWGF" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="7mIqwW4ZXjl" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og0U" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                       </node>
                     </node>
@@ -6204,7 +6206,7 @@
                           <ref role="3Tt5mk" to="wq2x:5itBwM9Rt6C" resolve="extends" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="7mIqwW501dQ" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og0W" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                       </node>
                     </node>
@@ -6402,7 +6404,7 @@
                     <node concept="3clFbF" id="7mIqwW53vVc" role="3cqZAp">
                       <node concept="2OqwBi" id="7mIqwW53wLf" role="3clFbG">
                         <node concept="30H73N" id="7mIqwW53vVb" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="7mIqwW53z88" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og0Y" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                         </node>
                       </node>
@@ -6609,7 +6611,7 @@
           <node concept="3clFbF" id="2N2MQGCZANr" role="3cqZAp">
             <node concept="2OqwBi" id="4MEOIDG8k4S" role="3clFbG">
               <node concept="30H73N" id="4MEOIDG8jhS" role="2Oq$k0" />
-              <node concept="2qgKlT" id="4MEOIDG8l3x" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og10" role="2OqNvi">
                 <ref role="37wK5l" to="x5bw:4MEOIDG8goY" resolve="runtimeClassName" />
               </node>
             </node>
@@ -7311,7 +7313,7 @@
                         <node concept="3clFbF" id="6zber0NI283" role="3cqZAp">
                           <node concept="2OqwBi" id="6zber0NI284" role="3clFbG">
                             <node concept="30H73N" id="6zber0NI285" role="2Oq$k0" />
-                            <node concept="2qgKlT" id="6zber0NI286" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og12" role="2OqNvi">
                               <ref role="37wK5l" to="ha02:75vUFrSLzQL" resolve="getContainer" />
                             </node>
                           </node>
@@ -7476,7 +7478,7 @@
                         <node concept="3clFbF" id="6zber0NI2$X" role="3cqZAp">
                           <node concept="2OqwBi" id="6zber0NI2$Y" role="3clFbG">
                             <node concept="30H73N" id="6zber0NI2$Z" role="2Oq$k0" />
-                            <node concept="2qgKlT" id="6zber0NI2_0" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og14" role="2OqNvi">
                               <ref role="37wK5l" to="ha02:75vUFrSLzQL" resolve="getContainer" />
                             </node>
                           </node>
@@ -7940,7 +7942,7 @@
                             <node concept="3clFbF" id="6zber0NI0qS" role="3cqZAp">
                               <node concept="2OqwBi" id="6zber0NI0H_" role="3clFbG">
                                 <node concept="30H73N" id="6zber0NI0qR" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="6zber0NI0Zz" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og16" role="2OqNvi">
                                   <ref role="37wK5l" to="ha02:75vUFrSLzQL" resolve="getContainer" />
                                 </node>
                               </node>
@@ -8097,7 +8099,7 @@
                             <node concept="3clFbF" id="6zber0NI15L" role="3cqZAp">
                               <node concept="2OqwBi" id="6zber0NI15M" role="3clFbG">
                                 <node concept="30H73N" id="6zber0NI15N" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="6zber0NI15O" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og18" role="2OqNvi">
                                   <ref role="37wK5l" to="ha02:75vUFrSLzQL" resolve="getContainer" />
                                 </node>
                               </node>
@@ -8806,7 +8808,7 @@
                           <node concept="3clFbF" id="3yhgKRI8wme" role="3cqZAp">
                             <node concept="2OqwBi" id="3yhgKRI8wmf" role="3clFbG">
                               <node concept="30H73N" id="3yhgKRI8wmg" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="3yhgKRI8wmh" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og1a" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                               </node>
                             </node>
@@ -9952,7 +9954,7 @@
                                 <node concept="3clFbF" id="6zber0NI1BV" role="3cqZAp">
                                   <node concept="2OqwBi" id="6zber0NI1BW" role="3clFbG">
                                     <node concept="30H73N" id="6zber0NI1BX" role="2Oq$k0" />
-                                    <node concept="2qgKlT" id="6zber0NI1BY" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og1c" role="2OqNvi">
                                       <ref role="37wK5l" to="ha02:75vUFrSLzQL" resolve="getContainer" />
                                     </node>
                                   </node>
@@ -10073,7 +10075,7 @@
                               <node concept="3clFbF" id="6zber0NI1Wu" role="3cqZAp">
                                 <node concept="2OqwBi" id="6zber0NI1Wv" role="3clFbG">
                                   <node concept="30H73N" id="6zber0NI1Ww" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="6zber0NI1Wx" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og1e" role="2OqNvi">
                                     <ref role="37wK5l" to="ha02:75vUFrSLzQL" resolve="getContainer" />
                                   </node>
                                 </node>
@@ -10219,7 +10221,7 @@
                 <node concept="3clFbS" id="7P_FdVQp5hi" role="2VODD2">
                   <node concept="3clFbF" id="7P_FdVQp5hj" role="3cqZAp">
                     <node concept="2OqwBi" id="7P_FdVQp5hk" role="3clFbG">
-                      <node concept="2qgKlT" id="7P_FdVQp7Yf" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og1g" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                       </node>
                       <node concept="30H73N" id="7P_FdVQp5hm" role="2Oq$k0" />
@@ -10258,7 +10260,7 @@
                           <ref role="3Tt5mk" to="wq2x:34$A1Mf2w7l" resolve="extends" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="7P_FdVQpeNW" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og1i" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                       </node>
                     </node>
@@ -10410,7 +10412,7 @@
           <node concept="3clFbF" id="tbauFy4XzE" role="3cqZAp">
             <node concept="2OqwBi" id="tbauFy4XRC" role="3clFbG">
               <node concept="30H73N" id="tbauFy4XzC" role="2Oq$k0" />
-              <node concept="2qgKlT" id="tbauFyekj3" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og1k" role="2OqNvi">
                 <ref role="37wK5l" to="x5bw:tbauFy4VXH" resolve="runtimeClassName" />
               </node>
             </node>
@@ -10825,7 +10827,7 @@
                                       <ref role="3Tt5mk" to="wq2x:5itBwM7LtYS" resolve="template" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="7mIqwW51g$Q" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og1m" role="2OqNvi">
                                     <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                                   </node>
                                 </node>
@@ -11553,7 +11555,7 @@
                                       <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="7mIqwW519IZ" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og1o" role="2OqNvi">
                                     <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                                   </node>
                                 </node>
@@ -12918,7 +12920,7 @@
                                       <node concept="2OqwBi" id="vp2bUJzWwW" role="2Oq$k0">
                                         <node concept="2OqwBi" id="2BFWJjNJsLG" role="2Oq$k0">
                                           <node concept="30H73N" id="2BFWJjNJsLH" role="2Oq$k0" />
-                                          <node concept="2qgKlT" id="2BFWJjNJsLI" role="2OqNvi">
+                                          <node concept="3zqWPK" id="M_dau6Og1q" role="2OqNvi">
                                             <ref role="37wK5l" to="ha02:1HWyn8iLEDG" resolve="logicalItems" />
                                           </node>
                                         </node>
@@ -12931,7 +12933,7 @@
                                       <node concept="3QWeyG" id="2BFWJjNJsLJ" role="2OqNvi">
                                         <node concept="2OqwBi" id="2BFWJjNJsLK" role="576Qk">
                                           <node concept="30H73N" id="2BFWJjNJsLL" role="2Oq$k0" />
-                                          <node concept="2qgKlT" id="2BFWJjNJsLM" role="2OqNvi">
+                                          <node concept="3zqWPK" id="M_dau6Og1s" role="2OqNvi">
                                             <ref role="37wK5l" to="x5bw:1HWyn8iLEO1" resolve="ruleInputReferences" />
                                           </node>
                                         </node>
@@ -13132,7 +13134,7 @@
                                 <node concept="2OqwBi" id="vp2bUJ$3UT" role="2Oq$k0">
                                   <node concept="2OqwBi" id="1HWyn8iTlCe" role="2Oq$k0">
                                     <node concept="30H73N" id="1HWyn8iTlCf" role="2Oq$k0" />
-                                    <node concept="2qgKlT" id="3CulEO4y$Vr" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og1u" role="2OqNvi">
                                       <ref role="37wK5l" to="ha02:1HWyn8iLEDG" resolve="logicalItems" />
                                     </node>
                                   </node>
@@ -13145,7 +13147,7 @@
                                 <node concept="3QWeyG" id="1HWyn8iTlCh" role="2OqNvi">
                                   <node concept="2OqwBi" id="1HWyn8iTlCi" role="576Qk">
                                     <node concept="30H73N" id="1HWyn8iTlCj" role="2Oq$k0" />
-                                    <node concept="2qgKlT" id="1HWyn8iTlCk" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og1w" role="2OqNvi">
                                       <ref role="37wK5l" to="x5bw:1HWyn8iLEO1" resolve="ruleInputReferences" />
                                     </node>
                                   </node>
@@ -13165,7 +13167,7 @@
                               <node concept="3clFbF" id="2BFWJjNEXJJ" role="3cqZAp">
                                 <node concept="2OqwBi" id="2BFWJjNEXJK" role="3clFbG">
                                   <node concept="30H73N" id="2BFWJjNEXJL" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="2BFWJjNEXJM" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og1y" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:1HWyn8iQiyf" resolve="code" />
                                   </node>
                                 </node>
@@ -13191,7 +13193,7 @@
                                 <node concept="2OqwBi" id="PYgJzEsWI3" role="2Oq$k0">
                                   <node concept="2OqwBi" id="PYgJzEsWaX" role="2Oq$k0">
                                     <node concept="30H73N" id="PYgJzEsVWd" role="2Oq$k0" />
-                                    <node concept="2qgKlT" id="PYgJzEsWwG" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og1$" role="2OqNvi">
                                       <ref role="37wK5l" to="x5bw:1HWyn8iQiyf" resolve="code" />
                                     </node>
                                   </node>
@@ -13550,7 +13552,7 @@
                   <node concept="3clFbF" id="2GOEA2lV1P" role="3cqZAp">
                     <node concept="2OqwBi" id="2GOEA2lV1Q" role="3clFbG">
                       <node concept="30H73N" id="2GOEA2lV1R" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="2GOEA2lWaz" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og1A" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                       </node>
                     </node>
@@ -13916,7 +13918,7 @@
                                 <node concept="3clFbF" id="12QmIo_1bp3" role="3cqZAp">
                                   <node concept="2OqwBi" id="12QmIo_1bp4" role="3clFbG">
                                     <node concept="30H73N" id="12QmIo_1bp5" role="2Oq$k0" />
-                                    <node concept="2qgKlT" id="2J$kxDI0Mbl" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og1C" role="2OqNvi">
                                       <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                     </node>
                                   </node>
@@ -13951,7 +13953,7 @@
                                         <node concept="3clFbF" id="1vsv9tPop_1" role="3cqZAp">
                                           <node concept="2OqwBi" id="1vsv9tPopLX" role="3clFbG">
                                             <node concept="30H73N" id="1vsv9tPop_0" role="2Oq$k0" />
-                                            <node concept="2qgKlT" id="1vsv9tPoq0E" role="2OqNvi">
+                                            <node concept="3zqWPK" id="M_dau6Og1E" role="2OqNvi">
                                               <ref role="37wK5l" to="x5bw:5BtuWK5zJKH" resolve="templateName" />
                                             </node>
                                           </node>
@@ -14364,7 +14366,7 @@
                       <node concept="3clFbF" id="19q1ULB10YS" role="3cqZAp">
                         <node concept="2OqwBi" id="19q1ULB11bS" role="3clFbG">
                           <node concept="30H73N" id="19q1ULB10YR" role="2Oq$k0" />
-                          <node concept="2qgKlT" id="9UUIHKMksk" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og1G" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                           </node>
                         </node>
@@ -14418,7 +14420,7 @@
                   <node concept="3clFbF" id="5BtuWK5zLce" role="3cqZAp">
                     <node concept="2OqwBi" id="5BtuWK5zLju" role="3clFbG">
                       <node concept="30H73N" id="5BtuWK5zLcd" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="1vsv9tPosGb" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og1I" role="2OqNvi">
                         <ref role="37wK5l" to="x5bw:1vsv9tPo5GP" resolve="baseName" />
                       </node>
                     </node>
@@ -14575,7 +14577,7 @@
                 <node concept="3clFbF" id="2J$kxDHW1_G" role="3cqZAp">
                   <node concept="2OqwBi" id="2J$kxDHW1_H" role="3clFbG">
                     <node concept="30H73N" id="2J$kxDHW1_I" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="2J$kxDHW77U" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og1K" role="2OqNvi">
                       <ref role="37wK5l" to="x5bw:2J$kxDHW6DA" resolve="localContextNames" />
                     </node>
                   </node>
@@ -15268,7 +15270,7 @@
                               <node concept="3clFbF" id="5itBwM5S4x8" role="3cqZAp">
                                 <node concept="2OqwBi" id="5itBwM5S4x9" role="3clFbG">
                                   <node concept="30H73N" id="5itBwM5S4xa" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="5itBwM5S4xb" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og1M" role="2OqNvi">
                                     <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                                   </node>
                                 </node>
@@ -15436,7 +15438,7 @@
                   <node concept="3clFbF" id="5itBwM5Uikf" role="3cqZAp">
                     <node concept="2OqwBi" id="5itBwM5Uikg" role="3clFbG">
                       <node concept="30H73N" id="5itBwM5Uikj" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="5itBwM5UkYc" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og1O" role="2OqNvi">
                         <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                       </node>
                     </node>
@@ -16184,7 +16186,7 @@
                               <node concept="3clFbF" id="5itBwM6VInh" role="3cqZAp">
                                 <node concept="2OqwBi" id="5itBwM6VIni" role="3clFbG">
                                   <node concept="30H73N" id="5itBwM6VInj" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="5itBwMafU3k" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og1Q" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:5itBwMafQKm" resolve="getGenFqName" />
                                   </node>
                                 </node>
@@ -16341,7 +16343,7 @@
                   <node concept="3clFbF" id="5itBwM6XBIi" role="3cqZAp">
                     <node concept="2OqwBi" id="5itBwM6XBIj" role="3clFbG">
                       <node concept="30H73N" id="5itBwM6XBIk" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="5itBwM6XBIl" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og1S" role="2OqNvi">
                         <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                       </node>
                     </node>
@@ -16589,7 +16591,7 @@
                   <node concept="3zGtF$" id="5itBwM70tPR" role="3uHU7w" />
                   <node concept="2OqwBi" id="5itBwM70sfp" role="3uHU7B">
                     <node concept="30H73N" id="5itBwM70rXX" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="5itBwMafQ31" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og1U" role="2OqNvi">
                       <ref role="37wK5l" to="x5bw:5itBwMafHM1" resolve="getGenName" />
                     </node>
                   </node>
@@ -16625,7 +16627,7 @@
                               <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="7mIqwW51y_T" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og1W" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                           </node>
                         </node>
@@ -16767,7 +16769,7 @@
                 <node concept="2OqwBi" id="6P1UyJoUwXb" role="3clFbG">
                   <node concept="2OqwBi" id="6P1UyJoUtXB" role="2Oq$k0">
                     <node concept="30H73N" id="6P1UyJoUtBp" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="6P1UyJoUupe" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og1Y" role="2OqNvi">
                       <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                     </node>
                   </node>
@@ -16873,7 +16875,7 @@
             <node concept="3clFbF" id="5hSMZ_lNZiV" role="3cqZAp">
               <node concept="2OqwBi" id="5hSMZ_lNZiW" role="3clFbG">
                 <node concept="30H73N" id="5hSMZ_lNZiX" role="2Oq$k0" />
-                <node concept="2qgKlT" id="5hSMZ_lNZiY" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og20" role="2OqNvi">
                   <ref role="37wK5l" to="x5bw:4MEOIDG83_h" resolve="runtimeClassName" />
                 </node>
               </node>
@@ -16899,7 +16901,7 @@
           <node concept="3clFbF" id="JOGAOt0z9n" role="3cqZAp">
             <node concept="2OqwBi" id="JOGAOt0zo0" role="3clFbG">
               <node concept="30H73N" id="JOGAOt0z9m" role="2Oq$k0" />
-              <node concept="2qgKlT" id="JOGAOt0_6U" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og22" role="2OqNvi">
                 <ref role="37wK5l" to="x5bw:5hSMZ_lRESV" resolve="runtimeClassName" />
               </node>
             </node>
@@ -16968,7 +16970,7 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="4boCUQu3lgc" role="2OqNvi">
+                                      <node concept="3zqWPK" id="M_dau6Og24" role="2OqNvi">
                                         <ref role="37wK5l" to="x5bw:4boCUQu3izb" resolve="isPattern" />
                                       </node>
                                     </node>
@@ -17056,7 +17058,7 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="JOGAOsGXNz" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og26" role="2OqNvi">
                                       <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
                                     </node>
                                   </node>
@@ -17100,7 +17102,7 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="2qgKlT" id="4boCUQu_Bxh" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og28" role="2OqNvi">
                                 <ref role="37wK5l" to="x5bw:4boCUQu3izb" resolve="isPattern" />
                               </node>
                             </node>
@@ -17136,7 +17138,7 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="JOGAOsGYCo" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og2a" role="2OqNvi">
                               <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
                             </node>
                           </node>
@@ -17250,7 +17252,7 @@
                     <ref role="v9R2y" node="4lCLOtwvFAX" resolve="term_builder" />
                     <node concept="2OqwBi" id="4vr5SApfugf" role="v9R3O">
                       <node concept="30H73N" id="4vr5SApftWD" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="4vr5SApfuvX" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og2c" role="2OqNvi">
                         <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                       </node>
                     </node>
@@ -17371,7 +17373,7 @@
                             <node concept="3clFbS" id="4APe_wKgWQG" role="2VODD2">
                               <node concept="3clFbF" id="4APe_wKgWQH" role="3cqZAp">
                                 <node concept="2OqwBi" id="4APe_wKgWQI" role="3clFbG">
-                                  <node concept="2qgKlT" id="4APe_wKgWQJ" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og2e" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:7c96q9t$Nk0" resolve="symbol" />
                                   </node>
                                   <node concept="30H73N" id="4APe_wKgWQK" role="2Oq$k0" />
@@ -17404,7 +17406,7 @@
                             <node concept="3clFbF" id="4APe_wKgWQU" role="3cqZAp">
                               <node concept="2OqwBi" id="4APe_wKgWQV" role="3clFbG">
                                 <node concept="30H73N" id="4APe_wKgWQW" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="4APe_wKgWQX" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og2g" role="2OqNvi">
                                   <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
                                 </node>
                               </node>
@@ -17443,7 +17445,7 @@
                             <node concept="3clFbF" id="4APe_wKh518" role="3cqZAp">
                               <node concept="2OqwBi" id="4APe_wKh51a" role="3clFbG">
                                 <node concept="30H73N" id="4APe_wKh51b" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="4APe_wKh51c" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og2i" role="2OqNvi">
                                   <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="allChildFeatures" />
                                 </node>
                               </node>
@@ -17571,7 +17573,7 @@
                             <node concept="3clFbS" id="4lCLOtwwaTM" role="2VODD2">
                               <node concept="3clFbF" id="4lCLOtwwaTN" role="3cqZAp">
                                 <node concept="2OqwBi" id="4lCLOtwwaTO" role="3clFbG">
-                                  <node concept="2qgKlT" id="4lCLOtwwaTP" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og2k" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:7c96q9t$Nk0" resolve="symbol" />
                                   </node>
                                   <node concept="30H73N" id="4lCLOtwwaTQ" role="2Oq$k0" />
@@ -17604,7 +17606,7 @@
                             <node concept="3clFbF" id="4lCLOtwwaTV" role="3cqZAp">
                               <node concept="2OqwBi" id="4lCLOtwwaTW" role="3clFbG">
                                 <node concept="30H73N" id="4lCLOtwwaTX" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="4lCLOtwwaTY" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og2m" role="2OqNvi">
                                   <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
                                 </node>
                               </node>
@@ -17643,7 +17645,7 @@
                             <node concept="3clFbF" id="4lCLOtwwaUf" role="3cqZAp">
                               <node concept="2OqwBi" id="4lCLOtwwaUg" role="3clFbG">
                                 <node concept="30H73N" id="4lCLOtwwaUh" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="4lCLOtwwaUi" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og2o" role="2OqNvi">
                                   <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="allChildFeatures" />
                                 </node>
                               </node>
@@ -19162,7 +19164,7 @@
           <node concept="3clFbF" id="tbauFy4SwP" role="3cqZAp">
             <node concept="2OqwBi" id="tbauFy4SO6" role="3clFbG">
               <node concept="30H73N" id="tbauFy4SwN" role="2Oq$k0" />
-              <node concept="2qgKlT" id="tbauFy4Tbc" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og2q" role="2OqNvi">
                 <ref role="37wK5l" to="x5bw:tbauFy4RSM" resolve="runtimeClassName" />
               </node>
             </node>
@@ -19214,7 +19216,7 @@
                     <node concept="3clFbS" id="tbauFy5Jg3" role="2VODD2">
                       <node concept="3clFbF" id="tbauFy5Jg4" role="3cqZAp">
                         <node concept="2OqwBi" id="tbauFy5Jg5" role="3clFbG">
-                          <node concept="2qgKlT" id="tbauFy5Jg6" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og2s" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                           </node>
                           <node concept="30H73N" id="tbauFy5Jg7" role="2Oq$k0" />
@@ -19685,7 +19687,7 @@
               <node concept="3clFbF" id="tbauFy5aw0" role="3cqZAp">
                 <node concept="2OqwBi" id="tbauFy5aJ4" role="3clFbG">
                   <node concept="30H73N" id="tbauFy5avZ" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="tbauFy5bQF" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og2u" role="2OqNvi">
                     <ref role="37wK5l" to="x5bw:tbauFy5b4S" resolve="runtimeClassName" />
                   </node>
                 </node>
@@ -20648,7 +20650,7 @@
               <node concept="2OqwBi" id="sL9MTQ$jzy" role="3uHU7w">
                 <node concept="2OqwBi" id="sL9MTQ$h5M" role="2Oq$k0">
                   <node concept="30H73N" id="sL9MTQ$gvJ" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="sL9MTQ$iYD" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og2w" role="2OqNvi">
                     <ref role="37wK5l" to="tpek:4_LVZ3pBKCn" resolve="methods" />
                   </node>
                 </node>
@@ -20729,7 +20731,7 @@
                             <node concept="37vLTw" id="sL9MTQxoGM" role="2Oq$k0">
                               <ref role="3cqZAo" node="sL9MTQxoGE" resolve="cc" />
                             </node>
-                            <node concept="2qgKlT" id="sL9MTQxoGN" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og2y" role="2OqNvi">
                               <ref role="37wK5l" to="tpek:4_LVZ3pCvsd" resolve="constructors" />
                             </node>
                           </node>
@@ -20781,7 +20783,7 @@
                     <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="75vUFrSLPCp" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og2$" role="2OqNvi">
                   <ref role="37wK5l" to="ha02:75vUFrSLzQL" resolve="getContainer" />
                 </node>
               </node>
@@ -20816,7 +20818,7 @@
                       <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
                     </node>
                   </node>
-                  <node concept="2qgKlT" id="2BFWJjO7Qec" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og2A" role="2OqNvi">
                     <ref role="37wK5l" to="ha02:75vUFrSLzQL" resolve="getContainer" />
                   </node>
                 </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index f5771b88..f7bdecd0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -38,7 +38,7 @@
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
@@ -102,7 +102,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 4607f642..21eb69fc 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
@@ -39,6 +39,7 @@
         <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
       </concept>
       <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
@@ -170,7 +171,6 @@
       <concept id="1803469493727536395" name="jetbrains.mps.lang.smodel.structure.OperationParm_StopConceptList" flags="ng" index="hTh3S">
         <child id="1803469493727536396" name="concept" index="hTh3Z" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -475,9 +475,9 @@
                     <ref role="3Tt5mk" to="wq2x:5itBwM9Rt6C" resolve="extends" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="WJTIInTj6x" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6OfZO" role="2OqNvi">
                   <ref role="37wK5l" node="WJTIInTj6e" resolve="collectExtends" />
-                  <node concept="37vLTw" id="WJTIInTj6y" role="37wK5m">
+                  <node concept="37vLTw" id="M_dau6OfZQ" role="37wK5m">
                     <ref role="3cqZAo" node="WJTIInTj6f" resolve="collection" />
                   </node>
                 </node>
@@ -538,7 +538,7 @@
             </node>
             <node concept="2OqwBi" id="4MEOIDG8iCA" role="3uHU7w">
               <node concept="13iPFW" id="4MEOIDG879_" role="2Oq$k0" />
-              <node concept="2qgKlT" id="4MEOIDG8j4c" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OfZR" role="2OqNvi">
                 <ref role="37wK5l" node="4MEOIDG8goY" resolve="runtimeClassName" />
               </node>
             </node>
@@ -695,7 +695,7 @@
             <node concept="2OqwBi" id="7lt0LtPIy7q" role="33vP2m">
               <node concept="2OqwBi" id="7lt0LtPIy7r" role="2Oq$k0">
                 <node concept="13iPFW" id="7lt0LtPIy7s" role="2Oq$k0" />
-                <node concept="2qgKlT" id="7lt0LtPIyEE" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6OfZT" role="2OqNvi">
                   <ref role="37wK5l" node="36tQV5ArDPR" resolve="allComponents" />
                 </node>
               </node>
@@ -707,7 +707,7 @@
                         <node concept="37vLTw" id="7lt0LtPIy7z" role="2Oq$k0">
                           <ref role="3cqZAo" node="6E5fMGvfKKZ" resolve="hd" />
                         </node>
-                        <node concept="2qgKlT" id="5TXeSYSxOKn" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6OfZV" role="2OqNvi">
                           <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                         </node>
                       </node>
@@ -743,7 +743,7 @@
                           <node concept="37vLTw" id="4beNoh2thn8" role="2Oq$k0">
                             <ref role="3cqZAo" node="6E5fMGvfKL1" resolve="it" />
                           </node>
-                          <node concept="2qgKlT" id="4beNoh2thn9" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6OfZX" role="2OqNvi">
                             <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                           </node>
                         </node>
@@ -873,7 +873,7 @@
               <node concept="37vLTw" id="1vsv9tPobF9" role="2Oq$k0">
                 <ref role="3cqZAo" node="6xVZN2upvmU" resolve="ruleTemplate" />
               </node>
-              <node concept="2qgKlT" id="9UUIHKbGjl" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OfZZ" role="2OqNvi">
                 <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
               </node>
             </node>
@@ -1181,9 +1181,9 @@
                     <ref role="3Tt5mk" to="wq2x:34$A1Mf2w7l" resolve="extends" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="34$A1Mf3M7T" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og01" role="2OqNvi">
                   <ref role="37wK5l" node="34$A1Mf3_Zj" resolve="collectExtends" />
-                  <node concept="37vLTw" id="34$A1Mf3MhN" role="37wK5m">
+                  <node concept="37vLTw" id="M_dau6Og03" role="37wK5m">
                     <ref role="3cqZAo" node="34$A1Mf3DIf" resolve="collection" />
                   </node>
                 </node>
@@ -1244,7 +1244,7 @@
             </node>
             <node concept="2OqwBi" id="tbauFy4VY4" role="3uHU7w">
               <node concept="13iPFW" id="tbauFy4VY5" role="2Oq$k0" />
-              <node concept="2qgKlT" id="tbauFy4W_3" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og04" role="2OqNvi">
                 <ref role="37wK5l" node="tbauFy4VXH" resolve="runtimeClassName" />
               </node>
             </node>
@@ -1668,7 +1668,7 @@
             <node concept="3cpWs6" id="7_a$FDO3nYg" role="3cqZAp">
               <node concept="2OqwBi" id="7_a$FDO3olz" role="3cqZAk">
                 <node concept="13iPFW" id="7_a$FDO3o9B" role="2Oq$k0" />
-                <node concept="2qgKlT" id="5itBwMafSte" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og06" role="2OqNvi">
                   <ref role="37wK5l" node="5itBwMafHM1" resolve="getGenName" />
                 </node>
               </node>
@@ -1699,7 +1699,7 @@
             <node concept="3cpWs6" id="hEwIO9K" role="3cqZAp">
               <node concept="2OqwBi" id="hEwIO9L" role="3cqZAk">
                 <node concept="13iPFW" id="hEwIO9M" role="2Oq$k0" />
-                <node concept="2qgKlT" id="5itBwMafTfX" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og08" role="2OqNvi">
                   <ref role="37wK5l" node="5itBwMafHM1" resolve="getGenName" />
                 </node>
               </node>
@@ -1729,7 +1729,7 @@
           <node concept="3cpWs3" id="hEwIO9U" role="3cqZAk">
             <node concept="2OqwBi" id="hEwIO9V" role="3uHU7w">
               <node concept="13iPFW" id="hEwIO9W" role="2Oq$k0" />
-              <node concept="2qgKlT" id="5itBwMafTv7" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og0a" role="2OqNvi">
                 <ref role="37wK5l" node="5itBwMafHM1" resolve="getGenName" />
               </node>
             </node>
@@ -2187,7 +2187,7 @@
                     <node concept="1mfA1w" id="5itBwM6TAWq" role="2OqNvi" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="5itBwM6TAWr" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og0c" role="2OqNvi">
                   <ref role="37wK5l" node="4MEOIDG8goY" resolve="runtimeClassName" />
                 </node>
               </node>
@@ -2197,7 +2197,7 @@
             </node>
             <node concept="2OqwBi" id="5itBwM6TJq5" role="3uHU7w">
               <node concept="13iPFW" id="5itBwM6TAWu" role="2Oq$k0" />
-              <node concept="2qgKlT" id="5itBwM6TKrG" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og0e" role="2OqNvi">
                 <ref role="37wK5l" node="5itBwM6SJm6" resolve="runtimeClassName" />
               </node>
             </node>
@@ -2226,7 +2226,7 @@
             </node>
             <node concept="2OqwBi" id="5itBwM6U7Qf" role="3uHU7w">
               <node concept="13iPFW" id="5itBwM6U7Qg" role="2Oq$k0" />
-              <node concept="2qgKlT" id="5itBwM6UapF" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og0g" role="2OqNvi">
                 <ref role="37wK5l" node="5itBwM6TAWc" resolve="runtimeClassLongName" />
               </node>
             </node>
@@ -2363,7 +2363,7 @@
                 <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
               </node>
             </node>
-            <node concept="2qgKlT" id="7c96q9tIw7_" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og0i" role="2OqNvi">
               <ref role="37wK5l" node="5UYwY$H7MGm" resolve="valueFeatures" />
             </node>
           </node>
@@ -2387,7 +2387,7 @@
                 <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
               </node>
             </node>
-            <node concept="2qgKlT" id="3Co8b0rO8iC" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og0k" role="2OqNvi">
               <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
             </node>
           </node>
@@ -2411,7 +2411,7 @@
                 <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
               </node>
             </node>
-            <node concept="2qgKlT" id="3Co8b0rO98g" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og0m" role="2OqNvi">
               <ref role="37wK5l" node="3Co8b0rNyy5" resolve="listFeatures" />
             </node>
           </node>
@@ -2436,7 +2436,7 @@
                   <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="7c96q9tLmeG" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og0o" role="2OqNvi">
                 <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
               </node>
             </node>
@@ -2448,7 +2448,7 @@
                     <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="3Co8b0rO8gg" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og0q" role="2OqNvi">
                   <ref role="37wK5l" node="3Co8b0rNyy5" resolve="listFeatures" />
                 </node>
               </node>
@@ -2499,7 +2499,7 @@
                     </node>
                   </node>
                 </node>
-                <node concept="2qgKlT" id="JOGAOsXW3x" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og0s" role="2OqNvi">
                   <ref role="37wK5l" node="5hSMZ_lRET5" resolve="runtimeClassFqName" />
                 </node>
               </node>
@@ -2657,7 +2657,7 @@
             </node>
             <node concept="2OqwBi" id="5hSMZ_lRETi" role="3uHU7w">
               <node concept="13iPFW" id="5hSMZ_lRETj" role="2Oq$k0" />
-              <node concept="2qgKlT" id="5hSMZ_lRETk" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og0u" role="2OqNvi">
                 <ref role="37wK5l" node="5hSMZ_lRESV" resolve="runtimeClassName" />
               </node>
             </node>
@@ -2877,7 +2877,7 @@
             </node>
             <node concept="2OqwBi" id="tbauFy4UyZ" role="3uHU7w">
               <node concept="13iPFW" id="tbauFy4Uz0" role="2Oq$k0" />
-              <node concept="2qgKlT" id="tbauFy4UL1" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og0w" role="2OqNvi">
                 <ref role="37wK5l" node="tbauFy4RSM" resolve="runtimeClassName" />
               </node>
             </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index a2d0e20a..06ff71f9 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -27,6 +27,9 @@
     <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -211,7 +214,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
@@ -787,7 +789,7 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="34$A1Mf4Hzk" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og0y" role="2OqNvi">
                             <ref role="37wK5l" to="x5bw:34$A1Mf3_WJ" resolve="handlerClosure" />
                           </node>
                         </node>
@@ -1770,7 +1772,7 @@
                   <node concept="37vLTw" id="6P1UyJpkirm" role="2Oq$k0">
                     <ref role="3cqZAo" node="6fXjIfxgfU4" resolve="dfd" />
                   </node>
-                  <node concept="2qgKlT" id="6P1UyJpkjTn" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og0$" role="2OqNvi">
                     <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                   </node>
                 </node>
@@ -1901,7 +1903,7 @@
                           <node concept="37vLTw" id="7LI_gNMotJ3" role="2Oq$k0">
                             <ref role="3cqZAo" node="7LI_gNMomFg" resolve="tt" />
                           </node>
-                          <node concept="2qgKlT" id="7LI_gNMotJ4" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og0A" role="2OqNvi">
                             <ref role="37wK5l" to="x5bw:7LI_gNMl5fZ" resolve="extendsStack" />
                           </node>
                         </node>
@@ -2187,7 +2189,7 @@
                             <node concept="37vLTw" id="554EtBItpqk" role="2Oq$k0">
                               <ref role="3cqZAo" node="554EtBIsJPq" resolve="owner" />
                             </node>
-                            <node concept="2qgKlT" id="554EtBItpql" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og0C" role="2OqNvi">
                               <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                             </node>
                           </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index fd9fc9e0..94eff0c4 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:3345f3eb-f61a-42bd-88eb-d9032a80e9a6(jetbrains.mps.lang.coderules.editor)">
   <persistence version="9" />
   <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -32,6 +32,9 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1402906326896143883" name="jetbrains.mps.lang.editor.structure.CellKeyMap_FunctionParm_selectedNode" flags="nn" index="0GJ7k" />
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
@@ -526,7 +529,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
         <child id="1138662048170" name="value" index="tz02z" />
       </concept>
@@ -6113,7 +6115,7 @@
                         <node concept="37vLTw" id="7LI_gNMoPjr" role="2Oq$k0">
                           <ref role="3cqZAo" node="7LI_gNMomFg" resolve="tt" />
                         </node>
-                        <node concept="2qgKlT" id="7LI_gNMoPjs" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og0E" role="2OqNvi">
                           <ref role="37wK5l" to="x5bw:7LI_gNMl5fZ" resolve="extendsStack" />
                         </node>
                       </node>
@@ -8713,7 +8715,7 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="2qgKlT" id="34$A1Mf4Hzk" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og0G" role="2OqNvi">
                     <ref role="37wK5l" to="x5bw:34$A1Mf3_WJ" resolve="handlerClosure" />
                   </node>
                 </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
index 9cfe10e1..f6c4d83e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
@@ -20,6 +20,9 @@
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
@@ -141,7 +144,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -997,7 +999,7 @@
           <node concept="3fqX7Q" id="3swcsd3tmIk" role="3clFbG">
             <node concept="2OqwBi" id="3swcsd3tmIm" role="3fr31v">
               <node concept="2Sf5sV" id="3swcsd3tmIn" role="2Oq$k0" />
-              <node concept="2qgKlT" id="3swcsd3tmIo" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og0I" role="2OqNvi">
                 <ref role="37wK5l" to="x5bw:3swcsd3qHV7" resolve="isConsistentParameters" />
               </node>
             </node>
@@ -1176,7 +1178,7 @@
           <node concept="3fqX7Q" id="3swcsd3tjHc" role="3clFbG">
             <node concept="2OqwBi" id="3swcsd3tjHe" role="3fr31v">
               <node concept="2Sf5sV" id="3swcsd3tjHf" role="2Oq$k0" />
-              <node concept="2qgKlT" id="3swcsd3tjHg" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og0K" role="2OqNvi">
                 <ref role="37wK5l" to="x5bw:3swcsd3qO$G" resolve="isConsistentLogicals" />
               </node>
             </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 9473dfb0..c80f60cc 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -7,7 +7,7 @@
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index 770d654f..832a8627 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -24,6 +24,9 @@
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -205,7 +208,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
@@ -1456,7 +1458,7 @@
                     <node concept="1YBJjd" id="5EDW3XEbJPj" role="2Oq$k0">
                       <ref role="1YBMHb" node="5EDW3XEbJHY" resolve="qp" />
                     </node>
-                    <node concept="2qgKlT" id="5EDW3XEbKPs" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og0M" role="2OqNvi">
                       <ref role="37wK5l" to="x5bw:5EDW3XEbK7c" resolve="getQueryTemplate" />
                     </node>
                   </node>
@@ -1505,7 +1507,7 @@
             <node concept="1YBJjd" id="3swcsd3tw2a" role="2Oq$k0">
               <ref role="1YBMHb" node="3swcsd1zSIb" resolve="expandMacroTemplate" />
             </node>
-            <node concept="2qgKlT" id="3swcsd3tw2b" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og0O" role="2OqNvi">
               <ref role="37wK5l" to="x5bw:3swcsd3qHV7" resolve="isConsistentParameters" />
             </node>
           </node>
@@ -1530,7 +1532,7 @@
             <node concept="1YBJjd" id="3swcsd3tw6G" role="2Oq$k0">
               <ref role="1YBMHb" node="3swcsd1zSIb" resolve="expandMacroTemplate" />
             </node>
-            <node concept="2qgKlT" id="3swcsd3tw6H" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og0Q" role="2OqNvi">
               <ref role="37wK5l" to="x5bw:3swcsd3qO$G" resolve="isConsistentLogicals" />
             </node>
           </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
index 05c65f49..7ce2b2b9 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
@@ -2,7 +2,7 @@
 <model ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)">
   <persistence version="9" />
   <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
index 7e24a512..95850ae7 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
@@ -24,7 +24,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
index 6ffa755b..fe07b8a1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -243,30 +243,24 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="2546654756694997551" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTag" flags="ng" index="92FcH">
-        <child id="2546654756694997556" name="reference" index="92FcQ" />
-        <child id="3106559687488913694" name="line" index="2XjZqd" />
-      </concept>
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      <concept id="6971016359099800069" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldSingleCommentLine" flags="ngI" index="2JaDLO">
+        <child id="6971016359099801474" name="commentBody" index="2JaDBN" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="2217234381367049075" name="jetbrains.mps.baseLanguage.javadoc.structure.CodeInlineDocTag" flags="ng" index="VVOAv">
-        <child id="3106559687488741665" name="line" index="2Xj1qM" />
-      </concept>
       <concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
         <reference id="2217234381367530213" name="classifier" index="VXe09" />
       </concept>
-      <concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
-        <child id="6962838954693749192" name="tag" index="qph3F" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
+      <concept id="5085607816306582224" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentTextElement" flags="ng" index="1Vtdud">
+        <child id="5085607816306582225" name="tag" index="1Vtduc" />
+      </concept>
+      <concept id="5085607816306633585" name="jetbrains.mps.baseLanguage.javadoc.structure.CodeInlineDocTagTE" flags="ng" index="1VuTSG" />
+      <concept id="5085607816306647746" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTagTE" flags="ng" index="1VuXuv">
+        <child id="5085607816306647747" name="reference" index="1VuXuu" />
+      </concept>
     </language>
     <language id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences">
       <concept id="7915009415671748557" name="jetbrains.mps.baseLanguage.methodReferences.structure.MethodReferenceTypeTargetExpression" flags="ng" index="2FaPjH">
@@ -445,9 +439,45 @@
       <node concept="3Tm1VV" id="6nx4rRkLZrc" role="1B3o_S" />
       <node concept="3clFbS" id="6nx4rRkLZrd" role="3clF47" />
       <node concept="P$JXv" id="6nx4rRkLZs6" role="lGtFl">
-        <node concept="TZ5HA" id="6nx4rRkLZs7" role="TZ5H$">
-          <node concept="1dT_AC" id="6nx4rRkLZs8" role="1dT_Ay">
-            <property role="1dT_AB" value="A &quot;sidekick&quot; is a language that contributes some aspect(s) to the &quot;authority&quot; language. " />
+        <node concept="1PaTwC" id="M_dau6Oge2" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oge3" role="1PaTwD">
+            <property role="3oM_SC" value="A" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oge4" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;sidekick&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oge5" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oge6" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oge7" role="1PaTwD">
+            <property role="3oM_SC" value="language" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oge8" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oge9" role="1PaTwD">
+            <property role="3oM_SC" value="contributes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogea" role="1PaTwD">
+            <property role="3oM_SC" value="some" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogeb" role="1PaTwD">
+            <property role="3oM_SC" value="aspect(s)" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogec" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oged" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogee" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;authority&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogef" role="1PaTwD">
+            <property role="3oM_SC" value="language." />
           </node>
         </node>
       </node>
@@ -1271,19 +1301,79 @@
         </node>
       </node>
       <node concept="P$JXv" id="4nDRG5$35Vi" role="lGtFl">
-        <node concept="TZ5HA" id="4nDRG5$3I9r" role="TZ5H$">
-          <node concept="1dT_AC" id="4nDRG5$3I9s" role="1dT_Ay">
-            <property role="1dT_AB" value="Discover aspects that belong to " />
+        <node concept="1PaTwC" id="M_dau6Ogeg" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogeh" role="1PaTwD">
+            <property role="3oM_SC" value="Discover" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogei" role="1PaTwD">
+            <property role="3oM_SC" value="aspects" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogej" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogek" role="1PaTwD">
+            <property role="3oM_SC" value="belong" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogel" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
           </node>
         </node>
-        <node concept="TZ5HA" id="4nDRG5$3I9t" role="TZ5H$">
-          <node concept="1dT_AC" id="4nDRG5$3I9u" role="1dT_Ay">
-            <property role="1dT_AB" value="the language(s) that define the concepts of nodes" />
+        <node concept="1PaTwC" id="M_dau6Ogem" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogen" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogeo" role="1PaTwD">
+            <property role="3oM_SC" value="language(s)" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogep" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogeq" role="1PaTwD">
+            <property role="3oM_SC" value="define" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oger" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oges" role="1PaTwD">
+            <property role="3oM_SC" value="concepts" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oget" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogeu" role="1PaTwD">
+            <property role="3oM_SC" value="nodes" />
           </node>
         </node>
-        <node concept="TZ5HA" id="4nDRG5$3I9v" role="TZ5H$">
-          <node concept="1dT_AC" id="4nDRG5$3I9w" role="1dT_Ay">
-            <property role="1dT_AB" value="and languages imported by a model of the first node." />
+        <node concept="1PaTwC" id="M_dau6Ogev" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogew" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogex" role="1PaTwD">
+            <property role="3oM_SC" value="languages" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogey" role="1PaTwD">
+            <property role="3oM_SC" value="imported" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogez" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oge$" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oge_" role="1PaTwD">
+            <property role="3oM_SC" value="model" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeA" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeB" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeC" role="1PaTwD">
+            <property role="3oM_SC" value="first" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeD" role="1PaTwD">
+            <property role="3oM_SC" value="node." />
           </node>
         </node>
       </node>
@@ -1315,9 +1405,42 @@
       </node>
       <node concept="3Tm1VV" id="4nDRG5$48w0" role="1B3o_S" />
       <node concept="P$JXv" id="4nDRG5$48w1" role="lGtFl">
-        <node concept="TZ5HA" id="4nDRG5$48w2" role="TZ5H$">
-          <node concept="1dT_AC" id="4nDRG5$48w3" role="1dT_Ay">
-            <property role="1dT_AB" value="Discover aspects that belong to languages that are imported in the model." />
+        <node concept="1PaTwC" id="M_dau6OgeE" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgeF" role="1PaTwD">
+            <property role="3oM_SC" value="Discover" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeG" role="1PaTwD">
+            <property role="3oM_SC" value="aspects" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeH" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeI" role="1PaTwD">
+            <property role="3oM_SC" value="belong" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeJ" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeK" role="1PaTwD">
+            <property role="3oM_SC" value="languages" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeL" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeM" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeN" role="1PaTwD">
+            <property role="3oM_SC" value="imported" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeO" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeP" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeQ" role="1PaTwD">
+            <property role="3oM_SC" value="model." />
           </node>
         </node>
       </node>
@@ -3550,9 +3673,45 @@
         </node>
       </node>
       <node concept="P$JXv" id="3KN3A4uUhu7" role="lGtFl">
-        <node concept="TZ5HA" id="3KN3A4uUhu8" role="TZ5H$">
-          <node concept="1dT_AC" id="3KN3A4uUhu9" role="1dT_Ay">
-            <property role="1dT_AB" value="List of aspects in this clique sorted from most specific to most abstract." />
+        <node concept="1PaTwC" id="M_dau6OgeR" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgeS" role="1PaTwD">
+            <property role="3oM_SC" value="List" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeT" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeU" role="1PaTwD">
+            <property role="3oM_SC" value="aspects" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeV" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeW" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeX" role="1PaTwD">
+            <property role="3oM_SC" value="clique" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeY" role="1PaTwD">
+            <property role="3oM_SC" value="sorted" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgeZ" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogf0" role="1PaTwD">
+            <property role="3oM_SC" value="most" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogf1" role="1PaTwD">
+            <property role="3oM_SC" value="specific" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogf2" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogf3" role="1PaTwD">
+            <property role="3oM_SC" value="most" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogf4" role="1PaTwD">
+            <property role="3oM_SC" value="abstract." />
           </node>
         </node>
       </node>
@@ -3849,37 +4008,83 @@
         </node>
       </node>
       <node concept="P$JXv" id="5Zr$fBYVzg_" role="lGtFl">
-        <node concept="TZ5HA" id="5Zr$fBYVzgA" role="TZ5H$">
-          <node concept="1dT_AC" id="5Zr$fBYVzgB" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns an instance of " />
+        <node concept="1PaTwC" id="M_dau6Ogf5" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogf6" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
           </node>
-          <node concept="1dT_AA" id="5Zr$fBYVzPl" role="1dT_Ay">
-            <node concept="92FcH" id="5Zr$fBYVzPF" role="qph3F">
-              <node concept="TZ5HA" id="5Zr$fBYVzPH" role="2XjZqd" />
-              <node concept="VXe08" id="5Zr$fBYV$wn" role="92FcQ">
+          <node concept="3oM_SD" id="M_dau6Ogf7" role="1PaTwD">
+            <property role="3oM_SC" value="an" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogf8" role="1PaTwD">
+            <property role="3oM_SC" value="instance" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogf9" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6Ogfa" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6Ogfb" role="1Vtduc">
+              <node concept="VXe08" id="5Zr$fBYV$wn" role="1VuXuu">
                 <ref role="VXe09" node="3KN3A4uUhmW" resolve="AspectClique" />
               </node>
-            </node>
-          </node>
-          <node concept="1dT_AC" id="5Zr$fBYVzPk" role="1dT_Ay">
-            <property role="1dT_AB" value=" that corresponds to only those languages" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="5Zr$fBYV$Ob" role="TZ5H$">
-          <node concept="1dT_AC" id="5Zr$fBYV$Oc" role="1dT_Ay">
-            <property role="1dT_AB" value="from " />
-          </node>
-          <node concept="1dT_AA" id="5Zr$fBYV_MM" role="1dT_Ay">
-            <node concept="VVOAv" id="5Zr$fBYV_N8" role="qph3F">
-              <node concept="TZ5HA" id="5Zr$fBYV_Na" role="2Xj1qM">
-                <node concept="1dT_AC" id="5Zr$fBYV_Nu" role="1dT_Ay">
-                  <property role="1dT_AB" value="usedLanguages" />
+              <node concept="1PaTwC" id="M_dau6Ogfe" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6Ogff" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="5Zr$fBYV_ML" role="1dT_Ay">
-            <property role="1dT_AB" value=" that are already included in this one. " />
+          <node concept="3oM_SD" id="M_dau6Ogfg" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfh" role="1PaTwD">
+            <property role="3oM_SC" value="corresponds" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfi" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfj" role="1PaTwD">
+            <property role="3oM_SC" value="only" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfk" role="1PaTwD">
+            <property role="3oM_SC" value="those" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfl" role="1PaTwD">
+            <property role="3oM_SC" value="languages" />
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6Ogfm" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogfn" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6Ogfo" role="1PaTwD">
+            <node concept="1VuTSG" id="M_dau6Ogfp" role="1Vtduc">
+              <node concept="1PaTwC" id="M_dau6Ogfs" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6Ogft" role="1PaTwD">
+                  <property role="3oM_SC" value="usedLanguages" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfu" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfv" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfw" role="1PaTwD">
+            <property role="3oM_SC" value="already" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfx" role="1PaTwD">
+            <property role="3oM_SC" value="included" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfy" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogfz" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogf$" role="1PaTwD">
+            <property role="3oM_SC" value="one." />
           </node>
         </node>
       </node>
@@ -3908,9 +4113,18 @@
         </node>
       </node>
       <node concept="P$JXv" id="5Zr$fBYEXYU" role="lGtFl">
-        <node concept="TZ5HA" id="5Zr$fBYF9Mg" role="TZ5H$">
-          <node concept="1dT_AC" id="5Zr$fBYF9Mh" role="1dT_Ay">
-            <property role="1dT_AB" value="Used only from tests." />
+        <node concept="1PaTwC" id="M_dau6Ogf_" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgfA" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfB" role="1PaTwD">
+            <property role="3oM_SC" value="only" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfC" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfD" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
           </node>
         </node>
       </node>
@@ -4061,14 +4275,68 @@
         </node>
       </node>
       <node concept="P$JXv" id="4nDRG5_LDES" role="lGtFl">
-        <node concept="TZ5HA" id="4nDRG5_LDET" role="TZ5H$">
-          <node concept="1dT_AC" id="4nDRG5_LDEU" role="1dT_Ay">
-            <property role="1dT_AB" value="The list of aspects is expected to be topologically sorted from more specific to more abstract" />
+        <node concept="1PaTwC" id="M_dau6OgfE" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgfF" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfG" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfH" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfI" role="1PaTwD">
+            <property role="3oM_SC" value="aspects" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfJ" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfK" role="1PaTwD">
+            <property role="3oM_SC" value="expected" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfL" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfM" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfN" role="1PaTwD">
+            <property role="3oM_SC" value="topologically" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfO" role="1PaTwD">
+            <property role="3oM_SC" value="sorted" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfP" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfQ" role="1PaTwD">
+            <property role="3oM_SC" value="more" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfR" role="1PaTwD">
+            <property role="3oM_SC" value="specific" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfS" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfT" role="1PaTwD">
+            <property role="3oM_SC" value="more" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfU" role="1PaTwD">
+            <property role="3oM_SC" value="abstract" />
           </node>
         </node>
-        <node concept="TZ5HA" id="4nDRG5_LPDR" role="TZ5H$">
-          <node concept="1dT_AC" id="4nDRG5_LPDS" role="1dT_Ay">
-            <property role="1dT_AB" value="according to extends relationship." />
+        <node concept="1PaTwC" id="M_dau6OgfV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgfW" role="1PaTwD">
+            <property role="3oM_SC" value="according" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfX" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfY" role="1PaTwD">
+            <property role="3oM_SC" value="extends" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgfZ" role="1PaTwD">
+            <property role="3oM_SC" value="relationship." />
           </node>
         </node>
       </node>
@@ -4179,9 +4447,51 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="3KN3A4uUhvw" role="lGtFl">
-      <node concept="TZ5HA" id="3KN3A4uUhvx" role="TZ5H$">
-        <node concept="1dT_AC" id="3KN3A4uUhvy" role="1dT_Ay">
-          <property role="1dT_AB" value="A &quot;clique&quot; is a collection of interrelated aspects coming from languages that have &quot;extends&quot; relationships." />
+      <node concept="1PaTwC" id="M_dau6OgdM" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgdN" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdO" role="1PaTwD">
+          <property role="3oM_SC" value="&quot;clique&quot;" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdP" role="1PaTwD">
+          <property role="3oM_SC" value="is" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdQ" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdR" role="1PaTwD">
+          <property role="3oM_SC" value="collection" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdS" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdT" role="1PaTwD">
+          <property role="3oM_SC" value="interrelated" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdU" role="1PaTwD">
+          <property role="3oM_SC" value="aspects" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdV" role="1PaTwD">
+          <property role="3oM_SC" value="coming" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdW" role="1PaTwD">
+          <property role="3oM_SC" value="from" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdX" role="1PaTwD">
+          <property role="3oM_SC" value="languages" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdY" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgdZ" role="1PaTwD">
+          <property role="3oM_SC" value="have" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oge0" role="1PaTwD">
+          <property role="3oM_SC" value="&quot;extends&quot;" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oge1" role="1PaTwD">
+          <property role="3oM_SC" value="relationships." />
         </node>
       </node>
     </node>
@@ -4431,9 +4741,30 @@
         </node>
       </node>
       <node concept="P$JXv" id="3KN3A4uY2Ly" role="lGtFl">
-        <node concept="TZ5HA" id="5Zr$fBYIGrw" role="TZ5H$">
-          <node concept="1dT_AC" id="5Zr$fBYIGrx" role="1dT_Ay">
-            <property role="1dT_AB" value="Languages here are expected to be directly imported." />
+        <node concept="1PaTwC" id="M_dau6Ogg0" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogg1" role="1PaTwD">
+            <property role="3oM_SC" value="Languages" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogg2" role="1PaTwD">
+            <property role="3oM_SC" value="here" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogg3" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogg4" role="1PaTwD">
+            <property role="3oM_SC" value="expected" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogg5" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogg6" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogg7" role="1PaTwD">
+            <property role="3oM_SC" value="directly" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogg8" role="1PaTwD">
+            <property role="3oM_SC" value="imported." />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 52719f99..597cddfb 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -6,7 +6,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
@@ -57,6 +57,9 @@
         <child id="1238857834412" name="index" index="1LF_Uc" />
       </concept>
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1224071154655" name="jetbrains.mps.baseLanguage.structure.AsExpression" flags="nn" index="0kSF2">
         <child id="1224071154657" name="classifierType" index="0kSFW" />
@@ -356,10 +359,6 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="2546654756694997551" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTag" flags="ng" index="92FcH">
-        <child id="2546654756694997556" name="reference" index="92FcQ" />
-        <child id="3106559687488913694" name="line" index="2XjZqd" />
-      </concept>
       <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
         <property id="5858074156537516431" name="text" index="x79VB" />
       </concept>
@@ -367,8 +366,10 @@
       <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
         <reference id="6832197706140518108" name="param" index="zr_51" />
       </concept>
+      <concept id="6971016359099800069" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldSingleCommentLine" flags="ngI" index="2JaDLO">
+        <child id="6971016359099801474" name="commentBody" index="2JaDBN" />
+      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
         <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
@@ -376,28 +377,24 @@
         <property id="8465538089690881934" name="text" index="TUZQ4" />
         <child id="6832197706140518123" name="parameter" index="zr_5Q" />
       </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
-        <child id="2667874559098216723" name="text" index="3HnX3l" />
-      </concept>
-      <concept id="2217234381367049075" name="jetbrains.mps.baseLanguage.javadoc.structure.CodeInlineDocTag" flags="ng" index="VVOAv">
-        <child id="3106559687488741665" name="line" index="2Xj1qM" />
-      </concept>
+      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI" />
       <concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
         <reference id="2217234381367530213" name="classifier" index="VXe09" />
       </concept>
       <concept id="2217234381367530195" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocReference" flags="ng" index="VXe0Z">
         <reference id="2217234381367530196" name="methodDeclaration" index="VXe0S" />
       </concept>
-      <concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
-        <child id="6962838954693749192" name="tag" index="qph3F" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
+      <concept id="5085607816306582224" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentTextElement" flags="ng" index="1Vtdud">
+        <child id="5085607816306582225" name="tag" index="1Vtduc" />
+      </concept>
+      <concept id="5085607816306633585" name="jetbrains.mps.baseLanguage.javadoc.structure.CodeInlineDocTagTE" flags="ng" index="1VuTSG" />
+      <concept id="5085607816306647746" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTagTE" flags="ng" index="1VuXuv">
+        <child id="5085607816306647747" name="reference" index="1VuXuu" />
+      </concept>
     </language>
     <language id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences">
       <concept id="7915009415671748557" name="jetbrains.mps.baseLanguage.methodReferences.structure.MethodReferenceTypeTargetExpression" flags="ng" index="2FaPjH">
@@ -425,7 +422,6 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
         <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
@@ -708,9 +704,24 @@
         </node>
       </node>
       <node concept="P$JXv" id="7WKNeR9xfet" role="lGtFl">
-        <node concept="TZ5HA" id="7WKNeR9xfeu" role="TZ5H$">
-          <node concept="1dT_AC" id="7WKNeR9xfev" role="1dT_Ay">
-            <property role="1dT_AB" value="Override to provide custom configuration options. " />
+        <node concept="1PaTwC" id="M_dau6Ogjp" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogjq" role="1PaTwD">
+            <property role="3oM_SC" value="Override" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjr" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjs" role="1PaTwD">
+            <property role="3oM_SC" value="provide" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjt" role="1PaTwD">
+            <property role="3oM_SC" value="custom" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogju" role="1PaTwD">
+            <property role="3oM_SC" value="configuration" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjv" role="1PaTwD">
+            <property role="3oM_SC" value="options." />
           </node>
         </node>
       </node>
@@ -1140,9 +1151,27 @@
       </node>
       <node concept="3Tm1VV" id="41ox5VnkgxL" role="1B3o_S" />
       <node concept="P$JXv" id="3GlpCDSBF3O" role="lGtFl">
-        <node concept="TZ5HA" id="3GlpCDSBF3P" role="TZ5H$">
-          <node concept="1dT_AC" id="3GlpCDSBF3Q" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
+        <node concept="1PaTwC" id="M_dau6Ogjw" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogjx" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjy" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjz" role="1PaTwD">
+            <property role="3oM_SC" value="called" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogj$" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogj_" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjA" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjB" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
         </node>
       </node>
@@ -1479,19 +1508,125 @@
         </node>
       </node>
       <node concept="P$JXv" id="7WKNeR97Sa0" role="lGtFl">
-        <node concept="TZ5HA" id="7WKNeR981Js" role="TZ5H$">
-          <node concept="1dT_AC" id="7WKNeR981Jt" role="1dT_Ay">
-            <property role="1dT_AB" value="Searches and returns all rule templates applicable to the specified node. Extracts the node's concept to search for matching templates." />
-          </node>
-        </node>
         <node concept="TUZQ0" id="7WKNeR981P6" role="3nqlJM">
-          <property role="TUZQ4" value="node to search templates for" />
+          <property role="TUZQ4" value="" />
           <node concept="zr_55" id="7WKNeR981P7" role="zr_5Q">
             <ref role="zr_51" node="12yN8DyvzeF" resolve="node" />
           </node>
+          <node concept="1PaTwC" id="M_dau6OgjX" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgjY" role="1PaTwD">
+              <property role="3oM_SC" value="node" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgjZ" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk0" role="1PaTwD">
+              <property role="3oM_SC" value="search" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk1" role="1PaTwD">
+              <property role="3oM_SC" value="templates" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk2" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+          </node>
         </node>
         <node concept="x79VA" id="7WKNeR981P8" role="3nqlJM">
-          <property role="x79VB" value="all templates applicable to node as a tuple [stage, template]" />
+          <property role="x79VB" value="" />
+          <node concept="1PaTwC" id="M_dau6Ogk3" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6Ogk4" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk5" role="1PaTwD">
+              <property role="3oM_SC" value="templates" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk6" role="1PaTwD">
+              <property role="3oM_SC" value="applicable" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk7" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk8" role="1PaTwD">
+              <property role="3oM_SC" value="node" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk9" role="1PaTwD">
+              <property role="3oM_SC" value="as" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogka" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogkb" role="1PaTwD">
+              <property role="3oM_SC" value="tuple" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogkc" role="1PaTwD">
+              <property role="3oM_SC" value="[stage," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogkd" role="1PaTwD">
+              <property role="3oM_SC" value="template]" />
+            </node>
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6OgjC" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgjD" role="1PaTwD">
+            <property role="3oM_SC" value="Searches" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjE" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjF" role="1PaTwD">
+            <property role="3oM_SC" value="returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjG" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjH" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjI" role="1PaTwD">
+            <property role="3oM_SC" value="templates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjJ" role="1PaTwD">
+            <property role="3oM_SC" value="applicable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjK" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjL" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjM" role="1PaTwD">
+            <property role="3oM_SC" value="specified" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjN" role="1PaTwD">
+            <property role="3oM_SC" value="node." />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjO" role="1PaTwD">
+            <property role="3oM_SC" value="Extracts" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjP" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjQ" role="1PaTwD">
+            <property role="3oM_SC" value="node's" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjR" role="1PaTwD">
+            <property role="3oM_SC" value="concept" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjS" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjT" role="1PaTwD">
+            <property role="3oM_SC" value="search" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjU" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjV" role="1PaTwD">
+            <property role="3oM_SC" value="matching" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgjW" role="1PaTwD">
+            <property role="3oM_SC" value="templates." />
+          </node>
         </node>
       </node>
     </node>
@@ -1610,13 +1745,75 @@
         </node>
       </node>
       <node concept="P$JXv" id="7WKNeR988t2" role="lGtFl">
-        <node concept="TZ5HA" id="7WKNeR988t3" role="TZ5H$">
-          <node concept="1dT_AC" id="7WKNeR988t4" role="1dT_Ay">
-            <property role="1dT_AB" value="Searches and returns all rule templates applicable without the input node." />
+        <node concept="x79VA" id="7WKNeR98b70" role="3nqlJM">
+          <property role="x79VB" value="" />
+          <node concept="1PaTwC" id="M_dau6Ogkq" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6Ogkr" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogks" role="1PaTwD">
+              <property role="3oM_SC" value="templates" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogkt" role="1PaTwD">
+              <property role="3oM_SC" value="applicable" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogku" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogkv" role="1PaTwD">
+              <property role="3oM_SC" value="node" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogkw" role="1PaTwD">
+              <property role="3oM_SC" value="as" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogkx" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogky" role="1PaTwD">
+              <property role="3oM_SC" value="tuple" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogkz" role="1PaTwD">
+              <property role="3oM_SC" value="[stage," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogk$" role="1PaTwD">
+              <property role="3oM_SC" value="template]" />
+            </node>
           </node>
         </node>
-        <node concept="x79VA" id="7WKNeR98b70" role="3nqlJM">
-          <property role="x79VB" value="all templates applicable to node as a tuple [stage, template]" />
+        <node concept="1PaTwC" id="M_dau6Ogke" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogkf" role="1PaTwD">
+            <property role="3oM_SC" value="Searches" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogkg" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogkh" role="1PaTwD">
+            <property role="3oM_SC" value="returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogki" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogkj" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogkk" role="1PaTwD">
+            <property role="3oM_SC" value="templates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogkl" role="1PaTwD">
+            <property role="3oM_SC" value="applicable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogkm" role="1PaTwD">
+            <property role="3oM_SC" value="without" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogkn" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogko" role="1PaTwD">
+            <property role="3oM_SC" value="input" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogkp" role="1PaTwD">
+            <property role="3oM_SC" value="node." />
+          </node>
         </node>
       </node>
     </node>
@@ -1978,9 +2175,27 @@
     <node concept="3Tm1VV" id="6fdr4UgftiH" role="1B3o_S" />
     <node concept="2tJIrI" id="7P_FdVQpiDB" role="jymVt" />
     <node concept="3UR2Jj" id="3swcsd3GZmE" role="lGtFl">
-      <node concept="TZ5HA" id="3swcsd3GZmF" role="TZ5H$">
-        <node concept="1dT_AC" id="3swcsd3GZmG" role="1dT_Ay">
-          <property role="1dT_AB" value="FIXME: move this class to template model" />
+      <node concept="1PaTwC" id="M_dau6Ogg9" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogga" role="1PaTwD">
+          <property role="3oM_SC" value="FIXME:" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggb" role="1PaTwD">
+          <property role="3oM_SC" value="move" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggc" role="1PaTwD">
+          <property role="3oM_SC" value="this" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggd" role="1PaTwD">
+          <property role="3oM_SC" value="class" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogge" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggf" role="1PaTwD">
+          <property role="3oM_SC" value="template" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggg" role="1PaTwD">
+          <property role="3oM_SC" value="model" />
         </node>
       </node>
     </node>
@@ -2518,9 +2733,9 @@
     </node>
     <node concept="3Tm1VV" id="1hX44vNlSIB" role="1B3o_S" />
     <node concept="3UR2Jj" id="3swcsd3Grn0" role="lGtFl">
-      <node concept="TZ5HA" id="3swcsd3Grn1" role="TZ5H$">
-        <node concept="1dT_AC" id="3swcsd3Grn2" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6Oggh" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oggi" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
     </node>
@@ -3041,14 +3256,38 @@
     <node concept="2tJIrI" id="1HWyn8jvsOE" role="jymVt" />
     <node concept="3Tm1VV" id="1HWyn8jvsHc" role="1B3o_S" />
     <node concept="3UR2Jj" id="4nDRG5AyPFZ" role="lGtFl">
-      <node concept="TZ5HA" id="4nDRG5AyQqk" role="TZ5H$">
-        <node concept="1dT_AC" id="4nDRG5AyQql" role="1dT_Ay">
-          <property role="1dT_AB" value="Utility to provide higher-order semantics for operations on terms." />
+      <node concept="1PaTwC" id="M_dau6Oggj" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oggk" role="1PaTwD">
+          <property role="3oM_SC" value="Utility" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggl" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggm" role="1PaTwD">
+          <property role="3oM_SC" value="provide" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggn" role="1PaTwD">
+          <property role="3oM_SC" value="higher-order" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggo" role="1PaTwD">
+          <property role="3oM_SC" value="semantics" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggp" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggq" role="1PaTwD">
+          <property role="3oM_SC" value="operations" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggr" role="1PaTwD">
+          <property role="3oM_SC" value="on" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggs" role="1PaTwD">
+          <property role="3oM_SC" value="terms." />
         </node>
       </node>
-      <node concept="TZ5HA" id="4nDRG5AySsY" role="TZ5H$">
-        <node concept="1dT_AC" id="4nDRG5AySsZ" role="1dT_Ay">
-          <property role="1dT_AB" value="&lt;p&gt;Avoid. " />
+      <node concept="1PaTwC" id="M_dau6Oggt" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oggu" role="1PaTwD">
+          <property role="3oM_SC" value="&lt;p&gt;Avoid." />
         </node>
       </node>
     </node>
@@ -3438,9 +3677,57 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="1ufy3d8YZIN" role="lGtFl">
-      <node concept="TZ5HA" id="1ufy3d8YZIO" role="TZ5H$">
-        <node concept="1dT_AC" id="1ufy3d8YZIP" role="1dT_Ay">
-          <property role="1dT_AB" value="FIXME: this class can be reduced to a registry of *Index classes and moved to templates model." />
+      <node concept="1PaTwC" id="M_dau6Oggv" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oggw" role="1PaTwD">
+          <property role="3oM_SC" value="FIXME:" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggx" role="1PaTwD">
+          <property role="3oM_SC" value="this" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggy" role="1PaTwD">
+          <property role="3oM_SC" value="class" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oggz" role="1PaTwD">
+          <property role="3oM_SC" value="can" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogg$" role="1PaTwD">
+          <property role="3oM_SC" value="be" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogg_" role="1PaTwD">
+          <property role="3oM_SC" value="reduced" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggA" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggB" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggC" role="1PaTwD">
+          <property role="3oM_SC" value="registry" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggD" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggE" role="1PaTwD">
+          <property role="3oM_SC" value="*Index" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggF" role="1PaTwD">
+          <property role="3oM_SC" value="classes" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggG" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggH" role="1PaTwD">
+          <property role="3oM_SC" value="moved" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggI" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggJ" role="1PaTwD">
+          <property role="3oM_SC" value="templates" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggK" role="1PaTwD">
+          <property role="3oM_SC" value="model." />
         </node>
       </node>
     </node>
@@ -3891,11 +4178,28 @@
         </node>
       </node>
       <node concept="P$JXv" id="7kTeLbPojCY" role="lGtFl">
-        <node concept="TZ5HA" id="7kTeLbPojCZ" role="TZ5H$">
-          <node concept="1dT_AC" id="7kTeLbPojD0" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be launched in a read action." />
+        <node concept="1PaTwC" id="M_dau6Ogk_" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgkA" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkB" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkC" role="1PaTwD">
+            <property role="3oM_SC" value="launched" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkD" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkE" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkF" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkG" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
-          <node concept="1dT_AC" id="7kTeLbPojD1" role="1dT_Ay" />
         </node>
       </node>
       <node concept="16euLQ" id="5EDW3XEvo5m" role="16eVyc">
@@ -4341,9 +4645,18 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="1ufy3d8YNdM" role="lGtFl">
-      <node concept="TZ5HA" id="2sMBLui5dDA" role="TZ5H$">
-        <node concept="1dT_AC" id="2sMBLui5dDB" role="1dT_Ay">
-          <property role="1dT_AB" value="Façade API for ProgramFactory." />
+      <node concept="1PaTwC" id="M_dau6OggL" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OggM" role="1PaTwD">
+          <property role="3oM_SC" value="Façade" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggN" role="1PaTwD">
+          <property role="3oM_SC" value="API" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggO" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggP" role="1PaTwD">
+          <property role="3oM_SC" value="ProgramFactory." />
         </node>
       </node>
     </node>
@@ -5303,9 +5616,27 @@
     </node>
     <node concept="3Tm1VV" id="4$YN6QugcRf" role="1B3o_S" />
     <node concept="3UR2Jj" id="3swcsd3HijR" role="lGtFl">
-      <node concept="TZ5HA" id="3swcsd3HijS" role="TZ5H$">
-        <node concept="1dT_AC" id="3swcsd3HijT" role="1dT_Ay">
-          <property role="1dT_AB" value="FIXME: move this class to templates model" />
+      <node concept="1PaTwC" id="M_dau6OggQ" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OggR" role="1PaTwD">
+          <property role="3oM_SC" value="FIXME:" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggS" role="1PaTwD">
+          <property role="3oM_SC" value="move" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggT" role="1PaTwD">
+          <property role="3oM_SC" value="this" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggU" role="1PaTwD">
+          <property role="3oM_SC" value="class" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggV" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggW" role="1PaTwD">
+          <property role="3oM_SC" value="templates" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OggX" role="1PaTwD">
+          <property role="3oM_SC" value="model" />
         </node>
       </node>
     </node>
@@ -6269,20 +6600,63 @@
       <ref role="3uigEE" node="3o9wrC3s0ii" resolve="DefaultSupervisor" />
     </node>
     <node concept="3UR2Jj" id="3mytCjY$O2g" role="lGtFl">
-      <node concept="TZ5HA" id="3mytCjY$O2h" role="TZ5H$">
-        <node concept="1dT_AC" id="3mytCjY$O2i" role="1dT_Ay">
-          <property role="1dT_AB" value="A supervisor that processes feedback from program evaluation and forwards/consumes it. " />
+      <node concept="1PaTwC" id="M_dau6OggY" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OggZ" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh0" role="1PaTwD">
+          <property role="3oM_SC" value="supervisor" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh1" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh2" role="1PaTwD">
+          <property role="3oM_SC" value="processes" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh3" role="1PaTwD">
+          <property role="3oM_SC" value="feedback" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh4" role="1PaTwD">
+          <property role="3oM_SC" value="from" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh5" role="1PaTwD">
+          <property role="3oM_SC" value="program" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh6" role="1PaTwD">
+          <property role="3oM_SC" value="evaluation" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh7" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh8" role="1PaTwD">
+          <property role="3oM_SC" value="forwards/consumes" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogh9" role="1PaTwD">
+          <property role="3oM_SC" value="it." />
         </node>
       </node>
-      <node concept="TZ5HA" id="3mytCjY$Ox0" role="TZ5H$" />
-      <node concept="TZ5HA" id="4nDRG5DaYZU" role="TZ5H$">
-        <node concept="1dT_AC" id="4nDRG5DaYZV" role="1dT_Ay">
-          <property role="1dT_AB" value="&lt;p&gt;" />
+      <node concept="1PaTwC" id="M_dau6Ogha" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oghb" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
-      <node concept="TZ5HA" id="4nDRG5Db0eX" role="TZ5H$">
-        <node concept="1dT_AC" id="4nDRG5Db0eY" role="1dT_Ay">
-          <property role="1dT_AB" value="Used in tests only." />
+      <node concept="1PaTwC" id="M_dau6Oghc" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oghd" role="1PaTwD">
+          <property role="3oM_SC" value="&lt;p&gt;" />
+        </node>
+      </node>
+      <node concept="1PaTwC" id="M_dau6Oghe" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oghf" role="1PaTwD">
+          <property role="3oM_SC" value="Used" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oghg" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oghh" role="1PaTwD">
+          <property role="3oM_SC" value="tests" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oghi" role="1PaTwD">
+          <property role="3oM_SC" value="only." />
         </node>
       </node>
     </node>
@@ -6337,9 +6711,18 @@
     <node concept="2tJIrI" id="55xYlrmceZE" role="jymVt" />
     <node concept="3Tm1VV" id="6RN9TdHmQLz" role="1B3o_S" />
     <node concept="3UR2Jj" id="4nDRG5DaX7O" role="lGtFl">
-      <node concept="TZ5HA" id="4nDRG5DaYh6" role="TZ5H$">
-        <node concept="1dT_AC" id="4nDRG5DaYh7" role="1dT_Ay">
-          <property role="1dT_AB" value="Used in tests only." />
+      <node concept="1PaTwC" id="M_dau6Oghj" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oghk" role="1PaTwD">
+          <property role="3oM_SC" value="Used" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oghl" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oghm" role="1PaTwD">
+          <property role="3oM_SC" value="tests" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oghn" role="1PaTwD">
+          <property role="3oM_SC" value="only." />
         </node>
       </node>
     </node>
@@ -8081,7 +8464,7 @@
                       <node concept="37vLTw" id="4Q576RbrMyv" role="2Oq$k0">
                         <ref role="3cqZAo" node="4Q576RbrwBu" resolve="node" />
                       </node>
-                      <node concept="2qgKlT" id="4Q576RbrQ6o" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og2C" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                       </node>
                     </node>
@@ -8187,7 +8570,7 @@
                 <node concept="37vLTw" id="3IJoaDJ2V80" role="2Oq$k0">
                   <ref role="3cqZAo" node="3IJoaDJ2T7Z" resolve="node" />
                 </node>
-                <node concept="2qgKlT" id="3IJoaDJ2V81" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og2E" role="2OqNvi">
                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                 </node>
               </node>
@@ -9971,31 +10354,112 @@
         <ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
       </node>
       <node concept="P$JXv" id="cmlg9OumEa" role="lGtFl">
-        <node concept="TZ5HA" id="cmlg9OumEb" role="TZ5H$">
-          <node concept="1dT_AC" id="cmlg9OumEc" role="1dT_Ay">
-            <property role="1dT_AB" value="Updates the rules lists with rules produced from " />
+        <node concept="1PaTwC" id="M_dau6OgkH" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgkI" role="1PaTwD">
+            <property role="3oM_SC" value="Updates" />
           </node>
-          <node concept="1dT_AA" id="cmlg9Oupai" role="1dT_Ay">
-            <node concept="VVOAv" id="cmlg9OupaV" role="qph3F">
-              <node concept="TZ5HA" id="cmlg9OupaX" role="2Xj1qM">
-                <node concept="1dT_AC" id="cmlg9Oupb9" role="1dT_Ay">
-                  <property role="1dT_AB" value="ruleBuilders" />
+          <node concept="3oM_SD" id="M_dau6OgkJ" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkK" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkL" role="1PaTwD">
+            <property role="3oM_SC" value="lists" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkM" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkN" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkO" role="1PaTwD">
+            <property role="3oM_SC" value="produced" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkP" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6OgkQ" role="1PaTwD">
+            <node concept="1VuTSG" id="M_dau6OgkR" role="1Vtduc">
+              <node concept="1PaTwC" id="M_dau6OgkU" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6OgkV" role="1PaTwD">
+                  <property role="3oM_SC" value="ruleBuilders" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="cmlg9Oupah" role="1dT_Ay">
-            <property role="1dT_AB" value=" parameter." />
+          <node concept="3oM_SD" id="M_dau6OgkW" role="1PaTwD">
+            <property role="3oM_SC" value="parameter." />
           </node>
         </node>
-        <node concept="TZ5HA" id="cmlg9Oupbj" role="TZ5H$">
-          <node concept="1dT_AC" id="cmlg9Oupbk" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns the collection of unique tags corresponding to the rules created. " />
+        <node concept="1PaTwC" id="M_dau6OgkX" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgkY" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgkZ" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl0" role="1PaTwD">
+            <property role="3oM_SC" value="collection" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl1" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl2" role="1PaTwD">
+            <property role="3oM_SC" value="unique" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl3" role="1PaTwD">
+            <property role="3oM_SC" value="tags" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl4" role="1PaTwD">
+            <property role="3oM_SC" value="corresponding" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl5" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl6" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl7" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogl8" role="1PaTwD">
+            <property role="3oM_SC" value="created." />
           </node>
         </node>
-        <node concept="TZ5HA" id="cmlg9Oupdb" role="TZ5H$">
-          <node concept="1dT_AC" id="cmlg9Oupdc" role="1dT_Ay">
-            <property role="1dT_AB" value="The unique tags can be later used to invalidate rules lists." />
+        <node concept="1PaTwC" id="M_dau6Ogl9" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogla" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglb" role="1PaTwD">
+            <property role="3oM_SC" value="unique" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglc" role="1PaTwD">
+            <property role="3oM_SC" value="tags" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogld" role="1PaTwD">
+            <property role="3oM_SC" value="can" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogle" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglf" role="1PaTwD">
+            <property role="3oM_SC" value="later" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglg" role="1PaTwD">
+            <property role="3oM_SC" value="used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglh" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogli" role="1PaTwD">
+            <property role="3oM_SC" value="invalidate" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglj" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglk" role="1PaTwD">
+            <property role="3oM_SC" value="lists." />
           </node>
         </node>
       </node>
@@ -10091,42 +10555,118 @@
       </node>
       <node concept="3Tm1VV" id="cmlg9OuMya" role="1B3o_S" />
       <node concept="P$JXv" id="cmlg9OuXnK" role="lGtFl">
-        <node concept="TZ5HA" id="cmlg9OuXnL" role="TZ5H$">
-          <node concept="1dT_AC" id="cmlg9OuXnM" role="1dT_Ay">
-            <property role="1dT_AB" value="Removes the rules identified by unique tags." />
+        <node concept="1PaTwC" id="M_dau6Ogll" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oglm" role="1PaTwD">
+            <property role="3oM_SC" value="Removes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogln" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglo" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglp" role="1PaTwD">
+            <property role="3oM_SC" value="identified" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglq" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglr" role="1PaTwD">
+            <property role="3oM_SC" value="unique" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogls" role="1PaTwD">
+            <property role="3oM_SC" value="tags." />
           </node>
         </node>
-        <node concept="TZ5HA" id="cmlg9OuZTr" role="TZ5H$">
-          <node concept="1dT_AC" id="cmlg9OuZTs" role="1dT_Ay">
-            <property role="1dT_AB" value="Treats the collection passed in " />
+        <node concept="1PaTwC" id="M_dau6Oglt" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oglu" role="1PaTwD">
+            <property role="3oM_SC" value="Treats" />
           </node>
-          <node concept="1dT_AA" id="cmlg9OuZpP" role="1dT_Ay">
-            <node concept="VVOAv" id="cmlg9OuZq3" role="qph3F">
-              <node concept="TZ5HA" id="cmlg9OuZq5" role="2Xj1qM">
-                <node concept="1dT_AC" id="cmlg9OuZqh" role="1dT_Ay">
-                  <property role="1dT_AB" value="uniqueTags" />
+          <node concept="3oM_SD" id="M_dau6Oglv" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglw" role="1PaTwD">
+            <property role="3oM_SC" value="collection" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oglx" role="1PaTwD">
+            <property role="3oM_SC" value="passed" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogly" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6Oglz" role="1PaTwD">
+            <node concept="1VuTSG" id="M_dau6Ogl$" role="1Vtduc">
+              <node concept="1PaTwC" id="M_dau6OglB" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6OglC" role="1PaTwD">
+                  <property role="3oM_SC" value="uniqueTags" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="cmlg9OuZpO" role="1dT_Ay">
-            <property role="1dT_AB" value=" parameter as a collection of unique tags" />
+          <node concept="3oM_SD" id="M_dau6OglD" role="1PaTwD">
+            <property role="3oM_SC" value="parameter" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglE" role="1PaTwD">
+            <property role="3oM_SC" value="as" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglF" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglG" role="1PaTwD">
+            <property role="3oM_SC" value="collection" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglH" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglI" role="1PaTwD">
+            <property role="3oM_SC" value="unique" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglJ" role="1PaTwD">
+            <property role="3oM_SC" value="tags" />
           </node>
         </node>
-        <node concept="TZ5HA" id="cmlg9OuZrz" role="TZ5H$">
-          <node concept="1dT_AC" id="cmlg9OuZr$" role="1dT_Ay">
-            <property role="1dT_AB" value="identifying the rules produced earlier by a call to " />
+        <node concept="1PaTwC" id="M_dau6OglK" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OglL" role="1PaTwD">
+            <property role="3oM_SC" value="identifying" />
           </node>
-          <node concept="1dT_AA" id="cmlg9OuZrR" role="1dT_Ay">
-            <node concept="92FcH" id="cmlg9OuZs5" role="qph3F">
-              <node concept="TZ5HA" id="cmlg9OuZs7" role="2XjZqd" />
-              <node concept="VXe0Z" id="cmlg9OuZsm" role="92FcQ">
+          <node concept="3oM_SD" id="M_dau6OglM" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglN" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglO" role="1PaTwD">
+            <property role="3oM_SC" value="produced" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglP" role="1PaTwD">
+            <property role="3oM_SC" value="earlier" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglQ" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglR" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglS" role="1PaTwD">
+            <property role="3oM_SC" value="call" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OglT" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6OglU" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6OglV" role="1Vtduc">
+              <node concept="VXe0Z" id="cmlg9OuZsm" role="1VuXuu">
                 <ref role="VXe0S" node="7DvO2M9Uagq" resolve="update" />
               </node>
+              <node concept="1PaTwC" id="M_dau6OglY" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6OglZ" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="cmlg9OuZrQ" role="1dT_Ay">
-            <property role="1dT_AB" value=". " />
+          <node concept="3oM_SD" id="M_dau6Ogm0" role="1PaTwD">
+            <property role="3oM_SC" value="." />
           </node>
         </node>
       </node>
@@ -10190,9 +10730,24 @@
         </node>
       </node>
       <node concept="P$JXv" id="4J__M6lwIh" role="lGtFl">
-        <node concept="TZ5HA" id="4J__M6lwIi" role="TZ5H$">
-          <node concept="1dT_AC" id="4J__M6lwIj" role="1dT_Ay">
-            <property role="1dT_AB" value="Marks all known rules are validated. " />
+        <node concept="1PaTwC" id="M_dau6Ogm1" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogm2" role="1PaTwD">
+            <property role="3oM_SC" value="Marks" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogm3" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogm4" role="1PaTwD">
+            <property role="3oM_SC" value="known" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogm5" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogm6" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogm7" role="1PaTwD">
+            <property role="3oM_SC" value="validated." />
           </node>
         </node>
       </node>
@@ -10575,39 +11130,219 @@
         </node>
       </node>
       <node concept="P$JXv" id="2$$Q_FeU7wo" role="lGtFl">
-        <node concept="TZ5HA" id="2$$Q_FeU7wp" role="TZ5H$">
-          <node concept="1dT_AC" id="2$$Q_FeU7wq" role="1dT_Ay">
-            <property role="1dT_AB" value="Builds plan and removes invalidated rules. " />
+        <node concept="1PaTwC" id="M_dau6Ogm8" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogm9" role="1PaTwD">
+            <property role="3oM_SC" value="Builds" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogma" role="1PaTwD">
+            <property role="3oM_SC" value="plan" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmb" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmc" role="1PaTwD">
+            <property role="3oM_SC" value="removes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmd" role="1PaTwD">
+            <property role="3oM_SC" value="invalidated" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogme" role="1PaTwD">
+            <property role="3oM_SC" value="rules." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1XKnVP30dj" role="TZ5H$">
-          <node concept="1dT_AC" id="1XKnVP30dk" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogmf" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogmg" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="1XKnVP2ZAq" role="TZ5H$">
-          <node concept="1dT_AC" id="1XKnVP2ZAr" role="1dT_Ay">
-            <property role="1dT_AB" value="The order of rules returned here must correspond to the partial order of rule lists " />
+        <node concept="1PaTwC" id="M_dau6Ogmh" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogmi" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmj" role="1PaTwD">
+            <property role="3oM_SC" value="order" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmk" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogml" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmm" role="1PaTwD">
+            <property role="3oM_SC" value="returned" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmn" role="1PaTwD">
+            <property role="3oM_SC" value="here" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmo" role="1PaTwD">
+            <property role="3oM_SC" value="must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmp" role="1PaTwD">
+            <property role="3oM_SC" value="correspond" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmq" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmr" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogms" role="1PaTwD">
+            <property role="3oM_SC" value="partial" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmt" role="1PaTwD">
+            <property role="3oM_SC" value="order" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmu" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmv" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmw" role="1PaTwD">
+            <property role="3oM_SC" value="lists" />
           </node>
         </node>
-        <node concept="TZ5HA" id="5NUR$P2JsU" role="TZ5H$">
-          <node concept="1dT_AC" id="5NUR$P2JsV" role="1dT_Ay">
-            <property role="1dT_AB" value="defined by the &quot;extends&quot; relation. " />
+        <node concept="1PaTwC" id="M_dau6Ogmx" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogmy" role="1PaTwD">
+            <property role="3oM_SC" value="defined" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogmz" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogm$" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogm_" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;extends&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmA" role="1PaTwD">
+            <property role="3oM_SC" value="relation." />
           </node>
         </node>
-        <node concept="TZ5HA" id="2$$Q_FeU7w$" role="TZ5H$">
-          <node concept="1dT_AC" id="2$$Q_FeU7w_" role="1dT_Ay">
-            <property role="1dT_AB" value="Within a list the rules must be in the same order as the rule templates. " />
+        <node concept="1PaTwC" id="M_dau6OgmB" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgmC" role="1PaTwD">
+            <property role="3oM_SC" value="Within" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmD" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmE" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmF" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmG" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmH" role="1PaTwD">
+            <property role="3oM_SC" value="must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmI" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmJ" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmK" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmL" role="1PaTwD">
+            <property role="3oM_SC" value="same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmM" role="1PaTwD">
+            <property role="3oM_SC" value="order" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmN" role="1PaTwD">
+            <property role="3oM_SC" value="as" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmO" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmP" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmQ" role="1PaTwD">
+            <property role="3oM_SC" value="templates." />
           </node>
         </node>
-        <node concept="TZ5HA" id="5NUR$P2JEX" role="TZ5H$">
-          <node concept="1dT_AC" id="5NUR$P2JEY" role="1dT_Ay">
-            <property role="1dT_AB" value="Additionally the rules that are the result of appllying templates to different nodes are sorted" />
+        <node concept="1PaTwC" id="M_dau6OgmR" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgmS" role="1PaTwD">
+            <property role="3oM_SC" value="Additionally" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmT" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmU" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmV" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmW" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmX" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmY" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgmZ" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogn0" role="1PaTwD">
+            <property role="3oM_SC" value="appllying" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogn1" role="1PaTwD">
+            <property role="3oM_SC" value="templates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogn2" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogn3" role="1PaTwD">
+            <property role="3oM_SC" value="different" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogn4" role="1PaTwD">
+            <property role="3oM_SC" value="nodes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogn5" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogn6" role="1PaTwD">
+            <property role="3oM_SC" value="sorted" />
           </node>
         </node>
-        <node concept="TZ5HA" id="5NUR$P2JQ1" role="TZ5H$">
-          <node concept="1dT_AC" id="5NUR$P2JQ2" role="1dT_Ay">
-            <property role="1dT_AB" value="internally according to the key derived from the node's identity." />
+        <node concept="1PaTwC" id="M_dau6Ogn7" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogn8" role="1PaTwD">
+            <property role="3oM_SC" value="internally" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogn9" role="1PaTwD">
+            <property role="3oM_SC" value="according" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogna" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ognb" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ognc" role="1PaTwD">
+            <property role="3oM_SC" value="key" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ognd" role="1PaTwD">
+            <property role="3oM_SC" value="derived" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogne" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ognf" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogng" role="1PaTwD">
+            <property role="3oM_SC" value="node's" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ognh" role="1PaTwD">
+            <property role="3oM_SC" value="identity." />
           </node>
         </node>
       </node>
@@ -12254,29 +12989,143 @@
           </node>
         </node>
         <node concept="P$JXv" id="1LBj9w_7moG" role="lGtFl">
-          <node concept="TZ5HA" id="1LBj9w_7moH" role="TZ5H$">
-            <node concept="1dT_AC" id="1LBj9w_7moI" role="1dT_Ay">
-              <property role="1dT_AB" value="Builds plan and removes invalidated rules." />
+          <node concept="1PaTwC" id="M_dau6Ogni" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6Ognj" role="1PaTwD">
+              <property role="3oM_SC" value="Builds" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognk" role="1PaTwD">
+              <property role="3oM_SC" value="plan" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognl" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognm" role="1PaTwD">
+              <property role="3oM_SC" value="removes" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognn" role="1PaTwD">
+              <property role="3oM_SC" value="invalidated" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogno" role="1PaTwD">
+              <property role="3oM_SC" value="rules." />
             </node>
           </node>
-          <node concept="TZ5HA" id="1XKnVP30td" role="TZ5H$">
-            <node concept="1dT_AC" id="1XKnVP30te" role="1dT_Ay">
-              <property role="1dT_AB" value="" />
+          <node concept="1PaTwC" id="M_dau6Ognp" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6Ognq" role="1PaTwD">
+              <property role="3oM_SC" value="" />
             </node>
           </node>
-          <node concept="TZ5HA" id="1XKnVP30gz" role="TZ5H$">
-            <node concept="1dT_AC" id="1XKnVP30g$" role="1dT_Ay">
-              <property role="1dT_AB" value="The ordering of rules within the plan correspond to partial ordering of rule templates according to " />
+          <node concept="1PaTwC" id="M_dau6Ognr" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6Ogns" role="1PaTwD">
+              <property role="3oM_SC" value="The" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognt" role="1PaTwD">
+              <property role="3oM_SC" value="ordering" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognu" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognv" role="1PaTwD">
+              <property role="3oM_SC" value="rules" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognw" role="1PaTwD">
+              <property role="3oM_SC" value="within" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognx" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogny" role="1PaTwD">
+              <property role="3oM_SC" value="plan" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ognz" role="1PaTwD">
+              <property role="3oM_SC" value="correspond" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogn$" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogn_" role="1PaTwD">
+              <property role="3oM_SC" value="partial" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnA" role="1PaTwD">
+              <property role="3oM_SC" value="ordering" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnB" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnC" role="1PaTwD">
+              <property role="3oM_SC" value="rule" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnD" role="1PaTwD">
+              <property role="3oM_SC" value="templates" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnE" role="1PaTwD">
+              <property role="3oM_SC" value="according" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnF" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
             </node>
           </node>
-          <node concept="TZ5HA" id="1LBj9w_7pqv" role="TZ5H$">
-            <node concept="1dT_AC" id="1LBj9w_7pqw" role="1dT_Ay">
-              <property role="1dT_AB" value="extends relation, and also takes into account the extended languages. " />
+          <node concept="1PaTwC" id="M_dau6OgnG" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgnH" role="1PaTwD">
+              <property role="3oM_SC" value="extends" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnI" role="1PaTwD">
+              <property role="3oM_SC" value="relation," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnJ" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnK" role="1PaTwD">
+              <property role="3oM_SC" value="also" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnL" role="1PaTwD">
+              <property role="3oM_SC" value="takes" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnM" role="1PaTwD">
+              <property role="3oM_SC" value="into" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnN" role="1PaTwD">
+              <property role="3oM_SC" value="account" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnO" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnP" role="1PaTwD">
+              <property role="3oM_SC" value="extended" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnQ" role="1PaTwD">
+              <property role="3oM_SC" value="languages." />
             </node>
           </node>
-          <node concept="TZ5HA" id="1LBj9w_7psZ" role="TZ5H$">
-            <node concept="1dT_AC" id="1LBj9w_7pt0" role="1dT_Ay">
-              <property role="1dT_AB" value="Otherwise, ordering of rules withing the rule template is kept." />
+          <node concept="1PaTwC" id="M_dau6OgnR" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgnS" role="1PaTwD">
+              <property role="3oM_SC" value="Otherwise," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnT" role="1PaTwD">
+              <property role="3oM_SC" value="ordering" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnU" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnV" role="1PaTwD">
+              <property role="3oM_SC" value="rules" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnW" role="1PaTwD">
+              <property role="3oM_SC" value="withing" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnX" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnY" role="1PaTwD">
+              <property role="3oM_SC" value="rule" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgnZ" role="1PaTwD">
+              <property role="3oM_SC" value="template" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogo0" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogo1" role="1PaTwD">
+              <property role="3oM_SC" value="kept." />
             </node>
           </node>
         </node>
@@ -12368,24 +13217,114 @@
       </node>
       <node concept="2tJIrI" id="4MqhgXUMNaI" role="jymVt" />
       <node concept="3UR2Jj" id="2$$Q_FeW4$G" role="lGtFl">
-        <node concept="TZ5HA" id="2$$Q_FeW4$H" role="TZ5H$">
-          <node concept="1dT_AC" id="2$$Q_FeW4$I" role="1dT_Ay">
-            <property role="1dT_AB" value="The builder maintains the list of template locations. Every rule added must correspond to a location from the " />
+        <node concept="1PaTwC" id="M_dau6Ogho" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oghp" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghq" role="1PaTwD">
+            <property role="3oM_SC" value="builder" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghr" role="1PaTwD">
+            <property role="3oM_SC" value="maintains" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghs" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oght" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghu" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghv" role="1PaTwD">
+            <property role="3oM_SC" value="template" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghw" role="1PaTwD">
+            <property role="3oM_SC" value="locations." />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghx" role="1PaTwD">
+            <property role="3oM_SC" value="Every" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghy" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oghz" role="1PaTwD">
+            <property role="3oM_SC" value="added" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogh$" role="1PaTwD">
+            <property role="3oM_SC" value="must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogh_" role="1PaTwD">
+            <property role="3oM_SC" value="correspond" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghA" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghB" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghC" role="1PaTwD">
+            <property role="3oM_SC" value="location" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghD" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghE" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
           </node>
         </node>
-        <node concept="TZ5HA" id="2$$Q_FeW4$P" role="TZ5H$">
-          <node concept="1dT_AC" id="2$$Q_FeW4$Q" role="1dT_Ay">
-            <property role="1dT_AB" value="initial list. " />
+        <node concept="1PaTwC" id="M_dau6OghF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OghG" role="1PaTwD">
+            <property role="3oM_SC" value="initial" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghH" role="1PaTwD">
+            <property role="3oM_SC" value="list." />
           </node>
         </node>
-        <node concept="TZ5HA" id="2$$Q_FeW4$V" role="TZ5H$">
-          <node concept="1dT_AC" id="2$$Q_FeW4$W" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OghI" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OghJ" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="2$$Q_FeW4_3" role="TZ5H$">
-          <node concept="1dT_AC" id="2$$Q_FeW4_4" role="1dT_Ay">
-            <property role="1dT_AB" value="Instance of RulesList produced by toRulesList() returns the rules sorted by template location." />
+        <node concept="1PaTwC" id="M_dau6OghK" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OghL" role="1PaTwD">
+            <property role="3oM_SC" value="Instance" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghM" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghN" role="1PaTwD">
+            <property role="3oM_SC" value="RulesList" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghO" role="1PaTwD">
+            <property role="3oM_SC" value="produced" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghP" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghQ" role="1PaTwD">
+            <property role="3oM_SC" value="toRulesList()" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghR" role="1PaTwD">
+            <property role="3oM_SC" value="returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghS" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghT" role="1PaTwD">
+            <property role="3oM_SC" value="rules" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghU" role="1PaTwD">
+            <property role="3oM_SC" value="sorted" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghV" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghW" role="1PaTwD">
+            <property role="3oM_SC" value="template" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OghX" role="1PaTwD">
+            <property role="3oM_SC" value="location." />
           </node>
         </node>
       </node>
@@ -16923,7 +17862,7 @@
                                 <node concept="37vLTw" id="47oVduOAAdi" role="2Oq$k0">
                                   <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
                                 </node>
-                                <node concept="2qgKlT" id="47oVduOAAdj" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og2G" role="2OqNvi">
                                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                                 </node>
                               </node>
@@ -17387,7 +18326,7 @@
                                   <node concept="37vLTw" id="3rrtTcS7pR4" role="2Oq$k0">
                                     <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
                                   </node>
-                                  <node concept="2qgKlT" id="3rrtTcS7pR5" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og2I" role="2OqNvi">
                                     <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                                   </node>
                                 </node>
@@ -17888,25 +18827,68 @@
         <node concept="10P_77" id="5HxDM7D4ZC5" role="1tU5fm" />
       </node>
       <node concept="P$JXv" id="KkWtiNej_O" role="lGtFl">
-        <node concept="TZ5HA" id="KkWtiNej_P" role="TZ5H$">
-          <node concept="1dT_AC" id="KkWtiNej_Q" role="1dT_Ay">
-            <property role="1dT_AB" value="Uses " />
+        <node concept="1PaTwC" id="M_dau6Ogo2" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogo3" role="1PaTwD">
+            <property role="3oM_SC" value="Uses" />
           </node>
-          <node concept="1dT_AA" id="KkWtiNeBvx" role="1dT_Ay">
-            <node concept="92FcH" id="KkWtiNeB$h" role="qph3F">
-              <node concept="TZ5HA" id="KkWtiNeB$j" role="2XjZqd" />
-              <node concept="VXe08" id="KkWtiNeBD5" role="92FcQ">
+          <node concept="1Vtdud" id="M_dau6Ogo4" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6Ogo5" role="1Vtduc">
+              <node concept="VXe08" id="KkWtiNeBD5" role="1VuXuu">
                 <ref role="VXe09" node="7DvO2M9Uago" resolve="RulesPlanHandler" />
               </node>
+              <node concept="1PaTwC" id="M_dau6Ogo8" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6Ogo9" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="KkWtiNeBvw" role="1dT_Ay">
-            <property role="1dT_AB" value=" to conditionally apply rule templates if there have been changes that" />
+          <node concept="3oM_SD" id="M_dau6Ogoa" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogob" role="1PaTwD">
+            <property role="3oM_SC" value="conditionally" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogoc" role="1PaTwD">
+            <property role="3oM_SC" value="apply" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogod" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogoe" role="1PaTwD">
+            <property role="3oM_SC" value="templates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogof" role="1PaTwD">
+            <property role="3oM_SC" value="if" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogog" role="1PaTwD">
+            <property role="3oM_SC" value="there" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogoh" role="1PaTwD">
+            <property role="3oM_SC" value="have" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogoi" role="1PaTwD">
+            <property role="3oM_SC" value="been" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogoj" role="1PaTwD">
+            <property role="3oM_SC" value="changes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogok" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
           </node>
         </node>
-        <node concept="TZ5HA" id="KkWtiNeCEY" role="TZ5H$">
-          <node concept="1dT_AC" id="KkWtiNeCEZ" role="1dT_Ay">
-            <property role="1dT_AB" value="invalidated the cached data." />
+        <node concept="1PaTwC" id="M_dau6Ogol" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogom" role="1PaTwD">
+            <property role="3oM_SC" value="invalidated" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogon" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogoo" role="1PaTwD">
+            <property role="3oM_SC" value="cached" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogop" role="1PaTwD">
+            <property role="3oM_SC" value="data." />
           </node>
         </node>
       </node>
@@ -18725,7 +19707,7 @@
                           <node concept="37vLTw" id="5X1yxJI81iq" role="2Oq$k0">
                             <ref role="3cqZAo" node="5X1yxJI81in" resolve="node" />
                           </node>
-                          <node concept="2qgKlT" id="5X1yxJI81ig" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og2K" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                           </node>
                         </node>
@@ -19570,28 +20552,80 @@
         <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
       <node concept="P$JXv" id="1bodCZIveGV" role="lGtFl">
-        <node concept="TZ5HA" id="1bodCZIveGW" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZIveGX" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1bodCZIvfge" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZIvfgf" role="1dT_Ay">
-            <property role="1dT_AB" value="&lt;p&gt;" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1bodCZIvfgg" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZIvfgh" role="1dT_Ay">
-            <property role="1dT_AB" value="Effectively this constructor creates a &quot;do-nothing&quot; null object, which can be a statically " />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1bodCZIvfOg" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZIvfOh" role="1dT_Ay">
-            <property role="1dT_AB" value="initialized shared instance. " />
-          </node>
-        </node>
         <node concept="TZ5HI" id="1bodCZIveGY" role="3nqlJM">
-          <node concept="TZ5HA" id="1bodCZIveGZ" role="3HnX3l" />
+          <node concept="1PaTwC" id="M_dau6OgoM" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgoN" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6Ogoq" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogor" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogos" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogot" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6Ogou" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogov" role="1PaTwD">
+            <property role="3oM_SC" value="&lt;p&gt;" />
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6Ogow" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogox" role="1PaTwD">
+            <property role="3oM_SC" value="Effectively" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogoy" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogoz" role="1PaTwD">
+            <property role="3oM_SC" value="constructor" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogo$" role="1PaTwD">
+            <property role="3oM_SC" value="creates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogo_" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoA" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;do-nothing&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoB" role="1PaTwD">
+            <property role="3oM_SC" value="null" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoC" role="1PaTwD">
+            <property role="3oM_SC" value="object," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoD" role="1PaTwD">
+            <property role="3oM_SC" value="which" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoE" role="1PaTwD">
+            <property role="3oM_SC" value="can" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoF" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoG" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoH" role="1PaTwD">
+            <property role="3oM_SC" value="statically" />
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6OgoI" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgoJ" role="1PaTwD">
+            <property role="3oM_SC" value="initialized" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoK" role="1PaTwD">
+            <property role="3oM_SC" value="shared" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoL" role="1PaTwD">
+            <property role="3oM_SC" value="instance." />
+          </node>
         </node>
       </node>
     </node>
@@ -19820,9 +20854,9 @@
         </node>
       </node>
       <node concept="P$JXv" id="KkWtiMTJpq" role="lGtFl">
-        <node concept="TZ5HA" id="KkWtiMTJpr" role="TZ5H$">
-          <node concept="1dT_AC" id="KkWtiMTJps" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgoO" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgoP" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -19984,9 +21018,36 @@
         </node>
       </node>
       <node concept="P$JXv" id="721IDwqGU93" role="lGtFl">
-        <node concept="TZ5HA" id="721IDwqGU94" role="TZ5H$">
-          <node concept="1dT_AC" id="721IDwqGU95" role="1dT_Ay">
-            <property role="1dT_AB" value="Add update to the list of updates for origin node." />
+        <node concept="1PaTwC" id="M_dau6OgoQ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgoR" role="1PaTwD">
+            <property role="3oM_SC" value="Add" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoS" role="1PaTwD">
+            <property role="3oM_SC" value="update" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoT" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoU" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoV" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoW" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoX" role="1PaTwD">
+            <property role="3oM_SC" value="updates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoY" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgoZ" role="1PaTwD">
+            <property role="3oM_SC" value="origin" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogp0" role="1PaTwD">
+            <property role="3oM_SC" value="node." />
           </node>
         </node>
       </node>
@@ -20350,14 +21411,50 @@
         </node>
       </node>
       <node concept="P$JXv" id="1XKnVQkJXN" role="lGtFl">
-        <node concept="TZ5HA" id="1XKnVQkJXO" role="TZ5H$">
-          <node concept="1dT_AC" id="1XKnVQkJXP" role="1dT_Ay">
-            <property role="1dT_AB" value="Performs invalidation on the passed RulesPlanHandler using the changed set. " />
+        <node concept="1PaTwC" id="M_dau6Ogp1" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogp2" role="1PaTwD">
+            <property role="3oM_SC" value="Performs" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogp3" role="1PaTwD">
+            <property role="3oM_SC" value="invalidation" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogp4" role="1PaTwD">
+            <property role="3oM_SC" value="on" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogp5" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogp6" role="1PaTwD">
+            <property role="3oM_SC" value="passed" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogp7" role="1PaTwD">
+            <property role="3oM_SC" value="RulesPlanHandler" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogp8" role="1PaTwD">
+            <property role="3oM_SC" value="using" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogp9" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogpa" role="1PaTwD">
+            <property role="3oM_SC" value="changed" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogpb" role="1PaTwD">
+            <property role="3oM_SC" value="set." />
           </node>
         </node>
-        <node concept="TZ5HA" id="55xYlrlJHGn" role="TZ5H$">
-          <node concept="1dT_AC" id="55xYlrlJHGo" role="1dT_Ay">
-            <property role="1dT_AB" value="Clears internally collected changes. " />
+        <node concept="1PaTwC" id="M_dau6Ogpc" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogpd" role="1PaTwD">
+            <property role="3oM_SC" value="Clears" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogpe" role="1PaTwD">
+            <property role="3oM_SC" value="internally" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogpf" role="1PaTwD">
+            <property role="3oM_SC" value="collected" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogpg" role="1PaTwD">
+            <property role="3oM_SC" value="changes." />
           </node>
         </node>
       </node>
@@ -21771,29 +22868,140 @@
     <node concept="2tJIrI" id="4hQVL4f8_uU" role="jymVt" />
     <node concept="3Tm1VV" id="6nFpYlu02jE" role="1B3o_S" />
     <node concept="3UR2Jj" id="721IDwqGO$k" role="lGtFl">
-      <node concept="TZ5HA" id="721IDwqGO$l" role="TZ5H$">
-        <node concept="1dT_AC" id="721IDwqGO$m" role="1dT_Ay">
-          <property role="1dT_AB" value="Serves as an aid for implementing incremental update of Coderules program." />
+      <node concept="1PaTwC" id="M_dau6OghY" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OghZ" role="1PaTwD">
+          <property role="3oM_SC" value="Serves" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi0" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi1" role="1PaTwD">
+          <property role="3oM_SC" value="an" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi2" role="1PaTwD">
+          <property role="3oM_SC" value="aid" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi3" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi4" role="1PaTwD">
+          <property role="3oM_SC" value="implementing" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi5" role="1PaTwD">
+          <property role="3oM_SC" value="incremental" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi6" role="1PaTwD">
+          <property role="3oM_SC" value="update" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi7" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi8" role="1PaTwD">
+          <property role="3oM_SC" value="Coderules" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi9" role="1PaTwD">
+          <property role="3oM_SC" value="program." />
         </node>
       </node>
-      <node concept="TZ5HA" id="5Qx6_656drH" role="TZ5H$">
-        <node concept="1dT_AC" id="5Qx6_656drI" role="1dT_Ay">
-          <property role="1dT_AB" value="Enables to track a list of update objects: (source -&gt; list of U)." />
+      <node concept="1PaTwC" id="M_dau6Ogia" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogib" role="1PaTwD">
+          <property role="3oM_SC" value="Enables" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogic" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogid" role="1PaTwD">
+          <property role="3oM_SC" value="track" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogie" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogif" role="1PaTwD">
+          <property role="3oM_SC" value="list" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogig" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogih" role="1PaTwD">
+          <property role="3oM_SC" value="update" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogii" role="1PaTwD">
+          <property role="3oM_SC" value="objects:" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogij" role="1PaTwD">
+          <property role="3oM_SC" value="(source" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogik" role="1PaTwD">
+          <property role="3oM_SC" value="-&gt;" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogil" role="1PaTwD">
+          <property role="3oM_SC" value="list" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogim" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogin" role="1PaTwD">
+          <property role="3oM_SC" value="U)." />
         </node>
       </node>
-      <node concept="TZ5HA" id="721IDwqGYGf" role="TZ5H$">
-        <node concept="1dT_AC" id="721IDwqGYGg" role="1dT_Ay">
-          <property role="1dT_AB" value="Maintains a map of reversed dependencies: (required -&gt; source)." />
+      <node concept="1PaTwC" id="M_dau6Ogio" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogip" role="1PaTwD">
+          <property role="3oM_SC" value="Maintains" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogiq" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogir" role="1PaTwD">
+          <property role="3oM_SC" value="map" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogis" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogit" role="1PaTwD">
+          <property role="3oM_SC" value="reversed" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogiu" role="1PaTwD">
+          <property role="3oM_SC" value="dependencies:" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogiv" role="1PaTwD">
+          <property role="3oM_SC" value="(required" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogiw" role="1PaTwD">
+          <property role="3oM_SC" value="-&gt;" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogix" role="1PaTwD">
+          <property role="3oM_SC" value="source)." />
         </node>
       </node>
-      <node concept="TZ5HA" id="721IDwqHaMB" role="TZ5H$">
-        <node concept="1dT_AC" id="721IDwqHaMC" role="1dT_Ay">
-          <property role="1dT_AB" value="Listens to model events and collects changed nodes. " />
+      <node concept="1PaTwC" id="M_dau6Ogiy" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogiz" role="1PaTwD">
+          <property role="3oM_SC" value="Listens" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi$" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogi_" role="1PaTwD">
+          <property role="3oM_SC" value="model" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgiA" role="1PaTwD">
+          <property role="3oM_SC" value="events" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgiB" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgiC" role="1PaTwD">
+          <property role="3oM_SC" value="collects" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgiD" role="1PaTwD">
+          <property role="3oM_SC" value="changed" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgiE" role="1PaTwD">
+          <property role="3oM_SC" value="nodes." />
         </node>
       </node>
-      <node concept="TZ5HA" id="721IDwqHbeT" role="TZ5H$">
-        <node concept="1dT_AC" id="721IDwqHbeU" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6OgiF" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgiG" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
     </node>
@@ -22419,9 +23627,15 @@
         <property role="TrG5h" value="T" />
       </node>
       <node concept="3UR2Jj" id="tIwzd1IT_8" role="lGtFl">
-        <node concept="TZ5HA" id="tIwzd1IT_9" role="TZ5H$">
-          <node concept="1dT_AC" id="tIwzd1IT_a" role="1dT_Ay">
-            <property role="1dT_AB" value="Just a monoid." />
+        <node concept="1PaTwC" id="M_dau6OgiH" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgiI" role="1PaTwD">
+            <property role="3oM_SC" value="Just" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgiJ" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgiK" role="1PaTwD">
+            <property role="3oM_SC" value="monoid." />
           </node>
         </node>
       </node>
@@ -22679,25 +23893,62 @@
         </node>
       </node>
       <node concept="3UR2Jj" id="4UTrqZZQ_UN" role="lGtFl">
-        <node concept="TZ5HA" id="4UTrqZZQ_UO" role="TZ5H$">
-          <node concept="1dT_AC" id="4UTrqZZQ_UP" role="1dT_Ay">
-            <property role="1dT_AB" value="Walks all children from the given root." />
+        <node concept="1PaTwC" id="M_dau6OgiL" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgiM" role="1PaTwD">
+            <property role="3oM_SC" value="Walks" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgiN" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgiO" role="1PaTwD">
+            <property role="3oM_SC" value="children" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgiP" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgiQ" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgiR" role="1PaTwD">
+            <property role="3oM_SC" value="given" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgiS" role="1PaTwD">
+            <property role="3oM_SC" value="root." />
           </node>
         </node>
-        <node concept="TZ5HA" id="4UTrqZZQD5c" role="TZ5H$">
-          <node concept="1dT_AC" id="4UTrqZZQD5d" role="1dT_Ay">
-            <property role="1dT_AB" value="Override " />
+        <node concept="1PaTwC" id="M_dau6OgiT" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgiU" role="1PaTwD">
+            <property role="3oM_SC" value="Override" />
           </node>
-          <node concept="1dT_AA" id="4UTrqZZQD5V" role="1dT_Ay">
-            <node concept="92FcH" id="4UTrqZZQD61" role="qph3F">
-              <node concept="TZ5HA" id="4UTrqZZQD63" role="2XjZqd" />
-              <node concept="VXe0Z" id="4UTrqZZQHEI" role="92FcQ">
+          <node concept="1Vtdud" id="M_dau6OgiV" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6OgiW" role="1Vtduc">
+              <node concept="VXe0Z" id="4UTrqZZQHEI" role="1VuXuu">
                 <ref role="VXe0S" node="4UTrqZZO4eL" resolve="skip" />
               </node>
+              <node concept="1PaTwC" id="M_dau6OgiZ" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6Ogj0" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="4UTrqZZQD5U" role="1dT_Ay">
-            <property role="1dT_AB" value=" to control which nodes to include." />
+          <node concept="3oM_SD" id="M_dau6Ogj1" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogj2" role="1PaTwD">
+            <property role="3oM_SC" value="control" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogj3" role="1PaTwD">
+            <property role="3oM_SC" value="which" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogj4" role="1PaTwD">
+            <property role="3oM_SC" value="nodes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogj5" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogj6" role="1PaTwD">
+            <property role="3oM_SC" value="include." />
           </node>
         </node>
       </node>
@@ -22835,9 +24086,30 @@
         <property role="TrG5h" value="S" />
       </node>
       <node concept="3UR2Jj" id="4UTrqZZQMQS" role="lGtFl">
-        <node concept="TZ5HA" id="4UTrqZZQMQT" role="TZ5H$">
-          <node concept="1dT_AC" id="4UTrqZZQMQU" role="1dT_Ay">
-            <property role="1dT_AB" value="Walks only the nodes that are &quot;interface part&quot;." />
+        <node concept="1PaTwC" id="M_dau6Ogj7" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogj8" role="1PaTwD">
+            <property role="3oM_SC" value="Walks" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogj9" role="1PaTwD">
+            <property role="3oM_SC" value="only" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogja" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjb" role="1PaTwD">
+            <property role="3oM_SC" value="nodes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjc" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjd" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogje" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;interface" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjf" role="1PaTwD">
+            <property role="3oM_SC" value="part&quot;." />
           </node>
         </node>
       </node>
@@ -22929,9 +24201,30 @@
         </node>
       </node>
       <node concept="3UR2Jj" id="4UTrqZZQQeD" role="lGtFl">
-        <node concept="TZ5HA" id="4UTrqZZQQeE" role="TZ5H$">
-          <node concept="1dT_AC" id="4UTrqZZQQeF" role="1dT_Ay">
-            <property role="1dT_AB" value="Walks the nodes in the given sequence individually." />
+        <node concept="1PaTwC" id="M_dau6Ogjg" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogjh" role="1PaTwD">
+            <property role="3oM_SC" value="Walks" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogji" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjj" role="1PaTwD">
+            <property role="3oM_SC" value="nodes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjk" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjl" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjm" role="1PaTwD">
+            <property role="3oM_SC" value="given" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjn" role="1PaTwD">
+            <property role="3oM_SC" value="sequence" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogjo" role="1PaTwD">
+            <property role="3oM_SC" value="individually." />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
index c0ff8e90..a212b436 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
@@ -272,16 +272,10 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
@@ -9994,9 +9988,45 @@
     </node>
     <node concept="2tJIrI" id="4ekZiHddjKB" role="jymVt" />
     <node concept="3UR2Jj" id="4ekZiHddkfE" role="lGtFl">
-      <node concept="TZ5HA" id="4ekZiHddkfF" role="TZ5H$">
-        <node concept="1dT_AC" id="4ekZiHddkfG" role="1dT_Ay">
-          <property role="1dT_AB" value="A pair of references to the feedback's origin template and the origin node." />
+      <node concept="1PaTwC" id="M_dau6Ogph" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogpi" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpj" role="1PaTwD">
+          <property role="3oM_SC" value="pair" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpk" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpl" role="1PaTwD">
+          <property role="3oM_SC" value="references" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpm" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpn" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpo" role="1PaTwD">
+          <property role="3oM_SC" value="feedback's" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpp" role="1PaTwD">
+          <property role="3oM_SC" value="origin" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpq" role="1PaTwD">
+          <property role="3oM_SC" value="template" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpr" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogps" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpt" role="1PaTwD">
+          <property role="3oM_SC" value="origin" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpu" role="1PaTwD">
+          <property role="3oM_SC" value="node." />
         </node>
       </node>
     </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.result.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.result.mps
index 3e8462fa..f74fa4af 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.result.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.result.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -142,17 +142,11 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -355,9 +349,15 @@
       <node concept="3Tm1VV" id="5X1yxJI3vj_" role="1B3o_S" />
       <node concept="3clFbS" id="5X1yxJI3vjA" role="3clF47" />
       <node concept="P$JXv" id="4qGA5WE1BM9" role="lGtFl">
-        <node concept="TZ5HA" id="4qGA5WE1BMa" role="TZ5H$">
-          <node concept="1dT_AC" id="4qGA5WE1BMb" role="1dT_Ay">
-            <property role="1dT_AB" value="The first exception." />
+        <node concept="1PaTwC" id="M_dau6OgpK" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgpL" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgpM" role="1PaTwD">
+            <property role="3oM_SC" value="first" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgpN" role="1PaTwD">
+            <property role="3oM_SC" value="exception." />
           </node>
         </node>
       </node>
@@ -374,9 +374,21 @@
       <node concept="3Tm1VV" id="5X1yxJI3E6P" role="1B3o_S" />
       <node concept="3clFbS" id="5X1yxJI3E6Q" role="3clF47" />
       <node concept="P$JXv" id="5X1yxJI47fc" role="lGtFl">
-        <node concept="TZ5HA" id="5X1yxJI47fd" role="TZ5H$">
-          <node concept="1dT_AC" id="5X1yxJI47fe" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns most recent cause first." />
+        <node concept="1PaTwC" id="M_dau6OgpO" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgpP" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgpQ" role="1PaTwD">
+            <property role="3oM_SC" value="most" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgpR" role="1PaTwD">
+            <property role="3oM_SC" value="recent" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgpS" role="1PaTwD">
+            <property role="3oM_SC" value="cause" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgpT" role="1PaTwD">
+            <property role="3oM_SC" value="first." />
           </node>
         </node>
       </node>
@@ -1367,9 +1379,54 @@
     <node concept="2tJIrI" id="7Oc59RSEji1" role="jymVt" />
     <node concept="3Tm1VV" id="7Oc59RSEjdc" role="1B3o_S" />
     <node concept="3UR2Jj" id="3ITCJTXESg1" role="lGtFl">
-      <node concept="TZ5HA" id="3ITCJTXESg2" role="TZ5H$">
-        <node concept="1dT_AC" id="3ITCJTXESg3" role="1dT_Ay">
-          <property role="1dT_AB" value="An algebraic structure (similar to a semigroup) that is used to report results of an operation." />
+      <node concept="1PaTwC" id="M_dau6Ogpv" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogpw" role="1PaTwD">
+          <property role="3oM_SC" value="An" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpx" role="1PaTwD">
+          <property role="3oM_SC" value="algebraic" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpy" role="1PaTwD">
+          <property role="3oM_SC" value="structure" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogpz" role="1PaTwD">
+          <property role="3oM_SC" value="(similar" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogp$" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogp_" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpA" role="1PaTwD">
+          <property role="3oM_SC" value="semigroup)" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpB" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpC" role="1PaTwD">
+          <property role="3oM_SC" value="is" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpD" role="1PaTwD">
+          <property role="3oM_SC" value="used" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpE" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpF" role="1PaTwD">
+          <property role="3oM_SC" value="report" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpG" role="1PaTwD">
+          <property role="3oM_SC" value="results" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpH" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpI" role="1PaTwD">
+          <property role="3oM_SC" value="an" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpJ" role="1PaTwD">
+          <property role="3oM_SC" value="operation." />
         </node>
       </node>
     </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
index c52546a3..b5de6e9d 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -317,31 +317,27 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="2546654756694997551" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTag" flags="ng" index="92FcH">
-        <child id="2546654756694997556" name="reference" index="92FcQ" />
-        <child id="3106559687488913694" name="line" index="2XjZqd" />
+      <concept id="6971016359099800069" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldSingleCommentLine" flags="ngI" index="2JaDLO">
+        <child id="6971016359099801474" name="commentBody" index="2JaDBN" />
       </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
         <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
-        <child id="2667874559098216723" name="text" index="3HnX3l" />
-      </concept>
+      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI" />
       <concept id="2217234381367530195" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocReference" flags="ng" index="VXe0Z">
         <reference id="2217234381367530196" name="methodDeclaration" index="VXe0S" />
       </concept>
-      <concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
-        <child id="6962838954693749192" name="tag" index="qph3F" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
+      <concept id="5085607816306582224" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentTextElement" flags="ng" index="1Vtdud">
+        <child id="5085607816306582225" name="tag" index="1Vtduc" />
+      </concept>
+      <concept id="5085607816306647746" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTagTE" flags="ng" index="1VuXuv">
+        <child id="5085607816306647747" name="reference" index="1VuXuu" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
@@ -1940,9 +1936,21 @@
     </node>
     <node concept="2tJIrI" id="4sSe4$oTqqS" role="jymVt" />
     <node concept="3UR2Jj" id="5Nh6YP1b21d" role="lGtFl">
-      <node concept="TZ5HA" id="5Nh6YP1b21e" role="TZ5H$">
-        <node concept="1dT_AC" id="5Nh6YP1b21f" role="1dT_Ay">
-          <property role="1dT_AB" value="FIXME: rename to &quot;user constraint&quot;" />
+      <node concept="1PaTwC" id="M_dau6OgpU" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgpV" role="1PaTwD">
+          <property role="3oM_SC" value="FIXME:" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpW" role="1PaTwD">
+          <property role="3oM_SC" value="rename" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpX" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpY" role="1PaTwD">
+          <property role="3oM_SC" value="&quot;user" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgpZ" role="1PaTwD">
+          <property role="3oM_SC" value="constraint&quot;" />
         </node>
       </node>
     </node>
@@ -2188,9 +2196,15 @@
       <node concept="3cqZAl" id="4VNF0fT2w3M" role="3clF45" />
       <node concept="P$JXv" id="KkWtiNxOBy" role="lGtFl">
         <node concept="TZ5HI" id="1bodCZHKBIk" role="3nqlJM">
-          <node concept="TZ5HA" id="1bodCZHKBIl" role="3HnX3l">
-            <node concept="1dT_AC" id="1bodCZHKHHM" role="1dT_Ay">
-              <property role="1dT_AB" value="use addRequired directly" />
+          <node concept="1PaTwC" id="M_dau6Ogq0" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6Ogq1" role="1PaTwD">
+              <property role="3oM_SC" value="use" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogq2" role="1PaTwD">
+              <property role="3oM_SC" value="addRequired" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6Ogq3" role="1PaTwD">
+              <property role="3oM_SC" value="directly" />
             </node>
           </node>
         </node>
@@ -2233,20 +2247,24 @@
       <node concept="3Tm1VV" id="4VNF0fT3X0l" role="1B3o_S" />
       <node concept="3cqZAl" id="4VNF0fT3X0m" role="3clF45" />
       <node concept="P$JXv" id="KkWtiNy8iR" role="lGtFl">
-        <node concept="TZ5HA" id="KkWtiNy8iS" role="TZ5H$">
-          <node concept="1dT_AC" id="KkWtiNy8iT" role="1dT_Ay">
-            <property role="1dT_AB" value="See " />
+        <node concept="1PaTwC" id="M_dau6Ogq4" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogq5" role="1PaTwD">
+            <property role="3oM_SC" value="See" />
           </node>
-          <node concept="1dT_AA" id="KkWtiNyaAg" role="1dT_Ay">
-            <node concept="92FcH" id="KkWtiNyaAy" role="qph3F">
-              <node concept="TZ5HA" id="KkWtiNyaA$" role="2XjZqd" />
-              <node concept="VXe0Z" id="KkWtiNyaAS" role="92FcQ">
+          <node concept="1Vtdud" id="M_dau6Ogq6" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6Ogq7" role="1Vtduc">
+              <node concept="VXe0Z" id="KkWtiNyaAS" role="1VuXuu">
                 <ref role="VXe0S" node="4VNF0fT2w6j" resolve="addDependency" />
               </node>
+              <node concept="1PaTwC" id="M_dau6Ogqa" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6Ogqb" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="KkWtiNyaAf" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+          <node concept="3oM_SD" id="M_dau6Ogqc" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -2334,24 +2352,138 @@
       <node concept="3Tm1VV" id="KkWtiOdfVz" role="1B3o_S" />
       <node concept="3cqZAl" id="KkWtiOdfV$" role="3clF45" />
       <node concept="P$JXv" id="KkWtiOdfV_" role="lGtFl">
-        <node concept="TZ5HA" id="1bodCZHKqZy" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZHKqZz" role="1dT_Ay">
-            <property role="1dT_AB" value="Register &quot;required&quot; dependency of source from required. " />
+        <node concept="1PaTwC" id="M_dau6Ogqd" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogqe" role="1PaTwD">
+            <property role="3oM_SC" value="Register" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqf" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;required&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqg" role="1PaTwD">
+            <property role="3oM_SC" value="dependency" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqh" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqi" role="1PaTwD">
+            <property role="3oM_SC" value="source" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqj" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqk" role="1PaTwD">
+            <property role="3oM_SC" value="required." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1bodCZHKqZ$" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZHKqZ_" role="1dT_Ay">
-            <property role="1dT_AB" value="Any change in required should result in recalculating any data associated with source," />
+        <node concept="1PaTwC" id="M_dau6Ogql" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogqm" role="1PaTwD">
+            <property role="3oM_SC" value="Any" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqn" role="1PaTwD">
+            <property role="3oM_SC" value="change" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqo" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqp" role="1PaTwD">
+            <property role="3oM_SC" value="required" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqq" role="1PaTwD">
+            <property role="3oM_SC" value="should" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqr" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqs" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqt" role="1PaTwD">
+            <property role="3oM_SC" value="recalculating" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqu" role="1PaTwD">
+            <property role="3oM_SC" value="any" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqv" role="1PaTwD">
+            <property role="3oM_SC" value="data" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqw" role="1PaTwD">
+            <property role="3oM_SC" value="associated" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqx" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogqy" role="1PaTwD">
+            <property role="3oM_SC" value="source," />
           </node>
         </node>
-        <node concept="TZ5HA" id="1bodCZHKtdh" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZHKtdi" role="1dT_Ay">
-            <property role="1dT_AB" value="unless the result of update function applied to required node is unchanged." />
+        <node concept="1PaTwC" id="M_dau6Ogqz" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogq$" role="1PaTwD">
+            <property role="3oM_SC" value="unless" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogq_" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqA" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqB" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqC" role="1PaTwD">
+            <property role="3oM_SC" value="update" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqD" role="1PaTwD">
+            <property role="3oM_SC" value="function" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqE" role="1PaTwD">
+            <property role="3oM_SC" value="applied" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqF" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqG" role="1PaTwD">
+            <property role="3oM_SC" value="required" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqH" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqI" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqJ" role="1PaTwD">
+            <property role="3oM_SC" value="unchanged." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1bodCZHKxIn" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZHKxIo" role="1dT_Ay">
-            <property role="1dT_AB" value="This gives the possibility to incrementally update the data graph. " />
+        <node concept="1PaTwC" id="M_dau6OgqK" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgqL" role="1PaTwD">
+            <property role="3oM_SC" value="This" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqM" role="1PaTwD">
+            <property role="3oM_SC" value="gives" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqN" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqO" role="1PaTwD">
+            <property role="3oM_SC" value="possibility" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqP" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqQ" role="1PaTwD">
+            <property role="3oM_SC" value="incrementally" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqR" role="1PaTwD">
+            <property role="3oM_SC" value="update" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqS" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqT" role="1PaTwD">
+            <property role="3oM_SC" value="data" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqU" role="1PaTwD">
+            <property role="3oM_SC" value="graph." />
           </node>
         </node>
       </node>
@@ -2377,14 +2509,80 @@
         </node>
       </node>
       <node concept="P$JXv" id="1bodCZHL77a" role="lGtFl">
-        <node concept="TZ5HA" id="1bodCZHL77b" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZHL77c" role="1dT_Ay">
-            <property role="1dT_AB" value="Used exclusively to collect &quot;required&quot; nodes (in a sense that they are to be included in the walk path " />
+        <node concept="1PaTwC" id="M_dau6OgqV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgqW" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqX" role="1PaTwD">
+            <property role="3oM_SC" value="exclusively" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqY" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgqZ" role="1PaTwD">
+            <property role="3oM_SC" value="collect" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr0" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;required&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr1" role="1PaTwD">
+            <property role="3oM_SC" value="nodes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr2" role="1PaTwD">
+            <property role="3oM_SC" value="(in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr3" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr4" role="1PaTwD">
+            <property role="3oM_SC" value="sense" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr5" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr6" role="1PaTwD">
+            <property role="3oM_SC" value="they" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr7" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr8" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr9" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogra" role="1PaTwD">
+            <property role="3oM_SC" value="included" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogrb" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogrc" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogrd" role="1PaTwD">
+            <property role="3oM_SC" value="walk" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogre" role="1PaTwD">
+            <property role="3oM_SC" value="path" />
           </node>
         </node>
-        <node concept="TZ5HA" id="1bodCZHL9wA" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZHL9wB" role="1dT_Ay">
-            <property role="1dT_AB" value="of the templates application procedure)." />
+        <node concept="1PaTwC" id="M_dau6Ogrf" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogrg" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogrh" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogri" role="1PaTwD">
+            <property role="3oM_SC" value="templates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogrj" role="1PaTwD">
+            <property role="3oM_SC" value="application" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogrk" role="1PaTwD">
+            <property role="3oM_SC" value="procedure)." />
           </node>
         </node>
       </node>
@@ -2425,25 +2623,68 @@
         </node>
       </node>
       <node concept="P$JXv" id="1bodCZHLCa_" role="lGtFl">
-        <node concept="TZ5HA" id="1bodCZHLCaA" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZHLCaB" role="1dT_Ay">
-            <property role="1dT_AB" value="An alias for " />
+        <node concept="1PaTwC" id="M_dau6Ogrl" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogrm" role="1PaTwD">
+            <property role="3oM_SC" value="An" />
           </node>
-          <node concept="1dT_AA" id="1bodCZHLOmP" role="1dT_Ay">
-            <node concept="92FcH" id="1bodCZHLOn7" role="qph3F">
-              <node concept="TZ5HA" id="1bodCZHLOn9" role="2XjZqd" />
-              <node concept="VXe0Z" id="1bodCZHLOwa" role="92FcQ">
+          <node concept="3oM_SD" id="M_dau6Ogrn" role="1PaTwD">
+            <property role="3oM_SC" value="alias" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogro" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6Ogrp" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6Ogrq" role="1Vtduc">
+              <node concept="VXe0Z" id="1bodCZHLOwa" role="1VuXuu">
                 <ref role="VXe0S" node="KkWtiOdfV0" resolve="addRequired" />
               </node>
+              <node concept="1PaTwC" id="M_dau6Ogrt" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6Ogru" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="1bodCZHLOmO" role="1dT_Ay">
-            <property role="1dT_AB" value=". " />
+          <node concept="3oM_SD" id="M_dau6Ogrv" role="1PaTwD">
+            <property role="3oM_SC" value="." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1bodCZHLYfI" role="TZ5H$">
-          <node concept="1dT_AC" id="1bodCZHLYfJ" role="1dT_Ay">
-            <property role="1dT_AB" value="This method and all the overloaded variants thereof are used from templates." />
+        <node concept="1PaTwC" id="M_dau6Ogrw" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogrx" role="1PaTwD">
+            <property role="3oM_SC" value="This" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogry" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogrz" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr$" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogr_" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrA" role="1PaTwD">
+            <property role="3oM_SC" value="overloaded" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrB" role="1PaTwD">
+            <property role="3oM_SC" value="variants" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrC" role="1PaTwD">
+            <property role="3oM_SC" value="thereof" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrD" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrE" role="1PaTwD">
+            <property role="3oM_SC" value="used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrF" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrG" role="1PaTwD">
+            <property role="3oM_SC" value="templates." />
           </node>
         </node>
       </node>
@@ -2992,9 +3233,54 @@
         </node>
       </node>
       <node concept="P$JXv" id="7mIqwW50G9s" role="lGtFl">
-        <node concept="TZ5HA" id="7mIqwW50G9t" role="TZ5H$">
-          <node concept="1dT_AC" id="7mIqwW50G9u" role="1dT_Ay">
-            <property role="1dT_AB" value="Overloaded variant of the default expandMacro method accepting the concept instead of the macro input node." />
+        <node concept="1PaTwC" id="M_dau6OgrH" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgrI" role="1PaTwD">
+            <property role="3oM_SC" value="Overloaded" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrJ" role="1PaTwD">
+            <property role="3oM_SC" value="variant" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrK" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrL" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrM" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrN" role="1PaTwD">
+            <property role="3oM_SC" value="expandMacro" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrO" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrP" role="1PaTwD">
+            <property role="3oM_SC" value="accepting" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrQ" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrR" role="1PaTwD">
+            <property role="3oM_SC" value="concept" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrS" role="1PaTwD">
+            <property role="3oM_SC" value="instead" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrT" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrU" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrV" role="1PaTwD">
+            <property role="3oM_SC" value="macro" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrW" role="1PaTwD">
+            <property role="3oM_SC" value="input" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgrX" role="1PaTwD">
+            <property role="3oM_SC" value="node." />
           </node>
         </node>
       </node>
@@ -3973,9 +4259,39 @@
       <node concept="3Tm1VV" id="3Pxu0s8egWd" role="1B3o_S" />
       <node concept="3clFbS" id="3Pxu0s8egWe" role="3clF47" />
       <node concept="P$JXv" id="3Pxu0s8eh8J" role="lGtFl">
-        <node concept="TZ5HA" id="3Pxu0s8eh8K" role="TZ5H$">
-          <node concept="1dT_AC" id="3Pxu0s8eh8L" role="1dT_Ay">
-            <property role="1dT_AB" value="Node that used to trigger this rule, null for constant rules. " />
+        <node concept="1PaTwC" id="M_dau6OgrY" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgrZ" role="1PaTwD">
+            <property role="3oM_SC" value="Node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs0" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs1" role="1PaTwD">
+            <property role="3oM_SC" value="used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs2" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs3" role="1PaTwD">
+            <property role="3oM_SC" value="trigger" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs4" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs5" role="1PaTwD">
+            <property role="3oM_SC" value="rule," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs6" role="1PaTwD">
+            <property role="3oM_SC" value="null" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs7" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs8" role="1PaTwD">
+            <property role="3oM_SC" value="constant" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs9" role="1PaTwD">
+            <property role="3oM_SC" value="rules." />
           </node>
         </node>
       </node>
@@ -3993,19 +4309,142 @@
       <node concept="3Tm1VV" id="7nPD14Ob4ep" role="1B3o_S" />
       <node concept="3clFbS" id="7nPD14Ob4eq" role="3clF47" />
       <node concept="P$JXv" id="6tnA466TYOV" role="lGtFl">
-        <node concept="TZ5HA" id="6tnA466TYOW" role="TZ5H$">
-          <node concept="1dT_AC" id="6tnA466TYOX" role="1dT_Ay">
-            <property role="1dT_AB" value="A reference to the origin node for possible errors to be reported. " />
+        <node concept="1PaTwC" id="M_dau6Ogsa" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogsb" role="1PaTwD">
+            <property role="3oM_SC" value="A" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsc" role="1PaTwD">
+            <property role="3oM_SC" value="reference" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsd" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogse" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsf" role="1PaTwD">
+            <property role="3oM_SC" value="origin" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsg" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsh" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsi" role="1PaTwD">
+            <property role="3oM_SC" value="possible" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsj" role="1PaTwD">
+            <property role="3oM_SC" value="errors" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsk" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsl" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsm" role="1PaTwD">
+            <property role="3oM_SC" value="reported." />
           </node>
         </node>
-        <node concept="TZ5HA" id="6tnA467FJQk" role="TZ5H$">
-          <node concept="1dT_AC" id="6tnA467FJQl" role="1dT_Ay">
-            <property role="1dT_AB" value="If not specified explicitly by the rule template, the node used to trigger this rule is assumed. " />
+        <node concept="1PaTwC" id="M_dau6Ogsn" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogso" role="1PaTwD">
+            <property role="3oM_SC" value="If" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsp" role="1PaTwD">
+            <property role="3oM_SC" value="not" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsq" role="1PaTwD">
+            <property role="3oM_SC" value="specified" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsr" role="1PaTwD">
+            <property role="3oM_SC" value="explicitly" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogss" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogst" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsu" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsv" role="1PaTwD">
+            <property role="3oM_SC" value="template," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsw" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsx" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsy" role="1PaTwD">
+            <property role="3oM_SC" value="used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogsz" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs$" role="1PaTwD">
+            <property role="3oM_SC" value="trigger" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogs_" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsA" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsB" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsC" role="1PaTwD">
+            <property role="3oM_SC" value="assumed." />
           </node>
         </node>
-        <node concept="TZ5HA" id="6tnA467FJQy" role="TZ5H$">
-          <node concept="1dT_AC" id="6tnA467FJQz" role="1dT_Ay">
-            <property role="1dT_AB" value="If specified to be null, the origin is looked up from the evaluation context (provenance). " />
+        <node concept="1PaTwC" id="M_dau6OgsD" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgsE" role="1PaTwD">
+            <property role="3oM_SC" value="If" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsF" role="1PaTwD">
+            <property role="3oM_SC" value="specified" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsG" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsH" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsI" role="1PaTwD">
+            <property role="3oM_SC" value="null," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsJ" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsK" role="1PaTwD">
+            <property role="3oM_SC" value="origin" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsL" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsM" role="1PaTwD">
+            <property role="3oM_SC" value="looked" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsN" role="1PaTwD">
+            <property role="3oM_SC" value="up" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsO" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsP" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsQ" role="1PaTwD">
+            <property role="3oM_SC" value="evaluation" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsR" role="1PaTwD">
+            <property role="3oM_SC" value="context" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsS" role="1PaTwD">
+            <property role="3oM_SC" value="(provenance)." />
           </node>
         </node>
       </node>
@@ -4020,9 +4459,24 @@
       <node concept="3Tm1VV" id="7nPD14Ob4lw" role="1B3o_S" />
       <node concept="3clFbS" id="7nPD14Ob4lx" role="3clF47" />
       <node concept="P$JXv" id="6tnA466TYPo" role="lGtFl">
-        <node concept="TZ5HA" id="6tnA466TYPp" role="TZ5H$">
-          <node concept="1dT_AC" id="6tnA466TYPq" role="1dT_Ay">
-            <property role="1dT_AB" value="A reference to the rule template. " />
+        <node concept="1PaTwC" id="M_dau6OgsT" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgsU" role="1PaTwD">
+            <property role="3oM_SC" value="A" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsV" role="1PaTwD">
+            <property role="3oM_SC" value="reference" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsW" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsX" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsY" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgsZ" role="1PaTwD">
+            <property role="3oM_SC" value="template." />
           </node>
         </node>
       </node>
@@ -4035,9 +4489,39 @@
       <node concept="3Tm1VV" id="7L9cSENG5tk" role="1B3o_S" />
       <node concept="10P_77" id="7L9cSENG5u1" role="3clF45" />
       <node concept="P$JXv" id="7L9cSENG5vr" role="lGtFl">
-        <node concept="TZ5HA" id="7L9cSENG5vs" role="TZ5H$">
-          <node concept="1dT_AC" id="7L9cSENG5vt" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns true if this rule is a part of query template" />
+        <node concept="1PaTwC" id="M_dau6Ogt0" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogt1" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogt2" role="1PaTwD">
+            <property role="3oM_SC" value="true" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogt3" role="1PaTwD">
+            <property role="3oM_SC" value="if" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogt4" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogt5" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogt6" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogt7" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogt8" role="1PaTwD">
+            <property role="3oM_SC" value="part" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogt9" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogta" role="1PaTwD">
+            <property role="3oM_SC" value="query" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtb" role="1PaTwD">
+            <property role="3oM_SC" value="template" />
           </node>
         </node>
       </node>
@@ -4345,9 +4829,48 @@
         <node concept="10Oyi0" id="1lzLQ0zu_HF" role="1tU5fm" />
       </node>
       <node concept="P$JXv" id="IFW4V3zIjb" role="lGtFl">
-        <node concept="TZ5HA" id="IFW4V3zIjc" role="TZ5H$">
-          <node concept="1dT_AC" id="IFW4V3zIjd" role="1dT_Ay">
-            <property role="1dT_AB" value="Helps distinguish among multiple instances of the same rule generate e.g. in a loop." />
+        <node concept="1PaTwC" id="M_dau6Ogtc" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogtd" role="1PaTwD">
+            <property role="3oM_SC" value="Helps" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogte" role="1PaTwD">
+            <property role="3oM_SC" value="distinguish" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtf" role="1PaTwD">
+            <property role="3oM_SC" value="among" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtg" role="1PaTwD">
+            <property role="3oM_SC" value="multiple" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogth" role="1PaTwD">
+            <property role="3oM_SC" value="instances" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogti" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtj" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtk" role="1PaTwD">
+            <property role="3oM_SC" value="same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtl" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtm" role="1PaTwD">
+            <property role="3oM_SC" value="generate" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtn" role="1PaTwD">
+            <property role="3oM_SC" value="e.g." />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogto" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtp" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogtq" role="1PaTwD">
+            <property role="3oM_SC" value="loop." />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index 76cb7630..df477a7b 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -30,6 +30,9 @@
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -120,11 +123,11 @@
       </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1510949579266781519" name="jetbrains.mps.lang.generator.structure.TemplateCallMacro" flags="ln" index="5jKBG" />
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
+      <concept id="1510949579266781519" name="jetbrains.mps.lang.generator.structure.TemplateCallMacro" flags="lg" index="5jKBG" />
+      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="lg" index="29HgVG">
         <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
       </concept>
-      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="lg" index="2b32R4">
         <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
       </concept>
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
@@ -154,7 +157,7 @@
         <child id="1167087469900" name="conditionFunction" index="2VPoh3" />
       </concept>
       <concept id="1167087518662" name="jetbrains.mps.lang.generator.structure.CreateRootRule_Condition" flags="in" index="2VP$b9" />
-      <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
+      <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="lg" index="2ZBi8u" />
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
       <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
@@ -167,7 +170,7 @@
         <child id="1092060348987" name="contentNode" index="13RCb5" />
       </concept>
       <concept id="1225228973247" name="jetbrains.mps.lang.generator.structure.MapSrcMacro_PostMapperFunction" flags="in" index="15lBmy" />
-      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="lg" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
       </concept>
       <concept id="1087833466690" name="jetbrains.mps.lang.generator.structure.NodeMacro" flags="lg" index="17VmuZ">
@@ -180,7 +183,7 @@
       <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
         <reference id="1167514355421" name="template" index="3lhOvi" />
       </concept>
-      <concept id="1131073187192" name="jetbrains.mps.lang.generator.structure.MapSrcNodeMacro" flags="ln" index="1pdMLZ">
+      <concept id="1131073187192" name="jetbrains.mps.lang.generator.structure.MapSrcNodeMacro" flags="lg" index="1pdMLZ">
         <child id="1225229330048" name="postMapperFunction" index="15mYut" />
       </concept>
       <concept id="1048903277984099206" name="jetbrains.mps.lang.generator.structure.VarDeclaration" flags="ng" index="1ps_xZ">
@@ -193,18 +196,18 @@
       <concept id="1167756221419" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_templatePropertyValue" flags="nn" index="3zGtF$" />
       <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
       <concept id="1167945743726" name="jetbrains.mps.lang.generator.structure.IfMacro_Condition" flags="in" index="3IZrLx" />
-      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
+      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="ig" index="3JmXsc" />
       <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
         <child id="8900764248744213871" name="contentNode" index="1Koe22" />
       </concept>
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-      <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="ln" index="1W57fq">
+      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="ig" index="3NFfHV" />
+      <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="lg" index="1W57fq">
         <child id="1167945861827" name="conditionFunction" index="3IZSJc" />
       </concept>
-      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
+      <concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="lg" index="1WS0z7">
         <child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
       </concept>
-      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
+      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="lg" index="1ZhdrF">
         <child id="1167770376702" name="referentFunction" index="3$ytzL" />
       </concept>
     </language>
@@ -280,7 +283,6 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
         <child id="1138662048170" name="value" index="tz02z" />
@@ -680,7 +682,7 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="4APe_wK_yYe" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og9o" role="2OqNvi">
                                       <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                     </node>
                                   </node>
@@ -822,7 +824,7 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="4APe_wKs1QQ" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og9q" role="2OqNvi">
                                       <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                     </node>
                                   </node>
@@ -983,7 +985,7 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="4APe_wKs3_C" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og9s" role="2OqNvi">
                                       <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                     </node>
                                   </node>
@@ -1476,7 +1478,7 @@
             <node concept="3clFbF" id="7lmP5gAXRSx" role="3cqZAp">
               <node concept="2OqwBi" id="7lmP5gAXS4n" role="3clFbG">
                 <node concept="30H73N" id="7lmP5gAXRSw" role="2Oq$k0" />
-                <node concept="2qgKlT" id="7lmP5gAXSi1" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og9u" role="2OqNvi">
                   <ref role="37wK5l" to="h103:3vih52511I4" resolve="getQueryClassfier" />
                 </node>
               </node>
@@ -2374,7 +2376,7 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="2qgKlT" id="4APe_wKpuZH" role="2OqNvi">
+                                          <node concept="3zqWPK" id="M_dau6Og9w" role="2OqNvi">
                                             <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                           </node>
                                         </node>
@@ -2498,7 +2500,7 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="2qgKlT" id="4APe_wKpDJ9" role="2OqNvi">
+                                          <node concept="3zqWPK" id="M_dau6Og9y" role="2OqNvi">
                                             <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                           </node>
                                         </node>
@@ -2597,7 +2599,7 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="2qgKlT" id="4APe_wKpEnQ" role="2OqNvi">
+                                          <node concept="3zqWPK" id="M_dau6Og9$" role="2OqNvi">
                                             <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                           </node>
                                         </node>
@@ -2648,7 +2650,7 @@
                                       <ref role="1iwH77" node="1vAI4X$KFA0" resolve="typeTerm_term" />
                                       <node concept="2OqwBi" id="1vAI4X$KH57" role="1iwH7V">
                                         <node concept="30H73N" id="1vAI4X$KH58" role="2Oq$k0" />
-                                        <node concept="2qgKlT" id="1vAI4X$KH59" role="2OqNvi">
+                                        <node concept="3zqWPK" id="M_dau6Og9A" role="2OqNvi">
                                           <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
                                         </node>
                                       </node>
@@ -3084,7 +3086,7 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="4APe_wKqzSC" role="2OqNvi">
+                                      <node concept="3zqWPK" id="M_dau6Og9C" role="2OqNvi">
                                         <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                       </node>
                                     </node>
@@ -3152,7 +3154,7 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="4APe_wKqChb" role="2OqNvi">
+                                      <node concept="3zqWPK" id="M_dau6Og9E" role="2OqNvi">
                                         <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                       </node>
                                     </node>
@@ -3278,7 +3280,7 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="4APe_wKqBuu" role="2OqNvi">
+                                      <node concept="3zqWPK" id="M_dau6Og9G" role="2OqNvi">
                                         <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                       </node>
                                     </node>
@@ -3346,7 +3348,7 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="4APe_wKqCTa" role="2OqNvi">
+                                      <node concept="3zqWPK" id="M_dau6Og9I" role="2OqNvi">
                                         <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                       </node>
                                     </node>
@@ -3458,11 +3460,11 @@
                         <node concept="2OqwBi" id="4APe_wKhIs7" role="2Oq$k0">
                           <node concept="2OqwBi" id="4APe_wKhHAf" role="2Oq$k0">
                             <node concept="30H73N" id="4APe_wKhHAg" role="2Oq$k0" />
-                            <node concept="2qgKlT" id="4APe_wKhHAh" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og9K" role="2OqNvi">
                               <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="4APe_wKhJ2b" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og9M" role="2OqNvi">
                             <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                           </node>
                         </node>
@@ -3474,7 +3476,7 @@
                                   <node concept="37vLTw" id="4APe_wKhNYH" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6E5fMGvfKN_" resolve="it" />
                                   </node>
-                                  <node concept="2qgKlT" id="4APe_wKhP1n" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og9O" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
                                   </node>
                                 </node>
@@ -3500,11 +3502,11 @@
                         <node concept="2OqwBi" id="4APe_wKhQR2" role="2Oq$k0">
                           <node concept="2OqwBi" id="4APe_wKhQR3" role="2Oq$k0">
                             <node concept="30H73N" id="4APe_wKhQR4" role="2Oq$k0" />
-                            <node concept="2qgKlT" id="4APe_wKhQR5" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og9Q" role="2OqNvi">
                               <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="4APe_wKhQR6" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og9S" role="2OqNvi">
                             <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                           </node>
                         </node>
@@ -3516,7 +3518,7 @@
                                   <node concept="37vLTw" id="4APe_wKhQRc" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6E5fMGvfKNB" resolve="it" />
                                   </node>
-                                  <node concept="2qgKlT" id="4APe_wKhQRd" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og9U" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
                                   </node>
                                 </node>
@@ -3542,11 +3544,11 @@
                         <node concept="2OqwBi" id="4APe_wKhSEv" role="2Oq$k0">
                           <node concept="2OqwBi" id="4APe_wKhSEw" role="2Oq$k0">
                             <node concept="30H73N" id="4APe_wKhSEx" role="2Oq$k0" />
-                            <node concept="2qgKlT" id="4APe_wKhSEy" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og9W" role="2OqNvi">
                               <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="4APe_wKhSEz" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og9Y" role="2OqNvi">
                             <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                           </node>
                         </node>
@@ -3558,7 +3560,7 @@
                                   <node concept="37vLTw" id="4APe_wKhSED" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6E5fMGvfKND" resolve="it" />
                                   </node>
-                                  <node concept="2qgKlT" id="4APe_wKhSEE" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Oga0" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
                                   </node>
                                 </node>
@@ -3589,7 +3591,7 @@
                   <node concept="1eOMI4" id="1vAI4X$K4RM" role="3uHU7w">
                     <node concept="2OqwBi" id="1vAI4X$Kym1" role="1eOMHV">
                       <node concept="30H73N" id="1vAI4X$Ky5z" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="1vAI4X$KyGM" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Oga2" role="2OqNvi">
                         <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
                       </node>
                     </node>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
index acc39963..fe226a82 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
@@ -36,7 +36,7 @@
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
@@ -114,7 +114,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
index 520b7c5f..2e91d8b1 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
index 1eb7d37f..2356c568 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
@@ -16,6 +16,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
@@ -126,7 +129,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -228,11 +230,11 @@
                   <node concept="37vLTw" id="1vAI4X$MGI8" role="2Oq$k0">
                     <ref role="3cqZAo" node="1vAI4X$MyiY" resolve="tnb" />
                   </node>
-                  <node concept="2qgKlT" id="1vAI4X$MGI9" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og9c" role="2OqNvi">
                     <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="1vAI4X$MGIa" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og9e" role="2OqNvi">
                   <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
                 </node>
               </node>
@@ -260,7 +262,7 @@
                               <node concept="37vLTw" id="1vAI4X$N8Tk" role="2Oq$k0">
                                 <ref role="3cqZAo" node="6E5fMGvfKN1" resolve="it" />
                               </node>
-                              <node concept="2qgKlT" id="1vAI4X$N8Tl" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og9g" role="2OqNvi">
                                 <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
                               </node>
                             </node>
@@ -269,7 +271,7 @@
                                 <node concept="37vLTw" id="1vAI4X$N8To" role="2Oq$k0">
                                   <ref role="3cqZAo" node="6E5fMGvfKN1" resolve="it" />
                                 </node>
-                                <node concept="2qgKlT" id="1vAI4X$N8Tp" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og9i" role="2OqNvi">
                                   <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="allChildFeatures" />
                                 </node>
                               </node>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
index 190e77ba..6a95cfcb 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
@@ -16,6 +16,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -81,7 +84,6 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -115,11 +117,11 @@
               <node concept="1YBJjd" id="7lmP5gAYjw2" role="2Oq$k0">
                 <ref role="1YBMHb" node="7lmP5gAYhwg" resolve="tqp" />
               </node>
-              <node concept="2qgKlT" id="7lmP5gAYjw3" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og9k" role="2OqNvi">
                 <ref role="37wK5l" to="h103:7lmP5gAYgVD" resolve="getTypecheckingQueryTemplate" />
               </node>
             </node>
-            <node concept="2qgKlT" id="7lmP5gAYjw4" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og9m" role="2OqNvi">
               <ref role="37wK5l" to="h103:3vih52511I4" resolve="getQueryClassfier" />
             </node>
           </node>
diff --git a/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps b/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps
index 66c263ba..5c8e8d18 100644
--- a/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps
@@ -124,7 +124,7 @@
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
-      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="lg" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
       </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
@@ -140,10 +140,10 @@
       <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
         <child id="1805153994415893199" name="type" index="1N15GL" />
       </concept>
-      <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="ln" index="1W57fq">
+      <concept id="1118773211870" name="jetbrains.mps.lang.generator.structure.IfMacro" flags="lg" index="1W57fq">
         <child id="1167945861827" name="conditionFunction" index="3IZSJc" />
       </concept>
-      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
+      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="lg" index="1ZhdrF">
         <child id="1167770376702" name="referentFunction" index="3$ytzL" />
       </concept>
     </language>
diff --git a/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl b/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
index c7baacee..68f22372 100644
--- a/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
+++ b/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
@@ -37,7 +37,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -108,7 +108,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 4c1d3dfd..08dc6f2d 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -22,6 +22,9 @@
     <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
@@ -81,10 +84,10 @@
       </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
+      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="lg" index="29HgVG">
         <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
       </concept>
-      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="lg" index="2b32R4">
         <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
       </concept>
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
@@ -133,7 +136,7 @@
         <child id="1195158608805" name="conditionFunction" index="150hEN" />
         <child id="1195158637244" name="caseConsequence" index="150oIE" />
       </concept>
-      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
+      <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="lg" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
       </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
@@ -151,15 +154,15 @@
       </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
       <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
-      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
+      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="ig" index="3JmXsc" />
       <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
         <child id="8900764248744213871" name="contentNode" index="1Koe22" />
       </concept>
       <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
         <child id="1805153994415893199" name="type" index="1N15GL" />
       </concept>
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
+      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="ig" index="3NFfHV" />
+      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="lg" index="1ZhdrF">
         <child id="1167770376702" name="referentFunction" index="3$ytzL" />
       </concept>
     </language>
@@ -199,7 +202,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -1095,7 +1097,7 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="2qgKlT" id="4U$Q3dJM1k7" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Ogd7" role="2OqNvi">
                     <ref role="37wK5l" to="ha02:3MfP0fxd5Oz" resolve="isArray" />
                   </node>
                 </node>
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 0126d9c3..f68b2da0 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -36,7 +36,7 @@
         <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -102,7 +102,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 9a74fb2b..9d5c693c 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
@@ -31,6 +31,7 @@
         <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
       </concept>
       <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -96,7 +97,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -488,7 +488,7 @@
                   <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="4U$Q3dJRBJx" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogd1" role="2OqNvi">
                 <ref role="37wK5l" node="4U$Q3dJRAQ9" resolve="isArray" />
               </node>
             </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index aa96c622..365f7fd9 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -18,6 +18,9 @@
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -175,7 +178,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
@@ -561,7 +563,7 @@
                                         <ref role="cht4Q" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="6fXjIfxgfPO" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Ogd3" role="2OqNvi">
                                       <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                     </node>
                                   </node>
@@ -695,7 +697,7 @@
                                                 <node concept="37vLTw" id="5TXeSYSLjnX" role="2Oq$k0">
                                                   <ref role="3cqZAo" node="6E5fMGvfKNF" resolve="it" />
                                                 </node>
-                                                <node concept="2qgKlT" id="5TXeSYSLqFn" role="2OqNvi">
+                                                <node concept="3zqWPK" id="M_dau6Ogd5" role="2OqNvi">
                                                   <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                                 </node>
                                               </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index b5e2557b..4acd4774 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -8,7 +8,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -393,14 +393,8 @@
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
       <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
@@ -1295,9 +1289,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="7ksQUDZpxjY" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZpxjZ" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZpxk0" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Database expressions, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgXE" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgXF" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXG" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXH" role="1PaTwD">
+            <property role="3oM_SC" value="Database" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXI" role="1PaTwD">
+            <property role="3oM_SC" value="expressions," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXJ" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXK" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1324,9 +1333,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="7ksQUDZpxlk" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZpxll" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZpxlm" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Database expressions, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgXL" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgXM" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXN" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXO" role="1PaTwD">
+            <property role="3oM_SC" value="Database" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXP" role="1PaTwD">
+            <property role="3oM_SC" value="expressions," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXQ" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXR" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1384,9 +1408,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="7ksQUDZuyXJ" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZuyXK" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZuyXL" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Default text expressions, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgXS" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgXT" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXU" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXV" role="1PaTwD">
+            <property role="3oM_SC" value="Default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXW" role="1PaTwD">
+            <property role="3oM_SC" value="text" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXX" role="1PaTwD">
+            <property role="3oM_SC" value="expressions," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXY" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXZ" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1413,9 +1455,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="7ksQUDZuzA9" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZuzAa" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZuzAb" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Default text expressions, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgY0" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgY1" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgY2" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgY3" role="1PaTwD">
+            <property role="3oM_SC" value="Default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgY4" role="1PaTwD">
+            <property role="3oM_SC" value="text" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgY5" role="1PaTwD">
+            <property role="3oM_SC" value="expressions," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgY6" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgY7" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1459,9 +1519,27 @@
         <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
       </node>
       <node concept="z59LJ" id="7ksQUDZx7BU" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZx7BV" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZx7BW" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for JavaScript local variable, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgY8" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgY9" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYa" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYb" role="1PaTwD">
+            <property role="3oM_SC" value="JavaScript" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYc" role="1PaTwD">
+            <property role="3oM_SC" value="local" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYd" role="1PaTwD">
+            <property role="3oM_SC" value="variable," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYe" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYf" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1488,9 +1566,24 @@
         <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
       </node>
       <node concept="z59LJ" id="7ksQUDZx8vC" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZx8vD" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZx8vE" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Default identifier, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgYg" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgYh" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYi" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYj" role="1PaTwD">
+            <property role="3oM_SC" value="Default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYk" role="1PaTwD">
+            <property role="3oM_SC" value="identifier," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYl" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYm" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1548,9 +1641,27 @@
         <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
       </node>
       <node concept="z59LJ" id="4bWqD4CaWqR" role="lGtFl">
-        <node concept="TZ5HA" id="4bWqD4CaWqS" role="TZ5H$">
-          <node concept="1dT_AC" id="4bWqD4CaWqT" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for JavaScript instance method, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgYn" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgYo" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYp" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYq" role="1PaTwD">
+            <property role="3oM_SC" value="JavaScript" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYr" role="1PaTwD">
+            <property role="3oM_SC" value="instance" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYs" role="1PaTwD">
+            <property role="3oM_SC" value="method," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYt" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYu" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1577,9 +1688,24 @@
         <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
       </node>
       <node concept="z59LJ" id="4bWqD4CaWqF" role="lGtFl">
-        <node concept="TZ5HA" id="4bWqD4CaWqG" role="TZ5H$">
-          <node concept="1dT_AC" id="4bWqD4CaWqH" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Default identifier, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgYv" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgYw" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYx" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYy" role="1PaTwD">
+            <property role="3oM_SC" value="Default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYz" role="1PaTwD">
+            <property role="3oM_SC" value="identifier," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgY$" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgY_" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1637,9 +1763,30 @@
         <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
       </node>
       <node concept="z59LJ" id="4aJUH_hXiM3" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hXiM4" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hXiM5" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Language Defaults Instance field, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgYA" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgYB" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYC" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYD" role="1PaTwD">
+            <property role="3oM_SC" value="Language" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYE" role="1PaTwD">
+            <property role="3oM_SC" value="Defaults" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYF" role="1PaTwD">
+            <property role="3oM_SC" value="Instance" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYG" role="1PaTwD">
+            <property role="3oM_SC" value="field," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYH" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYI" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1666,9 +1813,30 @@
         <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
       </node>
       <node concept="z59LJ" id="4aJUH_hXiLR" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hXiLS" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hXiLT" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Language Defaults Instance field, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgYJ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgYK" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYL" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYM" role="1PaTwD">
+            <property role="3oM_SC" value="Language" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYN" role="1PaTwD">
+            <property role="3oM_SC" value="Defaults" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYO" role="1PaTwD">
+            <property role="3oM_SC" value="Instance" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYP" role="1PaTwD">
+            <property role="3oM_SC" value="field," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYQ" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYR" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1740,9 +1908,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="4bWqD4C3iOE" role="lGtFl">
-        <node concept="TZ5HA" id="4bWqD4C3iOF" role="TZ5H$">
-          <node concept="1dT_AC" id="4bWqD4C3iOG" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Java type parameter, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgYS" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgYT" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYU" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYV" role="1PaTwD">
+            <property role="3oM_SC" value="Java" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYW" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYX" role="1PaTwD">
+            <property role="3oM_SC" value="parameter," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYY" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgYZ" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1769,9 +1955,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="4bWqD4C3iOu" role="lGtFl">
-        <node concept="TZ5HA" id="4bWqD4C3iOv" role="TZ5H$">
-          <node concept="1dT_AC" id="4bWqD4C3iOw" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Java type parameter, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZ0" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZ1" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZ2" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZ3" role="1PaTwD">
+            <property role="3oM_SC" value="Java" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZ4" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZ5" role="1PaTwD">
+            <property role="3oM_SC" value="parameter," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZ6" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZ7" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1829,9 +2033,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="7ksQUDZy5Fp" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZy5Fq" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZy5Fr" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Deleted text, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZ8" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZ9" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZa" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZb" role="1PaTwD">
+            <property role="3oM_SC" value="Deleted" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZc" role="1PaTwD">
+            <property role="3oM_SC" value="text," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZd" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZe" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1858,9 +2077,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="7ksQUDZy66v" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZy66w" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZy66x" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Deleted text, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZf" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZg" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZh" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZi" role="1PaTwD">
+            <property role="3oM_SC" value="Deleted" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZj" role="1PaTwD">
+            <property role="3oM_SC" value="text," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZk" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZl" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1888,9 +2122,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="7ksQUDZq4Xy" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZq4Xz" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZq4X$" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Injected fragment, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZm" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZn" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZo" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZp" role="1PaTwD">
+            <property role="3oM_SC" value="Injected" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZq" role="1PaTwD">
+            <property role="3oM_SC" value="fragment," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZr" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZs" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1917,9 +2166,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="7ksQUDZq54A" role="lGtFl">
-        <node concept="TZ5HA" id="7ksQUDZq54B" role="TZ5H$">
-          <node concept="1dT_AC" id="7ksQUDZq54C" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Injected fragment, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZt" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZu" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZv" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZw" role="1PaTwD">
+            <property role="3oM_SC" value="Injected" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZx" role="1PaTwD">
+            <property role="3oM_SC" value="fragment," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZy" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZz" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -1977,9 +2241,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="1iWwVK2_wik" role="lGtFl">
-        <node concept="TZ5HA" id="1iWwVK2_wil" role="TZ5H$">
-          <node concept="1dT_AC" id="1iWwVK2_wim" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for template variable, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZ$" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZ_" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZA" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZB" role="1PaTwD">
+            <property role="3oM_SC" value="template" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZC" role="1PaTwD">
+            <property role="3oM_SC" value="variable," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZD" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZE" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2006,9 +2285,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="7LZcKzBFlBE" role="lGtFl">
-        <node concept="TZ5HA" id="7LZcKzBFlBF" role="TZ5H$">
-          <node concept="1dT_AC" id="7LZcKzBFlBG" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for template variable, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZG" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZH" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZI" role="1PaTwD">
+            <property role="3oM_SC" value="template" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZJ" role="1PaTwD">
+            <property role="3oM_SC" value="variable," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZK" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZL" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2066,9 +2360,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="7LZcKzBFlnu" role="lGtFl">
-        <node concept="TZ5HA" id="7LZcKzBFlnv" role="TZ5H$">
-          <node concept="1dT_AC" id="7LZcKzBFlnw" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for CSS property, default scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZM" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZN" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZO" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZP" role="1PaTwD">
+            <property role="3oM_SC" value="CSS" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZQ" role="1PaTwD">
+            <property role="3oM_SC" value="property," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZR" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZS" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2095,9 +2404,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="1iWwVK2_wWo" role="lGtFl">
-        <node concept="TZ5HA" id="1iWwVK2_wWp" role="TZ5H$">
-          <node concept="1dT_AC" id="1iWwVK2_wWq" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for CSS property, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6OgZT" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgZU" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZV" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZW" role="1PaTwD">
+            <property role="3oM_SC" value="CSS" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZX" role="1PaTwD">
+            <property role="3oM_SC" value="property," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZY" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgZZ" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2155,9 +2479,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="1iWwVK2_Bah" role="lGtFl">
-        <node concept="TZ5HA" id="1iWwVK2_Bai" role="TZ5H$">
-          <node concept="1dT_AC" id="1iWwVK2_Baj" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for CSS property value, default scheme" />
+        <node concept="1PaTwC" id="M_dau6Oh00" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh01" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh02" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh03" role="1PaTwD">
+            <property role="3oM_SC" value="CSS" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh04" role="1PaTwD">
+            <property role="3oM_SC" value="property" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh05" role="1PaTwD">
+            <property role="3oM_SC" value="value," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh06" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh07" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2184,9 +2526,24 @@
         </node>
       </node>
       <node concept="z59LJ" id="1iWwVK2_ByA" role="lGtFl">
-        <node concept="TZ5HA" id="1iWwVK2_ByB" role="TZ5H$">
-          <node concept="1dT_AC" id="1iWwVK2_ByC" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for CSS identifier, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6Oh08" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh09" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0a" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0b" role="1PaTwD">
+            <property role="3oM_SC" value="CSS" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0c" role="1PaTwD">
+            <property role="3oM_SC" value="identifier," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0d" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0e" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2243,9 +2600,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="4aJUH_hW4Mk" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hW4Ml" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hW4Mm" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Doc comment tag, default scheme" />
+        <node concept="1PaTwC" id="M_dau6Oh0f" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh0g" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0h" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0i" role="1PaTwD">
+            <property role="3oM_SC" value="Doc" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0j" role="1PaTwD">
+            <property role="3oM_SC" value="comment" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0k" role="1PaTwD">
+            <property role="3oM_SC" value="tag," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0l" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0m" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2272,9 +2647,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="4aJUH_hW4M8" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hW4M9" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hW4Ma" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Doc comment tag, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6Oh0n" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh0o" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0p" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0q" role="1PaTwD">
+            <property role="3oM_SC" value="Doc" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0r" role="1PaTwD">
+            <property role="3oM_SC" value="comment" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0s" role="1PaTwD">
+            <property role="3oM_SC" value="tag," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0t" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0u" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2332,9 +2725,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="4aJUH_hWVXQ" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hWVXR" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hWVXS" role="1dT_Ay">
-            <property role="1dT_AB" value="FG for Kotlin Named argument, default scheme" />
+        <node concept="1PaTwC" id="M_dau6Oh0v" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh0w" role="1PaTwD">
+            <property role="3oM_SC" value="FG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0x" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0y" role="1PaTwD">
+            <property role="3oM_SC" value="Kotlin" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0z" role="1PaTwD">
+            <property role="3oM_SC" value="Named" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0$" role="1PaTwD">
+            <property role="3oM_SC" value="argument," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0_" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0A" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
@@ -2361,9 +2772,27 @@
         </node>
       </node>
       <node concept="z59LJ" id="4aJUH_hWVXE" role="lGtFl">
-        <node concept="TZ5HA" id="4aJUH_hWVXF" role="TZ5H$">
-          <node concept="1dT_AC" id="4aJUH_hWVXG" role="1dT_Ay">
-            <property role="1dT_AB" value="BG for Kotlin Named argument, dark scheme" />
+        <node concept="1PaTwC" id="M_dau6Oh0B" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh0C" role="1PaTwD">
+            <property role="3oM_SC" value="BG" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0D" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0E" role="1PaTwD">
+            <property role="3oM_SC" value="Kotlin" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0F" role="1PaTwD">
+            <property role="3oM_SC" value="Named" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0G" role="1PaTwD">
+            <property role="3oM_SC" value="argument," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0H" role="1PaTwD">
+            <property role="3oM_SC" value="dark" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh0I" role="1PaTwD">
+            <property role="3oM_SC" value="scheme" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 7cba221a..00258c70 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -22,7 +22,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index 8d5ac7d8..faa7412d 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -2,7 +2,7 @@
 <model ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)">
   <persistence version="9" />
   <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
@@ -323,17 +323,11 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
     </language>
     <language id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences">
       <concept id="7915009415671748557" name="jetbrains.mps.baseLanguage.methodReferences.structure.MethodReferenceTypeTargetExpression" flags="ng" index="2FaPjH">
@@ -1477,9 +1471,42 @@
         </node>
       </node>
       <node concept="P$JXv" id="kTK1Bfckqb" role="lGtFl">
-        <node concept="TZ5HA" id="kTK1Bfckqc" role="TZ5H$">
-          <node concept="1dT_AC" id="kTK1Bfckqd" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns the collection of values kept by this node. Variables are ignored." />
+        <node concept="1PaTwC" id="M_dau6Oh1O" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh1P" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1Q" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1R" role="1PaTwD">
+            <property role="3oM_SC" value="collection" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1S" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1T" role="1PaTwD">
+            <property role="3oM_SC" value="values" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1U" role="1PaTwD">
+            <property role="3oM_SC" value="kept" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1V" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1W" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1X" role="1PaTwD">
+            <property role="3oM_SC" value="node." />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1Y" role="1PaTwD">
+            <property role="3oM_SC" value="Variables" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1Z" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh20" role="1PaTwD">
+            <property role="3oM_SC" value="ignored." />
           </node>
         </node>
       </node>
@@ -3584,19 +3611,121 @@
     <node concept="2tJIrI" id="6YPNC4NIr2f" role="jymVt" />
     <node concept="2tJIrI" id="5JQSuNsxgMt" role="jymVt" />
     <node concept="3UR2Jj" id="5lJXKwWWB" role="lGtFl">
-      <node concept="TZ5HA" id="5lJXKwWWC" role="TZ5H$">
-        <node concept="1dT_AC" id="5lJXKwWWD" role="1dT_Ay">
-          <property role="1dT_AB" value="The &quot;framework&quot; node, that is a node that allows only other nodes as its children. An example " />
+      <node concept="1PaTwC" id="M_dau6Oh0L" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh0M" role="1PaTwD">
+          <property role="3oM_SC" value="The" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0N" role="1PaTwD">
+          <property role="3oM_SC" value="&quot;framework&quot;" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0O" role="1PaTwD">
+          <property role="3oM_SC" value="node," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0P" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0Q" role="1PaTwD">
+          <property role="3oM_SC" value="is" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0R" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0S" role="1PaTwD">
+          <property role="3oM_SC" value="node" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0T" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0U" role="1PaTwD">
+          <property role="3oM_SC" value="allows" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0V" role="1PaTwD">
+          <property role="3oM_SC" value="only" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0W" role="1PaTwD">
+          <property role="3oM_SC" value="other" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0X" role="1PaTwD">
+          <property role="3oM_SC" value="nodes" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0Y" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh0Z" role="1PaTwD">
+          <property role="3oM_SC" value="its" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh10" role="1PaTwD">
+          <property role="3oM_SC" value="children." />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh11" role="1PaTwD">
+          <property role="3oM_SC" value="An" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh12" role="1PaTwD">
+          <property role="3oM_SC" value="example" />
         </node>
       </node>
-      <node concept="TZ5HA" id="5lJXKwXZy" role="TZ5H$">
-        <node concept="1dT_AC" id="5lJXKwXZz" role="1dT_Ay">
-          <property role="1dT_AB" value="could be a &quot;node&quot; in an AST-like structure, which has &quot;roles&quot; containing other nodes. The &quot;roles&quot; " />
+      <node concept="1PaTwC" id="M_dau6Oh13" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh14" role="1PaTwD">
+          <property role="3oM_SC" value="could" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh15" role="1PaTwD">
+          <property role="3oM_SC" value="be" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh16" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh17" role="1PaTwD">
+          <property role="3oM_SC" value="&quot;node&quot;" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh18" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh19" role="1PaTwD">
+          <property role="3oM_SC" value="an" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1a" role="1PaTwD">
+          <property role="3oM_SC" value="AST-like" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1b" role="1PaTwD">
+          <property role="3oM_SC" value="structure," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1c" role="1PaTwD">
+          <property role="3oM_SC" value="which" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1d" role="1PaTwD">
+          <property role="3oM_SC" value="has" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1e" role="1PaTwD">
+          <property role="3oM_SC" value="&quot;roles&quot;" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1f" role="1PaTwD">
+          <property role="3oM_SC" value="containing" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1g" role="1PaTwD">
+          <property role="3oM_SC" value="other" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1h" role="1PaTwD">
+          <property role="3oM_SC" value="nodes." />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1i" role="1PaTwD">
+          <property role="3oM_SC" value="The" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1j" role="1PaTwD">
+          <property role="3oM_SC" value="&quot;roles&quot;" />
         </node>
       </node>
-      <node concept="TZ5HA" id="5lJXKwZsB" role="TZ5H$">
-        <node concept="1dT_AC" id="5lJXKwZsC" role="1dT_Ay">
-          <property role="1dT_AB" value="here are nodes too." />
+      <node concept="1PaTwC" id="M_dau6Oh1k" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh1l" role="1PaTwD">
+          <property role="3oM_SC" value="here" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1m" role="1PaTwD">
+          <property role="3oM_SC" value="are" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1n" role="1PaTwD">
+          <property role="3oM_SC" value="nodes" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1o" role="1PaTwD">
+          <property role="3oM_SC" value="too." />
         </node>
       </node>
     </node>
@@ -3837,9 +3966,36 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="1EFtv_BGqzg" role="lGtFl">
-      <node concept="TZ5HA" id="1EFtv_BGqzh" role="TZ5H$">
-        <node concept="1dT_AC" id="1EFtv_BGqzi" role="1dT_Ay">
-          <property role="1dT_AB" value="Represents a data form that corresponds to a unification variable." />
+      <node concept="1PaTwC" id="M_dau6Oh1p" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh1q" role="1PaTwD">
+          <property role="3oM_SC" value="Represents" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1r" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1s" role="1PaTwD">
+          <property role="3oM_SC" value="data" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1t" role="1PaTwD">
+          <property role="3oM_SC" value="form" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1u" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1v" role="1PaTwD">
+          <property role="3oM_SC" value="corresponds" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1w" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1x" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1y" role="1PaTwD">
+          <property role="3oM_SC" value="unification" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh1z" role="1PaTwD">
+          <property role="3oM_SC" value="variable." />
         </node>
       </node>
     </node>
@@ -3892,9 +4048,36 @@
       <node concept="3Tm1VV" id="5BGv8yzvvJ2" role="1B3o_S" />
       <node concept="3clFbS" id="5BGv8yzvvJ3" role="3clF47" />
       <node concept="P$JXv" id="1sIKvV30Txg" role="lGtFl">
-        <node concept="TZ5HA" id="1sIKvV30Txh" role="TZ5H$">
-          <node concept="1dT_AC" id="1sIKvV30Txi" role="1dT_Ay">
-            <property role="1dT_AB" value="The number of logical (unification) (meta-)variables contained by this node." />
+        <node concept="1PaTwC" id="M_dau6Oh21" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh22" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh23" role="1PaTwD">
+            <property role="3oM_SC" value="number" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh24" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh25" role="1PaTwD">
+            <property role="3oM_SC" value="logical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh26" role="1PaTwD">
+            <property role="3oM_SC" value="(unification)" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh27" role="1PaTwD">
+            <property role="3oM_SC" value="(meta-)variables" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh28" role="1PaTwD">
+            <property role="3oM_SC" value="contained" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh29" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2a" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2b" role="1PaTwD">
+            <property role="3oM_SC" value="node." />
           </node>
         </node>
       </node>
@@ -3910,19 +4093,121 @@
         </node>
       </node>
       <node concept="P$JXv" id="FQ_DIrnxAH" role="lGtFl">
-        <node concept="TZ5HA" id="FQ_DIrnxAI" role="TZ5H$">
-          <node concept="1dT_AC" id="FQ_DIrnxAJ" role="1dT_Ay">
-            <property role="1dT_AB" value="Flattened collection of all variables contained in this term and its subterms. " />
+        <node concept="1PaTwC" id="M_dau6Oh2c" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh2d" role="1PaTwD">
+            <property role="3oM_SC" value="Flattened" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2e" role="1PaTwD">
+            <property role="3oM_SC" value="collection" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2f" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2g" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2h" role="1PaTwD">
+            <property role="3oM_SC" value="variables" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2i" role="1PaTwD">
+            <property role="3oM_SC" value="contained" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2j" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2k" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2l" role="1PaTwD">
+            <property role="3oM_SC" value="term" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2m" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2n" role="1PaTwD">
+            <property role="3oM_SC" value="its" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2o" role="1PaTwD">
+            <property role="3oM_SC" value="subterms." />
           </node>
         </node>
-        <node concept="TZ5HA" id="FQ_DIrny4R" role="TZ5H$">
-          <node concept="1dT_AC" id="FQ_DIrny4S" role="1dT_Ay">
-            <property role="1dT_AB" value="Only &quot;free&quot; variables are returned, those that are bound to terms are considered " />
+        <node concept="1PaTwC" id="M_dau6Oh2p" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh2q" role="1PaTwD">
+            <property role="3oM_SC" value="Only" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2r" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;free&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2s" role="1PaTwD">
+            <property role="3oM_SC" value="variables" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2t" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2u" role="1PaTwD">
+            <property role="3oM_SC" value="returned," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2v" role="1PaTwD">
+            <property role="3oM_SC" value="those" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2w" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2x" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2y" role="1PaTwD">
+            <property role="3oM_SC" value="bound" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2z" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2$" role="1PaTwD">
+            <property role="3oM_SC" value="terms" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2_" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2A" role="1PaTwD">
+            <property role="3oM_SC" value="considered" />
           </node>
         </node>
-        <node concept="TZ5HA" id="FQ_DIrnyjW" role="TZ5H$">
-          <node concept="1dT_AC" id="FQ_DIrnyjX" role="1dT_Ay">
-            <property role="1dT_AB" value="dereferenced and their values walked in order to collect any variables inside." />
+        <node concept="1PaTwC" id="M_dau6Oh2B" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh2C" role="1PaTwD">
+            <property role="3oM_SC" value="dereferenced" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2D" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2E" role="1PaTwD">
+            <property role="3oM_SC" value="their" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2F" role="1PaTwD">
+            <property role="3oM_SC" value="values" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2G" role="1PaTwD">
+            <property role="3oM_SC" value="walked" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2H" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2I" role="1PaTwD">
+            <property role="3oM_SC" value="order" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2J" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2K" role="1PaTwD">
+            <property role="3oM_SC" value="collect" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2L" role="1PaTwD">
+            <property role="3oM_SC" value="any" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2M" role="1PaTwD">
+            <property role="3oM_SC" value="variables" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2N" role="1PaTwD">
+            <property role="3oM_SC" value="inside." />
           </node>
         </node>
       </node>
@@ -13445,14 +13730,50 @@
       </node>
       <node concept="3Tm1VV" id="19fWAfxtsvb" role="1B3o_S" />
       <node concept="3UR2Jj" id="19fWAfxwj8d" role="lGtFl">
-        <node concept="TZ5HA" id="19fWAfxwj8e" role="TZ5H$">
-          <node concept="1dT_AC" id="19fWAfxwj8f" role="1dT_Ay">
-            <property role="1dT_AB" value="Recursive list of printers." />
+        <node concept="1PaTwC" id="M_dau6Oh1$" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh1_" role="1PaTwD">
+            <property role="3oM_SC" value="Recursive" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1A" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1B" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1C" role="1PaTwD">
+            <property role="3oM_SC" value="printers." />
           </node>
         </node>
-        <node concept="TZ5HA" id="19fWAfxwke6" role="TZ5H$">
-          <node concept="1dT_AC" id="19fWAfxwke7" role="1dT_Ay">
-            <property role="1dT_AB" value="Locations: PREFIX? OPEN FIRST? (SEP NEXT)* (SEP LAST)? CLOSE SUFFIX?" />
+        <node concept="1PaTwC" id="M_dau6Oh1D" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh1E" role="1PaTwD">
+            <property role="3oM_SC" value="Locations:" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1F" role="1PaTwD">
+            <property role="3oM_SC" value="PREFIX?" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1G" role="1PaTwD">
+            <property role="3oM_SC" value="OPEN" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1H" role="1PaTwD">
+            <property role="3oM_SC" value="FIRST?" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1I" role="1PaTwD">
+            <property role="3oM_SC" value="(SEP" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1J" role="1PaTwD">
+            <property role="3oM_SC" value="NEXT)*" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1K" role="1PaTwD">
+            <property role="3oM_SC" value="(SEP" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1L" role="1PaTwD">
+            <property role="3oM_SC" value="LAST)?" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1M" role="1PaTwD">
+            <property role="3oM_SC" value="CLOSE" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh1N" role="1PaTwD">
+            <property role="3oM_SC" value="SUFFIX?" />
           </node>
         </node>
       </node>
@@ -13584,9 +13905,45 @@
       <node concept="3Tm1VV" id="19fWAfxiOqp" role="1B3o_S" />
       <node concept="3clFbS" id="19fWAfxiOqq" role="3clF47" />
       <node concept="P$JXv" id="19fWAfxiOqr" role="lGtFl">
-        <node concept="TZ5HA" id="19fWAfxiOqs" role="TZ5H$">
-          <node concept="1dT_AC" id="19fWAfxiOqt" role="1dT_Ay">
-            <property role="1dT_AB" value="Outputs readable presentation of `arg`, where type of `arg` is not a DataForm. " />
+        <node concept="1PaTwC" id="M_dau6Oh2O" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh2P" role="1PaTwD">
+            <property role="3oM_SC" value="Outputs" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2Q" role="1PaTwD">
+            <property role="3oM_SC" value="readable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2R" role="1PaTwD">
+            <property role="3oM_SC" value="presentation" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2S" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2T" role="1PaTwD">
+            <property role="3oM_SC" value="`arg`," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2U" role="1PaTwD">
+            <property role="3oM_SC" value="where" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2V" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2W" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2X" role="1PaTwD">
+            <property role="3oM_SC" value="`arg`" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2Y" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh2Z" role="1PaTwD">
+            <property role="3oM_SC" value="not" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh30" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh31" role="1PaTwD">
+            <property role="3oM_SC" value="DataForm." />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
index 74c0a7c6..1f766408 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -215,17 +215,11 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -580,9 +574,24 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="1fvYCP_1sKm" role="lGtFl">
-      <node concept="TZ5HA" id="1fvYCP_1sKn" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP_1sKo" role="1dT_Ay">
-          <property role="1dT_AB" value="Serves as a prototype for LogicalDataForm." />
+      <node concept="1PaTwC" id="M_dau6Oh32" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh33" role="1PaTwD">
+          <property role="3oM_SC" value="Serves" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh34" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh35" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh36" role="1PaTwD">
+          <property role="3oM_SC" value="prototype" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh37" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh38" role="1PaTwD">
+          <property role="3oM_SC" value="LogicalDataForm." />
         </node>
       </node>
     </node>
@@ -1207,19 +1216,100 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="1fvYCP_19C5" role="lGtFl">
-      <node concept="TZ5HA" id="1fvYCP_19C6" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP_19C7" role="1dT_Ay">
-          <property role="1dT_AB" value="Bridges any FUN dataform except Value, and logical variable. " />
+      <node concept="1PaTwC" id="M_dau6Oh39" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh3a" role="1PaTwD">
+          <property role="3oM_SC" value="Bridges" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3b" role="1PaTwD">
+          <property role="3oM_SC" value="any" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3c" role="1PaTwD">
+          <property role="3oM_SC" value="FUN" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3d" role="1PaTwD">
+          <property role="3oM_SC" value="dataform" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3e" role="1PaTwD">
+          <property role="3oM_SC" value="except" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3f" role="1PaTwD">
+          <property role="3oM_SC" value="Value," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3g" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3h" role="1PaTwD">
+          <property role="3oM_SC" value="logical" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3i" role="1PaTwD">
+          <property role="3oM_SC" value="variable." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1fvYCP_1bzx" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP_1bzy" role="1dT_Ay">
-          <property role="1dT_AB" value="Represents a Variable that turns into REF to the target when bound. " />
+      <node concept="1PaTwC" id="M_dau6Oh3j" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh3k" role="1PaTwD">
+          <property role="3oM_SC" value="Represents" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3l" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3m" role="1PaTwD">
+          <property role="3oM_SC" value="Variable" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3n" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3o" role="1PaTwD">
+          <property role="3oM_SC" value="turns" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3p" role="1PaTwD">
+          <property role="3oM_SC" value="into" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3q" role="1PaTwD">
+          <property role="3oM_SC" value="REF" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3r" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3s" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3t" role="1PaTwD">
+          <property role="3oM_SC" value="target" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3u" role="1PaTwD">
+          <property role="3oM_SC" value="when" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3v" role="1PaTwD">
+          <property role="3oM_SC" value="bound." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1fvYCP_1b_D" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP_1b_E" role="1dT_Ay">
-          <property role="1dT_AB" value="Has kind VAR when logical is unbound, otherwise REF." />
+      <node concept="1PaTwC" id="M_dau6Oh3w" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh3x" role="1PaTwD">
+          <property role="3oM_SC" value="Has" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3y" role="1PaTwD">
+          <property role="3oM_SC" value="kind" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3z" role="1PaTwD">
+          <property role="3oM_SC" value="VAR" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3$" role="1PaTwD">
+          <property role="3oM_SC" value="when" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3_" role="1PaTwD">
+          <property role="3oM_SC" value="logical" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3A" role="1PaTwD">
+          <property role="3oM_SC" value="is" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3B" role="1PaTwD">
+          <property role="3oM_SC" value="unbound," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3C" role="1PaTwD">
+          <property role="3oM_SC" value="otherwise" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3D" role="1PaTwD">
+          <property role="3oM_SC" value="REF." />
         </node>
       </node>
     </node>
@@ -1684,19 +1774,85 @@
       <property role="TrG5h" value="V" />
     </node>
     <node concept="3UR2Jj" id="1fvYCP$WC$0" role="lGtFl">
-      <node concept="TZ5HA" id="1fvYCP$WC$1" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP$WC$2" role="1dT_Ay">
-          <property role="1dT_AB" value="Bridges value dataform and logical variable." />
+      <node concept="1PaTwC" id="M_dau6Oh3E" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh3F" role="1PaTwD">
+          <property role="3oM_SC" value="Bridges" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3G" role="1PaTwD">
+          <property role="3oM_SC" value="value" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3H" role="1PaTwD">
+          <property role="3oM_SC" value="dataform" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3I" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3J" role="1PaTwD">
+          <property role="3oM_SC" value="logical" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3K" role="1PaTwD">
+          <property role="3oM_SC" value="variable." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1fvYCP$WDMN" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP$WDMO" role="1dT_Ay">
-          <property role="1dT_AB" value="Represents a Variable that effectively turns into Value when bound." />
+      <node concept="1PaTwC" id="M_dau6Oh3L" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh3M" role="1PaTwD">
+          <property role="3oM_SC" value="Represents" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3N" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3O" role="1PaTwD">
+          <property role="3oM_SC" value="Variable" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3P" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3Q" role="1PaTwD">
+          <property role="3oM_SC" value="effectively" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3R" role="1PaTwD">
+          <property role="3oM_SC" value="turns" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3S" role="1PaTwD">
+          <property role="3oM_SC" value="into" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3T" role="1PaTwD">
+          <property role="3oM_SC" value="Value" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3U" role="1PaTwD">
+          <property role="3oM_SC" value="when" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3V" role="1PaTwD">
+          <property role="3oM_SC" value="bound." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1fvYCP$WDNb" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP$WDNc" role="1dT_Ay">
-          <property role="1dT_AB" value="Has kind VAR when logical is unbound, otherwise FUN. " />
+      <node concept="1PaTwC" id="M_dau6Oh3W" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh3X" role="1PaTwD">
+          <property role="3oM_SC" value="Has" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3Y" role="1PaTwD">
+          <property role="3oM_SC" value="kind" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh3Z" role="1PaTwD">
+          <property role="3oM_SC" value="VAR" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh40" role="1PaTwD">
+          <property role="3oM_SC" value="when" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh41" role="1PaTwD">
+          <property role="3oM_SC" value="logical" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh42" role="1PaTwD">
+          <property role="3oM_SC" value="is" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh43" role="1PaTwD">
+          <property role="3oM_SC" value="unbound," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh44" role="1PaTwD">
+          <property role="3oM_SC" value="otherwise" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh45" role="1PaTwD">
+          <property role="3oM_SC" value="FUN." />
         </node>
       </node>
     </node>
@@ -2042,9 +2198,24 @@
       <property role="TrG5h" value="V" />
     </node>
     <node concept="3UR2Jj" id="1fvYCP_1rlg" role="lGtFl">
-      <node concept="TZ5HA" id="1fvYCP_1rlh" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP_1rli" role="1dT_Ay">
-          <property role="1dT_AB" value="Serves as a prototype for LogicalValue. " />
+      <node concept="1PaTwC" id="M_dau6Oh46" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh47" role="1PaTwD">
+          <property role="3oM_SC" value="Serves" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh48" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh49" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4a" role="1PaTwD">
+          <property role="3oM_SC" value="prototype" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4b" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4c" role="1PaTwD">
+          <property role="3oM_SC" value="LogicalValue." />
         </node>
       </node>
     </node>
@@ -2163,14 +2334,62 @@
         </node>
       </node>
       <node concept="P$JXv" id="1fvYCP_uAcD" role="lGtFl">
-        <node concept="TZ5HA" id="1fvYCP_uAcE" role="TZ5H$">
-          <node concept="1dT_AC" id="1fvYCP_uAcF" role="1dT_Ay">
-            <property role="1dT_AB" value="Wraps every MetaLogical from passed MultiMetaLogical into a MetaLogicalDataForm" />
+        <node concept="1PaTwC" id="M_dau6Oh4n" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh4o" role="1PaTwD">
+            <property role="3oM_SC" value="Wraps" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4p" role="1PaTwD">
+            <property role="3oM_SC" value="every" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4q" role="1PaTwD">
+            <property role="3oM_SC" value="MetaLogical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4r" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4s" role="1PaTwD">
+            <property role="3oM_SC" value="passed" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4t" role="1PaTwD">
+            <property role="3oM_SC" value="MultiMetaLogical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4u" role="1PaTwD">
+            <property role="3oM_SC" value="into" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4v" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4w" role="1PaTwD">
+            <property role="3oM_SC" value="MetaLogicalDataForm" />
           </node>
         </node>
-        <node concept="TZ5HA" id="1fvYCP_uAvj" role="TZ5H$">
-          <node concept="1dT_AC" id="1fvYCP_uAvk" role="1dT_Ay">
-            <property role="1dT_AB" value="and returns an array of these as the result." />
+        <node concept="1PaTwC" id="M_dau6Oh4x" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh4y" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4z" role="1PaTwD">
+            <property role="3oM_SC" value="returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4$" role="1PaTwD">
+            <property role="3oM_SC" value="an" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4_" role="1PaTwD">
+            <property role="3oM_SC" value="array" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4A" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4B" role="1PaTwD">
+            <property role="3oM_SC" value="these" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4C" role="1PaTwD">
+            <property role="3oM_SC" value="as" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4D" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4E" role="1PaTwD">
+            <property role="3oM_SC" value="result." />
           </node>
         </node>
       </node>
@@ -2202,9 +2421,27 @@
         </node>
       </node>
       <node concept="P$JXv" id="1fvYCP_u$WH" role="lGtFl">
-        <node concept="TZ5HA" id="1fvYCP_u$WI" role="TZ5H$">
-          <node concept="1dT_AC" id="1fvYCP_u$WJ" role="1dT_Ay">
-            <property role="1dT_AB" value="Wraps a MetaLogical representing dataform into MetaLogicalDataForm. " />
+        <node concept="1PaTwC" id="M_dau6Oh4F" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh4G" role="1PaTwD">
+            <property role="3oM_SC" value="Wraps" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4H" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4I" role="1PaTwD">
+            <property role="3oM_SC" value="MetaLogical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4J" role="1PaTwD">
+            <property role="3oM_SC" value="representing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4K" role="1PaTwD">
+            <property role="3oM_SC" value="dataform" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4L" role="1PaTwD">
+            <property role="3oM_SC" value="into" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4M" role="1PaTwD">
+            <property role="3oM_SC" value="MetaLogicalDataForm." />
           </node>
         </node>
       </node>
@@ -2247,9 +2484,30 @@
         </node>
       </node>
       <node concept="P$JXv" id="1fvYCP_u_9_" role="lGtFl">
-        <node concept="TZ5HA" id="1fvYCP_u_9A" role="TZ5H$">
-          <node concept="1dT_AC" id="1fvYCP_u_9B" role="1dT_Ay">
-            <property role="1dT_AB" value="Wraps a Logical representing dataform into a LogicalDataForm." />
+        <node concept="1PaTwC" id="M_dau6Oh4N" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh4O" role="1PaTwD">
+            <property role="3oM_SC" value="Wraps" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4P" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4Q" role="1PaTwD">
+            <property role="3oM_SC" value="Logical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4R" role="1PaTwD">
+            <property role="3oM_SC" value="representing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4S" role="1PaTwD">
+            <property role="3oM_SC" value="dataform" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4T" role="1PaTwD">
+            <property role="3oM_SC" value="into" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4U" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4V" role="1PaTwD">
+            <property role="3oM_SC" value="LogicalDataForm." />
           </node>
         </node>
       </node>
@@ -2282,9 +2540,39 @@
         </node>
       </node>
       <node concept="P$JXv" id="4U$Q3dL0BAS" role="lGtFl">
-        <node concept="TZ5HA" id="4U$Q3dL0BAT" role="TZ5H$">
-          <node concept="1dT_AC" id="4U$Q3dL0BAU" role="1dT_Ay">
-            <property role="1dT_AB" value="An overload of same method accepting logical to support wrapping list." />
+        <node concept="1PaTwC" id="M_dau6Oh4W" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh4X" role="1PaTwD">
+            <property role="3oM_SC" value="An" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4Y" role="1PaTwD">
+            <property role="3oM_SC" value="overload" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh4Z" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh50" role="1PaTwD">
+            <property role="3oM_SC" value="same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh51" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh52" role="1PaTwD">
+            <property role="3oM_SC" value="accepting" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh53" role="1PaTwD">
+            <property role="3oM_SC" value="logical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh54" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh55" role="1PaTwD">
+            <property role="3oM_SC" value="support" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh56" role="1PaTwD">
+            <property role="3oM_SC" value="wrapping" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh57" role="1PaTwD">
+            <property role="3oM_SC" value="list." />
           </node>
         </node>
       </node>
@@ -2310,9 +2598,39 @@
         </node>
       </node>
       <node concept="P$JXv" id="4U$Q3dKg$bX" role="lGtFl">
-        <node concept="TZ5HA" id="4U$Q3dKg$bY" role="TZ5H$">
-          <node concept="1dT_AC" id="4U$Q3dKg$bZ" role="1dT_Ay">
-            <property role="1dT_AB" value="An overload of same method accepting logical to support identity transformation." />
+        <node concept="1PaTwC" id="M_dau6Oh58" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh59" role="1PaTwD">
+            <property role="3oM_SC" value="An" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5a" role="1PaTwD">
+            <property role="3oM_SC" value="overload" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5b" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5c" role="1PaTwD">
+            <property role="3oM_SC" value="same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5d" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5e" role="1PaTwD">
+            <property role="3oM_SC" value="accepting" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5f" role="1PaTwD">
+            <property role="3oM_SC" value="logical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5g" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5h" role="1PaTwD">
+            <property role="3oM_SC" value="support" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5i" role="1PaTwD">
+            <property role="3oM_SC" value="identity" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5j" role="1PaTwD">
+            <property role="3oM_SC" value="transformation." />
           </node>
         </node>
       </node>
@@ -2352,9 +2670,30 @@
         <property role="TrG5h" value="V" />
       </node>
       <node concept="P$JXv" id="1fvYCP_u_tJ" role="lGtFl">
-        <node concept="TZ5HA" id="1fvYCP_u_tK" role="TZ5H$">
-          <node concept="1dT_AC" id="1fvYCP_u_tL" role="1dT_Ay">
-            <property role="1dT_AB" value="Wraps a MetaLogical representing Object into a MetaLogicalValue. " />
+        <node concept="1PaTwC" id="M_dau6Oh5k" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh5l" role="1PaTwD">
+            <property role="3oM_SC" value="Wraps" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5m" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5n" role="1PaTwD">
+            <property role="3oM_SC" value="MetaLogical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5o" role="1PaTwD">
+            <property role="3oM_SC" value="representing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5p" role="1PaTwD">
+            <property role="3oM_SC" value="Object" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5q" role="1PaTwD">
+            <property role="3oM_SC" value="into" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5r" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5s" role="1PaTwD">
+            <property role="3oM_SC" value="MetaLogicalValue." />
           </node>
         </node>
       </node>
@@ -2394,9 +2733,30 @@
         <property role="TrG5h" value="V" />
       </node>
       <node concept="P$JXv" id="1fvYCP_u_Bj" role="lGtFl">
-        <node concept="TZ5HA" id="1fvYCP_u_Bk" role="TZ5H$">
-          <node concept="1dT_AC" id="1fvYCP_u_Bl" role="1dT_Ay">
-            <property role="1dT_AB" value="Wraps a Logical representing Object into a LogicalValue. " />
+        <node concept="1PaTwC" id="M_dau6Oh5t" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh5u" role="1PaTwD">
+            <property role="3oM_SC" value="Wraps" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5v" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5w" role="1PaTwD">
+            <property role="3oM_SC" value="Logical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5x" role="1PaTwD">
+            <property role="3oM_SC" value="representing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5y" role="1PaTwD">
+            <property role="3oM_SC" value="Object" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5z" role="1PaTwD">
+            <property role="3oM_SC" value="into" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5$" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5_" role="1PaTwD">
+            <property role="3oM_SC" value="LogicalValue." />
           </node>
         </node>
       </node>
@@ -2421,9 +2781,42 @@
         <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="P$JXv" id="4U$Q3dKgVM9" role="lGtFl">
-        <node concept="TZ5HA" id="4U$Q3dKgVMa" role="TZ5H$">
-          <node concept="1dT_AC" id="4U$Q3dKgVMb" role="1dT_Ay">
-            <property role="1dT_AB" value="An overload of the same method accepting logical to support identity transformation." />
+        <node concept="1PaTwC" id="M_dau6Oh5A" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh5B" role="1PaTwD">
+            <property role="3oM_SC" value="An" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5C" role="1PaTwD">
+            <property role="3oM_SC" value="overload" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5D" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5E" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5F" role="1PaTwD">
+            <property role="3oM_SC" value="same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5G" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5H" role="1PaTwD">
+            <property role="3oM_SC" value="accepting" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5I" role="1PaTwD">
+            <property role="3oM_SC" value="logical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5J" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5K" role="1PaTwD">
+            <property role="3oM_SC" value="support" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5L" role="1PaTwD">
+            <property role="3oM_SC" value="identity" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5M" role="1PaTwD">
+            <property role="3oM_SC" value="transformation." />
           </node>
         </node>
       </node>
@@ -2449,9 +2842,42 @@
         <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="P$JXv" id="4U$Q3dLiFgA" role="lGtFl">
-        <node concept="TZ5HA" id="4U$Q3dLiFgB" role="TZ5H$">
-          <node concept="1dT_AC" id="4U$Q3dLiFgC" role="1dT_Ay">
-            <property role="1dT_AB" value="An overload of the same method accepting logical to support identity transformation." />
+        <node concept="1PaTwC" id="M_dau6Oh5N" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh5O" role="1PaTwD">
+            <property role="3oM_SC" value="An" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5P" role="1PaTwD">
+            <property role="3oM_SC" value="overload" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5Q" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5R" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5S" role="1PaTwD">
+            <property role="3oM_SC" value="same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5T" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5U" role="1PaTwD">
+            <property role="3oM_SC" value="accepting" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5V" role="1PaTwD">
+            <property role="3oM_SC" value="logical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5W" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5X" role="1PaTwD">
+            <property role="3oM_SC" value="support" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5Y" role="1PaTwD">
+            <property role="3oM_SC" value="identity" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh5Z" role="1PaTwD">
+            <property role="3oM_SC" value="transformation." />
           </node>
         </node>
       </node>
@@ -2481,9 +2907,60 @@
         <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="P$JXv" id="4U$Q3dKt4OD" role="lGtFl">
-        <node concept="TZ5HA" id="4U$Q3dKt4OE" role="TZ5H$">
-          <node concept="1dT_AC" id="4U$Q3dKt4OF" role="1dT_Ay">
-            <property role="1dT_AB" value="An overload of the same method accepting logical or value to support wrapping any object into a value." />
+        <node concept="1PaTwC" id="M_dau6Oh60" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh61" role="1PaTwD">
+            <property role="3oM_SC" value="An" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh62" role="1PaTwD">
+            <property role="3oM_SC" value="overload" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh63" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh64" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh65" role="1PaTwD">
+            <property role="3oM_SC" value="same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh66" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh67" role="1PaTwD">
+            <property role="3oM_SC" value="accepting" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh68" role="1PaTwD">
+            <property role="3oM_SC" value="logical" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh69" role="1PaTwD">
+            <property role="3oM_SC" value="or" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6a" role="1PaTwD">
+            <property role="3oM_SC" value="value" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6b" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6c" role="1PaTwD">
+            <property role="3oM_SC" value="support" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6d" role="1PaTwD">
+            <property role="3oM_SC" value="wrapping" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6e" role="1PaTwD">
+            <property role="3oM_SC" value="any" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6f" role="1PaTwD">
+            <property role="3oM_SC" value="object" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6g" role="1PaTwD">
+            <property role="3oM_SC" value="into" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6h" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6i" role="1PaTwD">
+            <property role="3oM_SC" value="value." />
           </node>
         </node>
       </node>
@@ -2562,14 +3039,56 @@
       </node>
       <node concept="3Tm1VV" id="4TCblo5NkoK" role="1B3o_S" />
       <node concept="P$JXv" id="1fvYCP$W$Pe" role="lGtFl">
-        <node concept="TZ5HA" id="1fvYCP$W$Pf" role="TZ5H$">
-          <node concept="1dT_AC" id="1fvYCP$W$Pg" role="1dT_Ay">
-            <property role="1dT_AB" value="Instantiates logicals within a dataform by replacing all MetaLogicalValue and MetaLogicalDataForm" />
+        <node concept="1PaTwC" id="M_dau6Oh6j" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh6k" role="1PaTwD">
+            <property role="3oM_SC" value="Instantiates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6l" role="1PaTwD">
+            <property role="3oM_SC" value="logicals" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6m" role="1PaTwD">
+            <property role="3oM_SC" value="within" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6n" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6o" role="1PaTwD">
+            <property role="3oM_SC" value="dataform" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6p" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6q" role="1PaTwD">
+            <property role="3oM_SC" value="replacing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6r" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6s" role="1PaTwD">
+            <property role="3oM_SC" value="MetaLogicalValue" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6t" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6u" role="1PaTwD">
+            <property role="3oM_SC" value="MetaLogicalDataForm" />
           </node>
         </node>
-        <node concept="TZ5HA" id="1fvYCP_246X" role="TZ5H$">
-          <node concept="1dT_AC" id="1fvYCP_246Y" role="1dT_Ay">
-            <property role="1dT_AB" value="with LogicalValue and LogicalDataForm respectively. " />
+        <node concept="1PaTwC" id="M_dau6Oh6v" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oh6w" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6x" role="1PaTwD">
+            <property role="3oM_SC" value="LogicalValue" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6y" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6z" role="1PaTwD">
+            <property role="3oM_SC" value="LogicalDataForm" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oh6$" role="1PaTwD">
+            <property role="3oM_SC" value="respectively." />
           </node>
         </node>
       </node>
@@ -2797,9 +3316,33 @@
     <node concept="2tJIrI" id="4TCblo5NlYH" role="jymVt" />
     <node concept="3Tm1VV" id="677NV565N1y" role="1B3o_S" />
     <node concept="3UR2Jj" id="1fvYCP_FZrb" role="lGtFl">
-      <node concept="TZ5HA" id="1fvYCP_FZrc" role="TZ5H$">
-        <node concept="1dT_AC" id="1fvYCP_FZrd" role="1dT_Ay">
-          <property role="1dT_AB" value="Utility to provide bridge between dataforms and logical variables. " />
+      <node concept="1PaTwC" id="M_dau6Oh4d" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Oh4e" role="1PaTwD">
+          <property role="3oM_SC" value="Utility" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4f" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4g" role="1PaTwD">
+          <property role="3oM_SC" value="provide" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4h" role="1PaTwD">
+          <property role="3oM_SC" value="bridge" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4i" role="1PaTwD">
+          <property role="3oM_SC" value="between" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4j" role="1PaTwD">
+          <property role="3oM_SC" value="dataforms" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4k" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4l" role="1PaTwD">
+          <property role="3oM_SC" value="logical" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oh4m" role="1PaTwD">
+          <property role="3oM_SC" value="variables." />
         </node>
       </node>
     </node>
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index bcefac50..a4551695 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -20,7 +20,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
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 752f51b6..913a9b93 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
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -65,7 +65,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
index a7dae711..c01059fb 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
@@ -23,7 +23,7 @@
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="4" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
index 782db5e3..6c3509b3 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="4" />
@@ -208,14 +208,8 @@
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
       <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -254,9 +248,30 @@
         </node>
       </node>
       <node concept="z59LJ" id="adIlSuNxoI" role="lGtFl">
-        <node concept="TZ5HA" id="adIlSuNxoJ" role="TZ5H$">
-          <node concept="1dT_AC" id="adIlSuNxoK" role="1dT_Ay">
-            <property role="1dT_AB" value="Dummy singleton that forwards all queries to Registry." />
+        <node concept="1PaTwC" id="M_dau6OgUQ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgUR" role="1PaTwD">
+            <property role="3oM_SC" value="Dummy" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUS" role="1PaTwD">
+            <property role="3oM_SC" value="singleton" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUT" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUU" role="1PaTwD">
+            <property role="3oM_SC" value="forwards" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUV" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUW" role="1PaTwD">
+            <property role="3oM_SC" value="queries" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUX" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUY" role="1PaTwD">
+            <property role="3oM_SC" value="Registry." />
           </node>
         </node>
       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
index ded84cd4..710cb15b 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
@@ -26,7 +26,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
@@ -38,6 +38,7 @@
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
index 5c5f4841..f590a4e2 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
@@ -8,7 +8,7 @@
     <use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
@@ -192,16 +192,10 @@
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
       <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="361130699826193248" name="jetbrains.mps.lang.modelapi.structure.ModelPointer" flags="ng" index="1dCxOl">
@@ -374,9 +368,39 @@
         <ref role="2AI5Lk" to="rbkg:~RegisterExtension" resolve="RegisterExtension" />
       </node>
       <node concept="z59LJ" id="RoBEH15PZQ" role="lGtFl">
-        <node concept="TZ5HA" id="RoBEH15PZR" role="TZ5H$">
-          <node concept="1dT_AC" id="RoBEH15PZS" role="1dT_Ay">
-            <property role="1dT_AB" value="Enables data sharing b/w invocations of tests in this test case." />
+        <node concept="1PaTwC" id="M_dau6Ogul" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogum" role="1PaTwD">
+            <property role="3oM_SC" value="Enables" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogun" role="1PaTwD">
+            <property role="3oM_SC" value="data" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oguo" role="1PaTwD">
+            <property role="3oM_SC" value="sharing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogup" role="1PaTwD">
+            <property role="3oM_SC" value="b/w" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oguq" role="1PaTwD">
+            <property role="3oM_SC" value="invocations" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogur" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogus" role="1PaTwD">
+            <property role="3oM_SC" value="tests" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogut" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oguu" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oguv" role="1PaTwD">
+            <property role="3oM_SC" value="test" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oguw" role="1PaTwD">
+            <property role="3oM_SC" value="case." />
           </node>
         </node>
       </node>
@@ -1024,24 +1048,174 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="1Lr58WFYqNs" role="lGtFl">
-      <node concept="TZ5HA" id="1Lr58WFYqNt" role="TZ5H$">
-        <node concept="1dT_AC" id="1Lr58WFYqNu" role="1dT_Ay">
-          <property role="1dT_AB" value="This tests launches ModelChecker with a default set of checkers on all modules in the project. " />
+      <node concept="1PaTwC" id="M_dau6Ogtr" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogts" role="1PaTwD">
+          <property role="3oM_SC" value="This" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogtt" role="1PaTwD">
+          <property role="3oM_SC" value="tests" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogtu" role="1PaTwD">
+          <property role="3oM_SC" value="launches" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogtv" role="1PaTwD">
+          <property role="3oM_SC" value="ModelChecker" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogtw" role="1PaTwD">
+          <property role="3oM_SC" value="with" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogtx" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogty" role="1PaTwD">
+          <property role="3oM_SC" value="default" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogtz" role="1PaTwD">
+          <property role="3oM_SC" value="set" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogt$" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogt_" role="1PaTwD">
+          <property role="3oM_SC" value="checkers" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtA" role="1PaTwD">
+          <property role="3oM_SC" value="on" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtB" role="1PaTwD">
+          <property role="3oM_SC" value="all" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtC" role="1PaTwD">
+          <property role="3oM_SC" value="modules" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtD" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtE" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtF" role="1PaTwD">
+          <property role="3oM_SC" value="project." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1Lr58WFY$qC" role="TZ5H$">
-        <node concept="1dT_AC" id="1Lr58WFY$qD" role="1dT_Ay">
-          <property role="1dT_AB" value="Errors are collected by ErrorCollector, so that all problems are reported at once." />
+      <node concept="1PaTwC" id="M_dau6OgtG" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgtH" role="1PaTwD">
+          <property role="3oM_SC" value="Errors" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtI" role="1PaTwD">
+          <property role="3oM_SC" value="are" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtJ" role="1PaTwD">
+          <property role="3oM_SC" value="collected" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtK" role="1PaTwD">
+          <property role="3oM_SC" value="by" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtL" role="1PaTwD">
+          <property role="3oM_SC" value="ErrorCollector," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtM" role="1PaTwD">
+          <property role="3oM_SC" value="so" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtN" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtO" role="1PaTwD">
+          <property role="3oM_SC" value="all" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtP" role="1PaTwD">
+          <property role="3oM_SC" value="problems" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtQ" role="1PaTwD">
+          <property role="3oM_SC" value="are" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtR" role="1PaTwD">
+          <property role="3oM_SC" value="reported" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtS" role="1PaTwD">
+          <property role="3oM_SC" value="at" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtT" role="1PaTwD">
+          <property role="3oM_SC" value="once." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1Lr58WFYGfR" role="TZ5H$">
-        <node concept="1dT_AC" id="1Lr58WFYGfS" role="1dT_Ay">
-          <property role="1dT_AB" value="Only those issues reported that have severity MessageStatus.ERROR." />
+      <node concept="1PaTwC" id="M_dau6OgtU" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgtV" role="1PaTwD">
+          <property role="3oM_SC" value="Only" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtW" role="1PaTwD">
+          <property role="3oM_SC" value="those" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtX" role="1PaTwD">
+          <property role="3oM_SC" value="issues" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtY" role="1PaTwD">
+          <property role="3oM_SC" value="reported" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgtZ" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogu0" role="1PaTwD">
+          <property role="3oM_SC" value="have" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogu1" role="1PaTwD">
+          <property role="3oM_SC" value="severity" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogu2" role="1PaTwD">
+          <property role="3oM_SC" value="MessageStatus.ERROR." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1Lr58WG4Tcu" role="TZ5H$">
-        <node concept="1dT_AC" id="1Lr58WG4Tcv" role="1dT_Ay">
-          <property role="1dT_AB" value="This class mimics the behaviour of NodeTest in order to reuse MPS launching and project opening functionality." />
+      <node concept="1PaTwC" id="M_dau6Ogu3" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogu4" role="1PaTwD">
+          <property role="3oM_SC" value="This" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogu5" role="1PaTwD">
+          <property role="3oM_SC" value="class" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogu6" role="1PaTwD">
+          <property role="3oM_SC" value="mimics" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogu7" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogu8" role="1PaTwD">
+          <property role="3oM_SC" value="behaviour" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogu9" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogua" role="1PaTwD">
+          <property role="3oM_SC" value="NodeTest" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogub" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oguc" role="1PaTwD">
+          <property role="3oM_SC" value="order" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogud" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogue" role="1PaTwD">
+          <property role="3oM_SC" value="reuse" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oguf" role="1PaTwD">
+          <property role="3oM_SC" value="MPS" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogug" role="1PaTwD">
+          <property role="3oM_SC" value="launching" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oguh" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogui" role="1PaTwD">
+          <property role="3oM_SC" value="project" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oguj" role="1PaTwD">
+          <property role="3oM_SC" value="opening" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Oguk" role="1PaTwD">
+          <property role="3oM_SC" value="functionality." />
         </node>
       </node>
     </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd b/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
index e5bbf307..016de1dd 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
@@ -26,7 +26,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 9fc40a80..ab06b605 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -7,7 +7,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
@@ -40,6 +40,9 @@
     <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
@@ -287,7 +290,6 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU">
         <reference id="7400021826771268269" name="concept" index="2sp9C9" />
       </concept>
@@ -3873,7 +3875,7 @@
                 <node concept="37vLTw" id="MSv3owfpi1" role="2Oq$k0">
                   <ref role="3cqZAo" node="6uUkLpHm9vL" resolve="node" />
                 </node>
-                <node concept="2qgKlT" id="MSv3owfpVO" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og37" role="2OqNvi">
                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                 </node>
               </node>
@@ -5589,7 +5591,7 @@
                       <node concept="37vLTw" id="5SC$dmot7C1" role="2Oq$k0">
                         <ref role="3cqZAo" node="5SC$dmot02K" resolve="a" />
                       </node>
-                      <node concept="2qgKlT" id="5SC$dmot7RN" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og39" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                       </node>
                     </node>
@@ -5599,7 +5601,7 @@
                         <node concept="37vLTw" id="5SC$dmot8HC" role="2Oq$k0">
                           <ref role="3cqZAo" node="5SC$dmot02M" resolve="b" />
                         </node>
-                        <node concept="2qgKlT" id="5SC$dmot8Tu" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og3b" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                         </node>
                       </node>
@@ -8306,7 +8308,7 @@
               <node concept="37vLTw" id="WJTIIokCZ_" role="2Oq$k0">
                 <ref role="3cqZAo" node="WJTIIokCZt" resolve="expected" />
               </node>
-              <node concept="2qgKlT" id="WJTIIokCZA" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og3d" role="2OqNvi">
                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
               </node>
             </node>
@@ -8314,7 +8316,7 @@
               <node concept="37vLTw" id="WJTIIokCZC" role="2Oq$k0">
                 <ref role="3cqZAo" node="WJTIIokCZv" resolve="type" />
               </node>
-              <node concept="2qgKlT" id="WJTIIokCZD" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og3f" role="2OqNvi">
                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
               </node>
             </node>
@@ -8337,7 +8339,7 @@
                 <node concept="37vLTw" id="5SC$dmoE7GW" role="2Oq$k0">
                   <ref role="3cqZAo" node="WJTIIokCZt" resolve="expected" />
                 </node>
-                <node concept="2qgKlT" id="1bodCZ$C4qY" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og3h" role="2OqNvi">
                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                 </node>
               </node>
@@ -8345,7 +8347,7 @@
                 <node concept="37vLTw" id="5SC$dmoE9Ee" role="2Oq$k0">
                   <ref role="3cqZAo" node="WJTIIokCZv" resolve="type" />
                 </node>
-                <node concept="2qgKlT" id="1bodCZ$Cgay" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og3j" role="2OqNvi">
                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
index e43cb283..9af65974 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
@@ -38,7 +38,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
index d75e84e6..986e39a9 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 7d64dee6..d164d7c9 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -7,7 +7,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
@@ -72,6 +72,9 @@
         <child id="1238857834412" name="index" index="1LF_Uc" />
       </concept>
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1224071154655" name="jetbrains.mps.baseLanguage.structure.AsExpression" flags="nn" index="0kSF2">
         <child id="1224071154657" name="classifierType" index="0kSFW" />
@@ -401,16 +404,14 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="2546654756694997551" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTag" flags="ng" index="92FcH">
-        <child id="2546654756694997556" name="reference" index="92FcQ" />
-        <child id="3106559687488913694" name="line" index="2XjZqd" />
-      </concept>
       <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
       <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
         <reference id="6832197706140518108" name="param" index="zr_51" />
       </concept>
+      <concept id="6971016359099800069" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldSingleCommentLine" flags="ngI" index="2JaDLO">
+        <child id="6971016359099801474" name="commentBody" index="2JaDBN" />
+      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
         <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
@@ -418,22 +419,22 @@
         <property id="8465538089690881934" name="text" index="TUZQ4" />
         <child id="6832197706140518123" name="parameter" index="zr_5Q" />
       </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
       <concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
         <reference id="2217234381367530213" name="classifier" index="VXe09" />
       </concept>
       <concept id="2217234381367530195" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocReference" flags="ng" index="VXe0Z">
         <reference id="2217234381367530196" name="methodDeclaration" index="VXe0S" />
       </concept>
-      <concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
-        <child id="6962838954693749192" name="tag" index="qph3F" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
+      <concept id="5085607816306582224" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentTextElement" flags="ng" index="1Vtdud">
+        <child id="5085607816306582225" name="tag" index="1Vtduc" />
+      </concept>
+      <concept id="5085607816306647746" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTagTE" flags="ng" index="1VuXuv">
+        <child id="5085607816306647747" name="reference" index="1VuXuu" />
+      </concept>
     </language>
     <language id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences">
       <concept id="7915009415671748557" name="jetbrains.mps.baseLanguage.methodReferences.structure.MethodReferenceTypeTargetExpression" flags="ng" index="2FaPjH">
@@ -462,7 +463,6 @@
         <child id="1803469493727536396" name="concept" index="hTh3Z" />
       </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
         <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
@@ -639,19 +639,82 @@
         <node concept="3Tm1VV" id="4ZGicUYVA4C" role="1B3o_S" />
         <node concept="3clFbS" id="4ZGicUYVA4D" role="3clF47" />
         <node concept="P$JXv" id="4ZGicUYVAv8" role="lGtFl">
-          <node concept="TZ5HA" id="4ZGicUYVAv9" role="TZ5H$">
-            <node concept="1dT_AC" id="4ZGicUYVAva" role="1dT_Ay">
-              <property role="1dT_AB" value="Returns true if a matches b according to the custom matching scheme." />
+          <node concept="1PaTwC" id="M_dau6OgC9" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgCa" role="1PaTwD">
+              <property role="3oM_SC" value="Returns" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCb" role="1PaTwD">
+              <property role="3oM_SC" value="true" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCc" role="1PaTwD">
+              <property role="3oM_SC" value="if" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCd" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCe" role="1PaTwD">
+              <property role="3oM_SC" value="matches" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCf" role="1PaTwD">
+              <property role="3oM_SC" value="b" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCg" role="1PaTwD">
+              <property role="3oM_SC" value="according" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCh" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCi" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCj" role="1PaTwD">
+              <property role="3oM_SC" value="custom" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCk" role="1PaTwD">
+              <property role="3oM_SC" value="matching" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCl" role="1PaTwD">
+              <property role="3oM_SC" value="scheme." />
             </node>
           </node>
-          <node concept="TZ5HA" id="4ZGicUYVAIJ" role="TZ5H$">
-            <node concept="1dT_AC" id="4ZGicUYVAIK" role="1dT_Ay">
-              <property role="1dT_AB" value="Returns false otherwise." />
+          <node concept="1PaTwC" id="M_dau6OgCm" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgCn" role="1PaTwD">
+              <property role="3oM_SC" value="Returns" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCo" role="1PaTwD">
+              <property role="3oM_SC" value="false" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCp" role="1PaTwD">
+              <property role="3oM_SC" value="otherwise." />
             </node>
           </node>
-          <node concept="TZ5HA" id="4ZGicUYVAHl" role="TZ5H$">
-            <node concept="1dT_AC" id="4ZGicUYVAHm" role="1dT_Ay">
-              <property role="1dT_AB" value="Throws an exception if custom matching scheme is broken." />
+          <node concept="1PaTwC" id="M_dau6OgCq" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgCr" role="1PaTwD">
+              <property role="3oM_SC" value="Throws" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCs" role="1PaTwD">
+              <property role="3oM_SC" value="an" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCt" role="1PaTwD">
+              <property role="3oM_SC" value="exception" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCu" role="1PaTwD">
+              <property role="3oM_SC" value="if" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCv" role="1PaTwD">
+              <property role="3oM_SC" value="custom" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCw" role="1PaTwD">
+              <property role="3oM_SC" value="matching" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCx" role="1PaTwD">
+              <property role="3oM_SC" value="scheme" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCy" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgCz" role="1PaTwD">
+              <property role="3oM_SC" value="broken." />
             </node>
           </node>
         </node>
@@ -682,9 +745,24 @@
       </node>
       <node concept="3Tm1VV" id="4ZGicUYVz9K" role="1B3o_S" />
       <node concept="3UR2Jj" id="4ZGicUYVAyh" role="lGtFl">
-        <node concept="TZ5HA" id="4ZGicUYVAyi" role="TZ5H$">
-          <node concept="1dT_AC" id="4ZGicUYVAyj" role="1dT_Ay">
-            <property role="1dT_AB" value="Enables to implement custom matching logic." />
+        <node concept="1PaTwC" id="M_dau6Og_2" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og_3" role="1PaTwD">
+            <property role="3oM_SC" value="Enables" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Og_4" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Og_5" role="1PaTwD">
+            <property role="3oM_SC" value="implement" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Og_6" role="1PaTwD">
+            <property role="3oM_SC" value="custom" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Og_7" role="1PaTwD">
+            <property role="3oM_SC" value="matching" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Og_8" role="1PaTwD">
+            <property role="3oM_SC" value="logic." />
           </node>
         </node>
       </node>
@@ -3015,9 +3093,27 @@
     <node concept="2tJIrI" id="1FOQehxyYJq" role="jymVt" />
     <node concept="3Tm1VV" id="1N_0WA5JxZP" role="1B3o_S" />
     <node concept="3UR2Jj" id="443LGHBisnv" role="lGtFl">
-      <node concept="TZ5HA" id="443LGHBisnw" role="TZ5H$">
-        <node concept="1dT_AC" id="443LGHBisnx" role="1dT_Ay">
-          <property role="1dT_AB" value="A utility to launch typechecking from tests." />
+      <node concept="1PaTwC" id="M_dau6Og_9" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Og_a" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_b" role="1PaTwD">
+          <property role="3oM_SC" value="utility" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_c" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_d" role="1PaTwD">
+          <property role="3oM_SC" value="launch" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_e" role="1PaTwD">
+          <property role="3oM_SC" value="typechecking" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_f" role="1PaTwD">
+          <property role="3oM_SC" value="from" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_g" role="1PaTwD">
+          <property role="3oM_SC" value="tests." />
         </node>
       </node>
     </node>
@@ -4141,9 +4237,15 @@
       </node>
       <node concept="3Tm1VV" id="2qsG4AwGb5y" role="1B3o_S" />
       <node concept="P$JXv" id="5cBWTAehE1j" role="lGtFl">
-        <node concept="TZ5HA" id="5cBWTAehE1k" role="TZ5H$">
-          <node concept="1dT_AC" id="5cBWTAehE1l" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests." />
+        <node concept="1PaTwC" id="M_dau6OgC$" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgC_" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCA" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCB" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
           </node>
         </node>
       </node>
@@ -4194,9 +4296,15 @@
       </node>
       <node concept="3Tm1VV" id="6YTH7uESh8O" role="1B3o_S" />
       <node concept="P$JXv" id="6YTH7uESh8P" role="lGtFl">
-        <node concept="TZ5HA" id="6YTH7uESh8Q" role="TZ5H$">
-          <node concept="1dT_AC" id="6YTH7uESh8R" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests." />
+        <node concept="1PaTwC" id="M_dau6OgCC" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgCD" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCE" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCF" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
           </node>
         </node>
       </node>
@@ -4247,9 +4355,18 @@
       </node>
       <node concept="3Tm1VV" id="1z4$59iHmYR" role="1B3o_S" />
       <node concept="P$JXv" id="1T5MAgPgspd" role="lGtFl">
-        <node concept="TZ5HA" id="1T5MAgPgspe" role="TZ5H$">
-          <node concept="1dT_AC" id="1T5MAgPgspf" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from UI actions." />
+        <node concept="1PaTwC" id="M_dau6OgCG" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgCH" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCI" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCJ" role="1PaTwD">
+            <property role="3oM_SC" value="UI" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCK" role="1PaTwD">
+            <property role="3oM_SC" value="actions." />
           </node>
         </node>
       </node>
@@ -4631,9 +4748,15 @@
         <property role="TrG5h" value="T" />
       </node>
       <node concept="P$JXv" id="1C_jAsq_vrv" role="lGtFl">
-        <node concept="TZ5HA" id="1C_jAsq_vrw" role="TZ5H$">
-          <node concept="1dT_AC" id="1C_jAsq_vrx" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests" />
+        <node concept="1PaTwC" id="M_dau6OgCL" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgCM" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCN" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCO" role="1PaTwD">
+            <property role="3oM_SC" value="tests" />
           </node>
         </node>
       </node>
@@ -4680,14 +4803,47 @@
       </node>
       <node concept="3Tm1VV" id="7Aoa2yVmEtw" role="1B3o_S" />
       <node concept="P$JXv" id="7Aoa2yVmEtx" role="lGtFl">
-        <node concept="TZ5HA" id="7Aoa2yVmEty" role="TZ5H$">
-          <node concept="1dT_AC" id="7Aoa2yVmEtz" role="1dT_Ay">
-            <property role="1dT_AB" value="Checks all types within a root." />
+        <node concept="1PaTwC" id="M_dau6OgCP" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgCQ" role="1PaTwD">
+            <property role="3oM_SC" value="Checks" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCR" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCS" role="1PaTwD">
+            <property role="3oM_SC" value="types" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCT" role="1PaTwD">
+            <property role="3oM_SC" value="within" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCU" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCV" role="1PaTwD">
+            <property role="3oM_SC" value="root." />
           </node>
         </node>
-        <node concept="TZ5HA" id="7Aoa2yVmEt$" role="TZ5H$">
-          <node concept="1dT_AC" id="7Aoa2yVmEt_" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action. " />
+        <node concept="1PaTwC" id="M_dau6OgCW" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgCX" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCY" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgCZ" role="1PaTwD">
+            <property role="3oM_SC" value="called" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgD0" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgD1" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgD2" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgD3" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
         </node>
       </node>
@@ -4732,19 +4888,76 @@
       </node>
       <node concept="3Tm1VV" id="1z4$59iqSOZ" role="1B3o_S" />
       <node concept="P$JXv" id="1RYTbd81GQv" role="lGtFl">
-        <node concept="TZ5HA" id="1RYTbd81GQw" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd81GQx" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns the type assigned to an expression denoted by `node`, or null." />
+        <node concept="1PaTwC" id="M_dau6OgD4" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgD5" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgD6" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgD7" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgD8" role="1PaTwD">
+            <property role="3oM_SC" value="assigned" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgD9" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDa" role="1PaTwD">
+            <property role="3oM_SC" value="an" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDb" role="1PaTwD">
+            <property role="3oM_SC" value="expression" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDc" role="1PaTwD">
+            <property role="3oM_SC" value="denoted" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDd" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDe" role="1PaTwD">
+            <property role="3oM_SC" value="`node`," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDf" role="1PaTwD">
+            <property role="3oM_SC" value="or" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDg" role="1PaTwD">
+            <property role="3oM_SC" value="null." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd81Pj$" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd81Pj_" role="1dT_Ay">
-            <property role="1dT_AB" value="Uses cache internally." />
+        <node concept="1PaTwC" id="M_dau6OgDh" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgDi" role="1PaTwD">
+            <property role="3oM_SC" value="Uses" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDj" role="1PaTwD">
+            <property role="3oM_SC" value="cache" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDk" role="1PaTwD">
+            <property role="3oM_SC" value="internally." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd81Tlk" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd81Tll" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
+        <node concept="1PaTwC" id="M_dau6OgDl" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgDm" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDn" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDo" role="1PaTwD">
+            <property role="3oM_SC" value="called" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDp" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDq" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDr" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDs" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
         </node>
       </node>
@@ -4789,14 +5002,47 @@
       </node>
       <node concept="3Tm1VV" id="1z4$59iqN8K" role="1B3o_S" />
       <node concept="P$JXv" id="1RYTbd82rq9" role="lGtFl">
-        <node concept="TZ5HA" id="1RYTbd82rqa" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd82rqb" role="1dT_Ay">
-            <property role="1dT_AB" value="Gets the type using &quot;local&quot; inference." />
+        <node concept="1PaTwC" id="M_dau6OgDt" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgDu" role="1PaTwD">
+            <property role="3oM_SC" value="Gets" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDv" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDw" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDx" role="1PaTwD">
+            <property role="3oM_SC" value="using" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDy" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;local&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDz" role="1PaTwD">
+            <property role="3oM_SC" value="inference." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd82C4P" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd82C4Q" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
+        <node concept="1PaTwC" id="M_dau6OgD$" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgD_" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDA" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDB" role="1PaTwD">
+            <property role="3oM_SC" value="called" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDC" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDD" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDE" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDF" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
         </node>
       </node>
@@ -4849,19 +5095,82 @@
       </node>
       <node concept="3Tm1VV" id="1z4$59ioODW" role="1B3o_S" />
       <node concept="P$JXv" id="1RYTbd82VaH" role="lGtFl">
-        <node concept="TZ5HA" id="1RYTbd82VaI" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd82VaJ" role="1dT_Ay">
-            <property role="1dT_AB" value="Tries to convert type `source` to the form specified by `target`." />
+        <node concept="1PaTwC" id="M_dau6OgDG" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgDH" role="1PaTwD">
+            <property role="3oM_SC" value="Tries" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDI" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDJ" role="1PaTwD">
+            <property role="3oM_SC" value="convert" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDK" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDL" role="1PaTwD">
+            <property role="3oM_SC" value="`source`" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDM" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDN" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDO" role="1PaTwD">
+            <property role="3oM_SC" value="form" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDP" role="1PaTwD">
+            <property role="3oM_SC" value="specified" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDQ" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDR" role="1PaTwD">
+            <property role="3oM_SC" value="`target`." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd83dkE" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd83dkF" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns true on success, false otherwise." />
+        <node concept="1PaTwC" id="M_dau6OgDS" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgDT" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDU" role="1PaTwD">
+            <property role="3oM_SC" value="true" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDV" role="1PaTwD">
+            <property role="3oM_SC" value="on" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDW" role="1PaTwD">
+            <property role="3oM_SC" value="success," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDX" role="1PaTwD">
+            <property role="3oM_SC" value="false" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgDY" role="1PaTwD">
+            <property role="3oM_SC" value="otherwise." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd830KA" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd830KB" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
+        <node concept="1PaTwC" id="M_dau6OgDZ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgE0" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgE1" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgE2" role="1PaTwD">
+            <property role="3oM_SC" value="called" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgE3" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgE4" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgE5" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgE6" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
         </node>
       </node>
@@ -4920,19 +5229,85 @@
       </node>
       <node concept="3Tm1VV" id="1z4$59iqHl_" role="1B3o_S" />
       <node concept="P$JXv" id="1RYTbd83h4c" role="lGtFl">
-        <node concept="TZ5HA" id="1RYTbd83h4d" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd83h4e" role="1dT_Ay">
-            <property role="1dT_AB" value="Tries to coerce type `source` to the concept `targetConcept`." />
+        <node concept="1PaTwC" id="M_dau6OgE7" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgE8" role="1PaTwD">
+            <property role="3oM_SC" value="Tries" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgE9" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEa" role="1PaTwD">
+            <property role="3oM_SC" value="coerce" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEb" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEc" role="1PaTwD">
+            <property role="3oM_SC" value="`source`" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEd" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEe" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEf" role="1PaTwD">
+            <property role="3oM_SC" value="concept" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEg" role="1PaTwD">
+            <property role="3oM_SC" value="`targetConcept`." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd83qj_" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd83qjA" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns the result of coercion on success, null otherwise." />
+        <node concept="1PaTwC" id="M_dau6OgEh" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgEi" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEj" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEk" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEl" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEm" role="1PaTwD">
+            <property role="3oM_SC" value="coercion" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEn" role="1PaTwD">
+            <property role="3oM_SC" value="on" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEo" role="1PaTwD">
+            <property role="3oM_SC" value="success," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEp" role="1PaTwD">
+            <property role="3oM_SC" value="null" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEq" role="1PaTwD">
+            <property role="3oM_SC" value="otherwise." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd83mB3" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd83mB4" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
+        <node concept="1PaTwC" id="M_dau6OgEr" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgEs" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEt" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEu" role="1PaTwD">
+            <property role="3oM_SC" value="called" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEv" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEw" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEx" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEy" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
         </node>
       </node>
@@ -4991,19 +5366,91 @@
       </node>
       <node concept="3Tm1VV" id="1RYTbd7MH$J" role="1B3o_S" />
       <node concept="P$JXv" id="1RYTbd83QER" role="lGtFl">
-        <node concept="TZ5HA" id="1RYTbd83QES" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd83QET" role="1dT_Ay">
-            <property role="1dT_AB" value="Tries to coerce type `source` to the form specified by `target`." />
+        <node concept="1PaTwC" id="M_dau6OgEz" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgE$" role="1PaTwD">
+            <property role="3oM_SC" value="Tries" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgE_" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEA" role="1PaTwD">
+            <property role="3oM_SC" value="coerce" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEB" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEC" role="1PaTwD">
+            <property role="3oM_SC" value="`source`" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgED" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEE" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEF" role="1PaTwD">
+            <property role="3oM_SC" value="form" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEG" role="1PaTwD">
+            <property role="3oM_SC" value="specified" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEH" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEI" role="1PaTwD">
+            <property role="3oM_SC" value="`target`." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd83WaD" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd83WaE" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns the result of coercion on success, null otherwise." />
+        <node concept="1PaTwC" id="M_dau6OgEJ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgEK" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEL" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEM" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEN" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEO" role="1PaTwD">
+            <property role="3oM_SC" value="coercion" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEP" role="1PaTwD">
+            <property role="3oM_SC" value="on" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEQ" role="1PaTwD">
+            <property role="3oM_SC" value="success," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgER" role="1PaTwD">
+            <property role="3oM_SC" value="null" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgES" role="1PaTwD">
+            <property role="3oM_SC" value="otherwise." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd83W6x" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd83W6y" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
+        <node concept="1PaTwC" id="M_dau6OgET" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgEU" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEV" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEW" role="1PaTwD">
+            <property role="3oM_SC" value="called" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEX" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEY" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgEZ" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgF0" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
         </node>
       </node>
@@ -5248,9 +5695,36 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="6$gg4kBQMAn" role="lGtFl">
-      <node concept="TZ5HA" id="6$gg4kBQMAo" role="TZ5H$">
-        <node concept="1dT_AC" id="6$gg4kBQMAp" role="1dT_Ay">
-          <property role="1dT_AB" value="Facade to all things related to type checking with coderules." />
+      <node concept="1PaTwC" id="M_dau6Og_h" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Og_i" role="1PaTwD">
+          <property role="3oM_SC" value="Facade" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_j" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_k" role="1PaTwD">
+          <property role="3oM_SC" value="all" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_l" role="1PaTwD">
+          <property role="3oM_SC" value="things" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_m" role="1PaTwD">
+          <property role="3oM_SC" value="related" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_n" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_o" role="1PaTwD">
+          <property role="3oM_SC" value="type" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_p" role="1PaTwD">
+          <property role="3oM_SC" value="checking" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_q" role="1PaTwD">
+          <property role="3oM_SC" value="with" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_r" role="1PaTwD">
+          <property role="3oM_SC" value="coderules." />
         </node>
       </node>
     </node>
@@ -5493,7 +5967,7 @@
                               <node concept="37vLTw" id="1VeWL_dFc8z" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1VeWL_dDrtm" resolve="oldType" />
                               </node>
-                              <node concept="2qgKlT" id="1VeWL_dFeZP" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og3X" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                               </node>
                             </node>
@@ -5629,9 +6103,18 @@
         </node>
       </node>
       <node concept="P$JXv" id="7Aoa2yVAQUW" role="lGtFl">
-        <node concept="TZ5HA" id="7Aoa2yVAQUX" role="TZ5H$">
-          <node concept="1dT_AC" id="7Aoa2yVAQUY" role="1dT_Ay">
-            <property role="1dT_AB" value="FIXME used from tests" />
+        <node concept="1PaTwC" id="M_dau6OgF1" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgF2" role="1PaTwD">
+            <property role="3oM_SC" value="FIXME" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgF3" role="1PaTwD">
+            <property role="3oM_SC" value="used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgF4" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgF5" role="1PaTwD">
+            <property role="3oM_SC" value="tests" />
           </node>
         </node>
       </node>
@@ -5797,8 +6280,10 @@
         </node>
       </node>
       <node concept="P$JXv" id="7Aoa2yVqVA4" role="lGtFl">
-        <node concept="TZ5HA" id="7Aoa2yVqVA5" role="TZ5H$">
-          <node concept="1dT_AC" id="7Aoa2yVqVA6" role="1dT_Ay" />
+        <node concept="1PaTwC" id="M_dau6OgF6" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgF7" role="1PaTwD">
+            <property role="3oM_SC" value="" />
+          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="7Aoa2yVqVA7" role="1B3o_S" />
@@ -5880,9 +6365,15 @@
         </node>
       </node>
       <node concept="P$JXv" id="1RYTbd7_T7N" role="lGtFl">
-        <node concept="TZ5HA" id="1RYTbd7_T7O" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd7_T7P" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests" />
+        <node concept="1PaTwC" id="M_dau6OgF8" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgF9" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFa" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFb" role="1PaTwD">
+            <property role="3oM_SC" value="tests" />
           </node>
         </node>
       </node>
@@ -6203,9 +6694,18 @@
         </node>
       </node>
       <node concept="P$JXv" id="7Aoa2yVBw7s" role="lGtFl">
-        <node concept="TZ5HA" id="7Aoa2yVBw7t" role="TZ5H$">
-          <node concept="1dT_AC" id="7Aoa2yVBw7u" role="1dT_Ay">
-            <property role="1dT_AB" value="FIXME used from tests" />
+        <node concept="1PaTwC" id="M_dau6OgFc" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgFd" role="1PaTwD">
+            <property role="3oM_SC" value="FIXME" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFe" role="1PaTwD">
+            <property role="3oM_SC" value="used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFf" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFg" role="1PaTwD">
+            <property role="3oM_SC" value="tests" />
           </node>
         </node>
       </node>
@@ -6518,9 +7018,15 @@
         <property role="TrG5h" value="V" />
       </node>
       <node concept="P$JXv" id="qsErMwy_o$" role="lGtFl">
-        <node concept="TZ5HA" id="qsErMwyG6j" role="TZ5H$">
-          <node concept="1dT_AC" id="qsErMwyG6k" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests." />
+        <node concept="1PaTwC" id="M_dau6OgFh" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgFi" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFj" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFk" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
           </node>
         </node>
       </node>
@@ -6841,9 +7347,21 @@
           </node>
         </node>
         <node concept="P$JXv" id="At0yqMN29f" role="lGtFl">
-          <node concept="TZ5HA" id="At0yqMN29g" role="TZ5H$">
-            <node concept="1dT_AC" id="At0yqMN29h" role="1dT_Ay">
-              <property role="1dT_AB" value="Override to signal stale data." />
+          <node concept="1PaTwC" id="M_dau6OgFl" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgFm" role="1PaTwD">
+              <property role="3oM_SC" value="Override" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFn" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFo" role="1PaTwD">
+              <property role="3oM_SC" value="signal" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFp" role="1PaTwD">
+              <property role="3oM_SC" value="stale" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFq" role="1PaTwD">
+              <property role="3oM_SC" value="data." />
             </node>
           </node>
         </node>
@@ -6869,9 +7387,27 @@
           </node>
         </node>
         <node concept="P$JXv" id="4Zz6A5IfnPb" role="lGtFl">
-          <node concept="TZ5HA" id="4Zz6A5IfnPc" role="TZ5H$">
-            <node concept="1dT_AC" id="4Zz6A5IfnPd" role="1dT_Ay">
-              <property role="1dT_AB" value="Override to force data disposal on clear." />
+          <node concept="1PaTwC" id="M_dau6OgFr" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgFs" role="1PaTwD">
+              <property role="3oM_SC" value="Override" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFt" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFu" role="1PaTwD">
+              <property role="3oM_SC" value="force" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFv" role="1PaTwD">
+              <property role="3oM_SC" value="data" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFw" role="1PaTwD">
+              <property role="3oM_SC" value="disposal" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFx" role="1PaTwD">
+              <property role="3oM_SC" value="on" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFy" role="1PaTwD">
+              <property role="3oM_SC" value="clear." />
             </node>
           </node>
         </node>
@@ -6903,9 +7439,27 @@
           </node>
         </node>
         <node concept="P$JXv" id="6YGKjaPw0Oh" role="lGtFl">
-          <node concept="TZ5HA" id="6YGKjaPw0Oi" role="TZ5H$">
-            <node concept="1dT_AC" id="6YGKjaPw0Oj" role="1dT_Ay">
-              <property role="1dT_AB" value="Override to force initialization on data set." />
+          <node concept="1PaTwC" id="M_dau6OgFz" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgF$" role="1PaTwD">
+              <property role="3oM_SC" value="Override" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgF_" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFA" role="1PaTwD">
+              <property role="3oM_SC" value="force" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFB" role="1PaTwD">
+              <property role="3oM_SC" value="initialization" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFC" role="1PaTwD">
+              <property role="3oM_SC" value="on" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFD" role="1PaTwD">
+              <property role="3oM_SC" value="data" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFE" role="1PaTwD">
+              <property role="3oM_SC" value="set." />
             </node>
           </node>
         </node>
@@ -7689,7 +8243,7 @@
                           <node concept="37vLTw" id="6v6oK25rEG4" role="2Oq$k0">
                             <ref role="3cqZAo" node="6v6oK24MYBA" resolve="rootNode" />
                           </node>
-                          <node concept="2qgKlT" id="6v6oK25rJxg" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og3Z" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                           </node>
                         </node>
@@ -7806,7 +8360,7 @@
                           <node concept="37vLTw" id="6v6oK25rOvm" role="2Oq$k0">
                             <ref role="3cqZAo" node="6v6oK25mf2q" resolve="subject" />
                           </node>
-                          <node concept="2qgKlT" id="6v6oK25rP1h" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og41" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                           </node>
                         </node>
@@ -7921,7 +8475,7 @@
                           <node concept="37vLTw" id="6v6oK25rYzS" role="2Oq$k0">
                             <ref role="3cqZAo" node="1T5MAgP$fR5" resolve="subject" />
                           </node>
-                          <node concept="2qgKlT" id="6v6oK25rZaI" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og43" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                           </node>
                         </node>
@@ -8031,7 +8585,7 @@
                           <node concept="37vLTw" id="6v6oK25sauS" role="2Oq$k0">
                             <ref role="3cqZAo" node="5EDW3XDY_Ik" resolve="to" />
                           </node>
-                          <node concept="2qgKlT" id="6v6oK25saWZ" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og45" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                           </node>
                         </node>
@@ -8044,7 +8598,7 @@
                               <node concept="37vLTw" id="6v6oK25s7K9" role="2Oq$k0">
                                 <ref role="3cqZAo" node="5EDW3XDY_GP" resolve="from" />
                               </node>
-                              <node concept="2qgKlT" id="6v6oK25s8m$" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og47" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                               </node>
                             </node>
@@ -8195,7 +8749,7 @@
                           <node concept="37vLTw" id="6v6oK25so$7" role="2Oq$k0">
                             <ref role="3cqZAo" node="5EDW3XDYNF6" resolve="target" />
                           </node>
-                          <node concept="2qgKlT" id="6v6oK25splW" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og49" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                           </node>
                         </node>
@@ -8208,7 +8762,7 @@
                               <node concept="37vLTw" id="6v6oK25skN_" role="2Oq$k0">
                                 <ref role="3cqZAo" node="5EDW3XDYNCZ" resolve="source" />
                               </node>
-                              <node concept="2qgKlT" id="6v6oK25slym" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og4b" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                               </node>
                             </node>
@@ -8362,7 +8916,7 @@
                             <node concept="37vLTw" id="6v6oK25svnm" role="2Oq$k0">
                               <ref role="3cqZAo" node="5EDW3XEtfOO" resolve="source" />
                             </node>
-                            <node concept="2qgKlT" id="6v6oK25sw5F" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og4d" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                             </node>
                           </node>
@@ -8658,9 +9212,21 @@
     <node concept="2tJIrI" id="5EDW3XDZBFl" role="jymVt" />
     <node concept="3Tm1VV" id="5EDW3XDYg8Z" role="1B3o_S" />
     <node concept="3UR2Jj" id="5EDW3XDYNZe" role="lGtFl">
-      <node concept="TZ5HA" id="5EDW3XDYNZf" role="TZ5H$">
-        <node concept="1dT_AC" id="5EDW3XDYNZg" role="1dT_Ay">
-          <property role="1dT_AB" value="A factory for typechecking queries." />
+      <node concept="1PaTwC" id="M_dau6Og_s" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Og_t" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_u" role="1PaTwD">
+          <property role="3oM_SC" value="factory" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_v" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_w" role="1PaTwD">
+          <property role="3oM_SC" value="typechecking" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_x" role="1PaTwD">
+          <property role="3oM_SC" value="queries." />
         </node>
       </node>
     </node>
@@ -9877,14 +10443,33 @@
         <node concept="10P_77" id="1T5MAgPvlvP" role="1tU5fm" />
       </node>
       <node concept="P$JXv" id="1T5MAgPvy3X" role="lGtFl">
-        <node concept="TZ5HA" id="1T5MAgPvy3Y" role="TZ5H$">
-          <node concept="1dT_AC" id="1T5MAgPvy3Z" role="1dT_Ay" />
-        </node>
         <node concept="TUZQ0" id="1T5MAgPvy40" role="3nqlJM">
-          <property role="TUZQ4" value="overrides trace setting from Config" />
+          <property role="TUZQ4" value="" />
           <node concept="zr_55" id="1T5MAgPvy42" role="zr_5Q">
             <ref role="zr_51" node="1T5MAgPvlvQ" resolve="trace" />
           </node>
+          <node concept="1PaTwC" id="M_dau6OgFH" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgFI" role="1PaTwD">
+              <property role="3oM_SC" value="overrides" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFJ" role="1PaTwD">
+              <property role="3oM_SC" value="trace" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFK" role="1PaTwD">
+              <property role="3oM_SC" value="setting" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFL" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgFM" role="1PaTwD">
+              <property role="3oM_SC" value="Config" />
+            </node>
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6OgFF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgFG" role="1PaTwD">
+            <property role="3oM_SC" value="" />
+          </node>
         </node>
       </node>
     </node>
@@ -10586,9 +11171,15 @@
         </node>
       </node>
       <node concept="P$JXv" id="1C_jAsqzfgT" role="lGtFl">
-        <node concept="TZ5HA" id="1C_jAsqzfgU" role="TZ5H$">
-          <node concept="1dT_AC" id="1C_jAsqzfgV" role="1dT_Ay">
-            <property role="1dT_AB" value="Same as getValue()" />
+        <node concept="1PaTwC" id="M_dau6OgFN" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgFO" role="1PaTwD">
+            <property role="3oM_SC" value="Same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFP" role="1PaTwD">
+            <property role="3oM_SC" value="as" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFQ" role="1PaTwD">
+            <property role="3oM_SC" value="getValue()" />
           </node>
         </node>
       </node>
@@ -10864,46 +11455,123 @@
       <property role="TrG5h" value="T" />
     </node>
     <node concept="3UR2Jj" id="KkWtiM0Oj_" role="lGtFl">
-      <node concept="TZ5HA" id="KkWtiM0OjA" role="TZ5H$">
-        <node concept="1dT_AC" id="KkWtiM0OjB" role="1dT_Ay">
-          <property role="1dT_AB" value="An object describing the result of evaluating a " />
+      <node concept="1PaTwC" id="M_dau6Og_y" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Og_z" role="1PaTwD">
+          <property role="3oM_SC" value="An" />
         </node>
-        <node concept="1dT_AA" id="KkWtiM0OKF" role="1dT_Ay">
-          <node concept="92FcH" id="KkWtiM0OKH" role="qph3F">
-            <node concept="TZ5HA" id="KkWtiM0OKJ" role="2XjZqd" />
-            <node concept="VXe08" id="KkWtiM0QDA" role="92FcQ">
+        <node concept="3oM_SD" id="M_dau6Og_$" role="1PaTwD">
+          <property role="3oM_SC" value="object" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og__" role="1PaTwD">
+          <property role="3oM_SC" value="describing" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_A" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_B" role="1PaTwD">
+          <property role="3oM_SC" value="result" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_C" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_D" role="1PaTwD">
+          <property role="3oM_SC" value="evaluating" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_E" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6Og_F" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6Og_G" role="1Vtduc">
+            <node concept="VXe08" id="KkWtiM0QDA" role="1VuXuu">
               <ref role="VXe09" node="1z4$59iohfJ" resolve="Request" />
             </node>
-          </node>
-        </node>
-        <node concept="1dT_AC" id="KkWtiM0OKE" role="1dT_Ay">
-          <property role="1dT_AB" value=". " />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="KkWtiM0QDC" role="TZ5H$">
-        <node concept="1dT_AC" id="KkWtiM0QDD" role="1dT_Ay">
-          <property role="1dT_AB" value="&lt;p&gt;" />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="KkWtiM0SBs" role="TZ5H$">
-        <node concept="1dT_AC" id="KkWtiM0SBt" role="1dT_Ay">
-          <property role="1dT_AB" value="A value is provided in case the evaluation has succeeded. " />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="KkWtiM0TdC" role="TZ5H$">
-        <node concept="1dT_AC" id="KkWtiM0TdD" role="1dT_Ay">
-          <property role="1dT_AB" value="This class can be treated the same as " />
-        </node>
-        <node concept="1dT_AA" id="KkWtiM0Vbj" role="1dT_Ay">
-          <node concept="92FcH" id="KkWtiM0Vbl" role="qph3F">
-            <node concept="TZ5HA" id="KkWtiM0Vbn" role="2XjZqd" />
-            <node concept="VXe08" id="KkWtiM0Vbr" role="92FcQ">
-              <ref role="VXe09" to="33ny:~Optional" resolve="Optional" />
+            <node concept="1PaTwC" id="M_dau6Og_J" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6Og_K" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="KkWtiM0Vbi" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+        <node concept="3oM_SD" id="M_dau6Og_L" role="1PaTwD">
+          <property role="3oM_SC" value="." />
+        </node>
+      </node>
+      <node concept="1PaTwC" id="M_dau6Og_M" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Og_N" role="1PaTwD">
+          <property role="3oM_SC" value="&lt;p&gt;" />
+        </node>
+      </node>
+      <node concept="1PaTwC" id="M_dau6Og_O" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Og_P" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_Q" role="1PaTwD">
+          <property role="3oM_SC" value="value" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_R" role="1PaTwD">
+          <property role="3oM_SC" value="is" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_S" role="1PaTwD">
+          <property role="3oM_SC" value="provided" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_T" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_U" role="1PaTwD">
+          <property role="3oM_SC" value="case" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_V" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_W" role="1PaTwD">
+          <property role="3oM_SC" value="evaluation" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_X" role="1PaTwD">
+          <property role="3oM_SC" value="has" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Og_Y" role="1PaTwD">
+          <property role="3oM_SC" value="succeeded." />
+        </node>
+      </node>
+      <node concept="1PaTwC" id="M_dau6Og_Z" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgA0" role="1PaTwD">
+          <property role="3oM_SC" value="This" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgA1" role="1PaTwD">
+          <property role="3oM_SC" value="class" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgA2" role="1PaTwD">
+          <property role="3oM_SC" value="can" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgA3" role="1PaTwD">
+          <property role="3oM_SC" value="be" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgA4" role="1PaTwD">
+          <property role="3oM_SC" value="treated" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgA5" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgA6" role="1PaTwD">
+          <property role="3oM_SC" value="same" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgA7" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6OgA8" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgA9" role="1Vtduc">
+            <node concept="VXe08" id="KkWtiM0Vbr" role="1VuXuu">
+              <ref role="VXe09" to="33ny:~Optional" resolve="Optional" />
+            </node>
+            <node concept="1PaTwC" id="M_dau6OgAc" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgAd" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAe" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
     </node>
@@ -14672,24 +15340,93 @@
       </node>
       <node concept="3Tm1VV" id="7iCybvToD40" role="1B3o_S" />
       <node concept="3UR2Jj" id="7iCybvTrXeE" role="lGtFl">
-        <node concept="TZ5HA" id="7iCybvTrXeF" role="TZ5H$">
-          <node concept="1dT_AC" id="7iCybvTrXeG" role="1dT_Ay">
-            <property role="1dT_AB" value="DEFAULT - options built in into code " />
+        <node concept="1PaTwC" id="M_dau6OgAf" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgAg" role="1PaTwD">
+            <property role="3oM_SC" value="DEFAULT" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAh" role="1PaTwD">
+            <property role="3oM_SC" value="-" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAi" role="1PaTwD">
+            <property role="3oM_SC" value="options" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAj" role="1PaTwD">
+            <property role="3oM_SC" value="built" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAk" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAl" role="1PaTwD">
+            <property role="3oM_SC" value="into" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAm" role="1PaTwD">
+            <property role="3oM_SC" value="code" />
           </node>
         </node>
-        <node concept="TZ5HA" id="7iCybvTrXoF" role="TZ5H$">
-          <node concept="1dT_AC" id="7iCybvTrXoG" role="1dT_Ay">
-            <property role="1dT_AB" value="SYSTEM - options delivered with the app" />
+        <node concept="1PaTwC" id="M_dau6OgAn" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgAo" role="1PaTwD">
+            <property role="3oM_SC" value="SYSTEM" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAp" role="1PaTwD">
+            <property role="3oM_SC" value="-" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAq" role="1PaTwD">
+            <property role="3oM_SC" value="options" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAr" role="1PaTwD">
+            <property role="3oM_SC" value="delivered" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAs" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAt" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAu" role="1PaTwD">
+            <property role="3oM_SC" value="app" />
           </node>
         </node>
-        <node concept="TZ5HA" id="7iCybvTrXoR" role="TZ5H$">
-          <node concept="1dT_AC" id="7iCybvTrXoS" role="1dT_Ay">
-            <property role="1dT_AB" value="USER - options overridden by user" />
+        <node concept="1PaTwC" id="M_dau6OgAv" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgAw" role="1PaTwD">
+            <property role="3oM_SC" value="USER" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAx" role="1PaTwD">
+            <property role="3oM_SC" value="-" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAy" role="1PaTwD">
+            <property role="3oM_SC" value="options" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAz" role="1PaTwD">
+            <property role="3oM_SC" value="overridden" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgA$" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgA_" role="1PaTwD">
+            <property role="3oM_SC" value="user" />
           </node>
         </node>
-        <node concept="TZ5HA" id="7iCybvTrXp5" role="TZ5H$">
-          <node concept="1dT_AC" id="7iCybvTrXp6" role="1dT_Ay">
-            <property role="1dT_AB" value="UI - options overridden in the UI" />
+        <node concept="1PaTwC" id="M_dau6OgAA" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgAB" role="1PaTwD">
+            <property role="3oM_SC" value="UI" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAC" role="1PaTwD">
+            <property role="3oM_SC" value="-" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAD" role="1PaTwD">
+            <property role="3oM_SC" value="options" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAE" role="1PaTwD">
+            <property role="3oM_SC" value="overridden" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAF" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAG" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgAH" role="1PaTwD">
+            <property role="3oM_SC" value="UI" />
           </node>
         </node>
       </node>
@@ -14756,14 +15493,95 @@
         </node>
       </node>
       <node concept="P$JXv" id="7e$2hwavjOi" role="lGtFl">
-        <node concept="TZ5HA" id="7e$2hwavjOj" role="TZ5H$">
-          <node concept="1dT_AC" id="7e$2hwavjOk" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns a copy of this instance with the state that is not shared. All updates to either this or the" />
+        <node concept="1PaTwC" id="M_dau6OgFR" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgFS" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFT" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFU" role="1PaTwD">
+            <property role="3oM_SC" value="copy" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFV" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFW" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFX" role="1PaTwD">
+            <property role="3oM_SC" value="instance" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFY" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgFZ" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG0" role="1PaTwD">
+            <property role="3oM_SC" value="state" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG1" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG2" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG3" role="1PaTwD">
+            <property role="3oM_SC" value="not" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG4" role="1PaTwD">
+            <property role="3oM_SC" value="shared." />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG5" role="1PaTwD">
+            <property role="3oM_SC" value="All" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG6" role="1PaTwD">
+            <property role="3oM_SC" value="updates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG7" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG8" role="1PaTwD">
+            <property role="3oM_SC" value="either" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG9" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGa" role="1PaTwD">
+            <property role="3oM_SC" value="or" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGb" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
           </node>
         </node>
-        <node concept="TZ5HA" id="7e$2hwavmS5" role="TZ5H$">
-          <node concept="1dT_AC" id="7e$2hwavmS6" role="1dT_Ay">
-            <property role="1dT_AB" value="returned instance will not reflect in the other one. " />
+        <node concept="1PaTwC" id="M_dau6OgGc" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgGd" role="1PaTwD">
+            <property role="3oM_SC" value="returned" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGe" role="1PaTwD">
+            <property role="3oM_SC" value="instance" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGf" role="1PaTwD">
+            <property role="3oM_SC" value="will" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGg" role="1PaTwD">
+            <property role="3oM_SC" value="not" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGh" role="1PaTwD">
+            <property role="3oM_SC" value="reflect" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGi" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGj" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGk" role="1PaTwD">
+            <property role="3oM_SC" value="other" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGl" role="1PaTwD">
+            <property role="3oM_SC" value="one." />
           </node>
         </node>
       </node>
@@ -14785,14 +15603,38 @@
       </node>
       <node concept="3Tm1VV" id="6hpwxwiHTtp" role="1B3o_S" />
       <node concept="P$JXv" id="6hpwxwiIihH" role="lGtFl">
-        <node concept="TZ5HA" id="6hpwxwiIihI" role="TZ5H$">
-          <node concept="1dT_AC" id="6hpwxwiIihJ" role="1dT_Ay">
-            <property role="1dT_AB" value="Creates new instance with hardcoded default options. " />
+        <node concept="1PaTwC" id="M_dau6OgGm" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgGn" role="1PaTwD">
+            <property role="3oM_SC" value="Creates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGo" role="1PaTwD">
+            <property role="3oM_SC" value="new" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGp" role="1PaTwD">
+            <property role="3oM_SC" value="instance" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGq" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGr" role="1PaTwD">
+            <property role="3oM_SC" value="hardcoded" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGs" role="1PaTwD">
+            <property role="3oM_SC" value="default" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGt" role="1PaTwD">
+            <property role="3oM_SC" value="options." />
           </node>
         </node>
-        <node concept="TZ5HA" id="7e$2hwaAYge" role="TZ5H$">
-          <node concept="1dT_AC" id="7e$2hwaAYgf" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests." />
+        <node concept="1PaTwC" id="M_dau6OgGu" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgGv" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGw" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGx" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
           </node>
         </node>
       </node>
@@ -14873,9 +15715,15 @@
       </node>
       <node concept="3cqZAl" id="2vm2iDVltSe" role="3clF45" />
       <node concept="P$JXv" id="2hrTH42Peja" role="lGtFl">
-        <node concept="TZ5HA" id="2hrTH42Pejb" role="TZ5H$">
-          <node concept="1dT_AC" id="2hrTH42Pejc" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests." />
+        <node concept="1PaTwC" id="M_dau6OgGy" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgGz" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG$" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgG_" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
           </node>
         </node>
       </node>
@@ -14911,9 +15759,45 @@
       </node>
       <node concept="3cqZAl" id="7iCybvToL4I" role="3clF45" />
       <node concept="P$JXv" id="7iCybvTp7YY" role="lGtFl">
-        <node concept="TZ5HA" id="7iCybvTp7YZ" role="TZ5H$">
-          <node concept="1dT_AC" id="7iCybvTp7Z0" role="1dT_Ay">
-            <property role="1dT_AB" value="A prefix is defined as a string matching the following RE: &quot;([a-zA-Z0-9]*\.)+&quot; ." />
+        <node concept="1PaTwC" id="M_dau6OgGA" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgGB" role="1PaTwD">
+            <property role="3oM_SC" value="A" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGC" role="1PaTwD">
+            <property role="3oM_SC" value="prefix" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGD" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGE" role="1PaTwD">
+            <property role="3oM_SC" value="defined" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGF" role="1PaTwD">
+            <property role="3oM_SC" value="as" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGG" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGH" role="1PaTwD">
+            <property role="3oM_SC" value="string" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGI" role="1PaTwD">
+            <property role="3oM_SC" value="matching" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGJ" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGK" role="1PaTwD">
+            <property role="3oM_SC" value="following" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGL" role="1PaTwD">
+            <property role="3oM_SC" value="RE:" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGM" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;([a-zA-Z0-9]*\.)+&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGN" role="1PaTwD">
+            <property role="3oM_SC" value="." />
           </node>
         </node>
       </node>
@@ -15138,14 +16022,83 @@
     </node>
     <node concept="3Tm1VV" id="7iCybvToiT6" role="1B3o_S" />
     <node concept="3UR2Jj" id="7iCybvTozRr" role="lGtFl">
-      <node concept="TZ5HA" id="7iCybvTozRs" role="TZ5H$">
-        <node concept="1dT_AC" id="7iCybvTozRt" role="1dT_Ay">
-          <property role="1dT_AB" value="Represents options as key-value pairs. Supports traditional levels of overrides: default/system/user/ui." />
+      <node concept="1PaTwC" id="M_dau6OgAI" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgAJ" role="1PaTwD">
+          <property role="3oM_SC" value="Represents" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAK" role="1PaTwD">
+          <property role="3oM_SC" value="options" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAL" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAM" role="1PaTwD">
+          <property role="3oM_SC" value="key-value" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAN" role="1PaTwD">
+          <property role="3oM_SC" value="pairs." />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAO" role="1PaTwD">
+          <property role="3oM_SC" value="Supports" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAP" role="1PaTwD">
+          <property role="3oM_SC" value="traditional" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAQ" role="1PaTwD">
+          <property role="3oM_SC" value="levels" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAR" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAS" role="1PaTwD">
+          <property role="3oM_SC" value="overrides:" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAT" role="1PaTwD">
+          <property role="3oM_SC" value="default/system/user/ui." />
         </node>
       </node>
-      <node concept="TZ5HA" id="7iCybvToZpu" role="TZ5H$">
-        <node concept="1dT_AC" id="7iCybvToZpv" role="1dT_Ay">
-          <property role="1dT_AB" value="Every level allows any number of providers, each responsible for a specific key prefix." />
+      <node concept="1PaTwC" id="M_dau6OgAU" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgAV" role="1PaTwD">
+          <property role="3oM_SC" value="Every" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAW" role="1PaTwD">
+          <property role="3oM_SC" value="level" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAX" role="1PaTwD">
+          <property role="3oM_SC" value="allows" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAY" role="1PaTwD">
+          <property role="3oM_SC" value="any" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgAZ" role="1PaTwD">
+          <property role="3oM_SC" value="number" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB0" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB1" role="1PaTwD">
+          <property role="3oM_SC" value="providers," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB2" role="1PaTwD">
+          <property role="3oM_SC" value="each" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB3" role="1PaTwD">
+          <property role="3oM_SC" value="responsible" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB4" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB5" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB6" role="1PaTwD">
+          <property role="3oM_SC" value="specific" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB7" role="1PaTwD">
+          <property role="3oM_SC" value="key" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB8" role="1PaTwD">
+          <property role="3oM_SC" value="prefix." />
         </node>
       </node>
     </node>
@@ -21358,25 +22311,74 @@
     </node>
     <node concept="3Tm1VV" id="1pPth$l_TFW" role="1B3o_S" />
     <node concept="3UR2Jj" id="443LGHBnxs1" role="lGtFl">
-      <node concept="TZ5HA" id="443LGHBnxs2" role="TZ5H$">
-        <node concept="1dT_AC" id="443LGHBnxs3" role="1dT_Ay">
-          <property role="1dT_AB" value="A helper class to facilitate launching of typechecking. " />
+      <node concept="1PaTwC" id="M_dau6OgB9" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgBa" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBb" role="1PaTwD">
+          <property role="3oM_SC" value="helper" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBc" role="1PaTwD">
+          <property role="3oM_SC" value="class" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBd" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBe" role="1PaTwD">
+          <property role="3oM_SC" value="facilitate" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBf" role="1PaTwD">
+          <property role="3oM_SC" value="launching" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBg" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBh" role="1PaTwD">
+          <property role="3oM_SC" value="typechecking." />
         </node>
       </node>
-      <node concept="TZ5HA" id="443LGHBnzhb" role="TZ5H$">
-        <node concept="1dT_AC" id="443LGHBnzhc" role="1dT_Ay">
-          <property role="1dT_AB" value="After constructing an instance, it should be scheduled with " />
+      <node concept="1PaTwC" id="M_dau6OgBi" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgBj" role="1PaTwD">
+          <property role="3oM_SC" value="After" />
         </node>
-        <node concept="1dT_AA" id="443LGHBoaaO" role="1dT_Ay">
-          <node concept="92FcH" id="443LGHBoaaU" role="qph3F">
-            <node concept="TZ5HA" id="443LGHBoaaW" role="2XjZqd" />
-            <node concept="VXe0Z" id="443LGHBojRz" role="92FcQ">
+        <node concept="3oM_SD" id="M_dau6OgBk" role="1PaTwD">
+          <property role="3oM_SC" value="constructing" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBl" role="1PaTwD">
+          <property role="3oM_SC" value="an" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBm" role="1PaTwD">
+          <property role="3oM_SC" value="instance," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBn" role="1PaTwD">
+          <property role="3oM_SC" value="it" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBo" role="1PaTwD">
+          <property role="3oM_SC" value="should" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBp" role="1PaTwD">
+          <property role="3oM_SC" value="be" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBq" role="1PaTwD">
+          <property role="3oM_SC" value="scheduled" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBr" role="1PaTwD">
+          <property role="3oM_SC" value="with" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6OgBs" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgBt" role="1Vtduc">
+            <node concept="VXe0Z" id="443LGHBojRz" role="1VuXuu">
               <ref role="VXe0S" node="Hg6End$aLl" resolve="scheduleExecute" />
             </node>
+            <node concept="1PaTwC" id="M_dau6OgBw" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgBx" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="443LGHBoaaN" role="1dT_Ay">
-          <property role="1dT_AB" value="." />
+        <node concept="3oM_SD" id="M_dau6OgBy" role="1PaTwD">
+          <property role="3oM_SC" value="." />
         </node>
       </node>
     </node>
@@ -22054,9 +23056,15 @@
       <node concept="10P_77" id="7Aoa2yUyi0i" role="3clF45" />
       <node concept="3Tm6S6" id="7Aoa2yUyi0h" role="1B3o_S" />
       <node concept="P$JXv" id="7Aoa2yUyOKd" role="lGtFl">
-        <node concept="TZ5HA" id="7Aoa2yUyOKe" role="TZ5H$">
-          <node concept="1dT_AC" id="7Aoa2yUyOKf" role="1dT_Ay">
-            <property role="1dT_AB" value="Extracted from MatchingUtil" />
+        <node concept="1PaTwC" id="M_dau6OgGO" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgGP" role="1PaTwD">
+            <property role="3oM_SC" value="Extracted" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGQ" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGR" role="1PaTwD">
+            <property role="3oM_SC" value="MatchingUtil" />
           </node>
         </node>
       </node>
@@ -22383,9 +23391,15 @@
       <node concept="3Tm6S6" id="7Aoa2yUvnZU" role="1B3o_S" />
       <node concept="10P_77" id="7Aoa2yUvnZV" role="3clF45" />
       <node concept="P$JXv" id="7Aoa2yUv$TU" role="lGtFl">
-        <node concept="TZ5HA" id="7Aoa2yUv$TV" role="TZ5H$">
-          <node concept="1dT_AC" id="7Aoa2yUv$TW" role="1dT_Ay">
-            <property role="1dT_AB" value="Copied from MatchingUtil" />
+        <node concept="1PaTwC" id="M_dau6OgGS" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgGT" role="1PaTwD">
+            <property role="3oM_SC" value="Copied" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGU" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGV" role="1PaTwD">
+            <property role="3oM_SC" value="MatchingUtil" />
           </node>
         </node>
       </node>
@@ -22403,35 +23417,108 @@
       <node concept="3Tqbb2" id="1z4$59jbqtI" role="1tU5fm" />
     </node>
     <node concept="3UR2Jj" id="1z4$59jbqtJ" role="lGtFl">
-      <node concept="TZ5HA" id="1z4$59jbqtK" role="TZ5H$">
-        <node concept="1dT_AC" id="1z4$59jbqtL" role="1dT_Ay">
-          <property role="1dT_AB" value="A wrapper for SNode instances that delegates hashCode/equals methods to those defined in" />
+      <node concept="1PaTwC" id="M_dau6OgBz" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgB$" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgB_" role="1PaTwD">
+          <property role="3oM_SC" value="wrapper" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBA" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBB" role="1PaTwD">
+          <property role="3oM_SC" value="SNode" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBC" role="1PaTwD">
+          <property role="3oM_SC" value="instances" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBD" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBE" role="1PaTwD">
+          <property role="3oM_SC" value="delegates" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBF" role="1PaTwD">
+          <property role="3oM_SC" value="hashCode/equals" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBG" role="1PaTwD">
+          <property role="3oM_SC" value="methods" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBH" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBI" role="1PaTwD">
+          <property role="3oM_SC" value="those" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBJ" role="1PaTwD">
+          <property role="3oM_SC" value="defined" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBK" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
         </node>
       </node>
-      <node concept="TZ5HA" id="1z4$59jbqtM" role="TZ5H$">
-        <node concept="1dT_AC" id="1z4$59jbqtN" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6OgBL" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgBM" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
-        <node concept="1dT_AA" id="1z4$59jbqtO" role="1dT_Ay">
-          <node concept="92FcH" id="1z4$59jbqtP" role="qph3F">
-            <node concept="TZ5HA" id="1z4$59jbqtQ" role="2XjZqd" />
-            <node concept="VXe08" id="1z4$59jbqtR" role="92FcQ">
+        <node concept="1Vtdud" id="M_dau6OgBN" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgBO" role="1Vtduc">
+            <node concept="VXe08" id="1z4$59jbqtR" role="1VuXuu">
               <ref role="VXe09" to="ggp6:~MatchingUtil" resolve="MatchingUtil" />
             </node>
+            <node concept="1PaTwC" id="M_dau6OgBR" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgBS" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="1z4$59jbqtS" role="1dT_Ay">
-          <property role="1dT_AB" value="." />
+        <node concept="3oM_SD" id="M_dau6OgBT" role="1PaTwD">
+          <property role="3oM_SC" value="." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1z4$59jbqtT" role="TZ5H$">
-        <node concept="1dT_AC" id="1z4$59jbqtU" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6OgBU" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgBV" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
-      <node concept="TZ5HA" id="1z4$59jbqtV" role="TZ5H$">
-        <node concept="1dT_AC" id="1z4$59jbqtW" role="1dT_Ay">
-          <property role="1dT_AB" value="Instances of this class can be used as keys in hash map/set." />
+      <node concept="1PaTwC" id="M_dau6OgBW" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgBX" role="1PaTwD">
+          <property role="3oM_SC" value="Instances" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBY" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgBZ" role="1PaTwD">
+          <property role="3oM_SC" value="this" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC0" role="1PaTwD">
+          <property role="3oM_SC" value="class" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC1" role="1PaTwD">
+          <property role="3oM_SC" value="can" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC2" role="1PaTwD">
+          <property role="3oM_SC" value="be" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC3" role="1PaTwD">
+          <property role="3oM_SC" value="used" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC4" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC5" role="1PaTwD">
+          <property role="3oM_SC" value="keys" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC6" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC7" role="1PaTwD">
+          <property role="3oM_SC" value="hash" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgC8" role="1PaTwD">
+          <property role="3oM_SC" value="map/set." />
         </node>
       </node>
     </node>
@@ -22459,9 +23546,18 @@
         <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
       <node concept="P$JXv" id="7Aoa2yVI_LX" role="lGtFl">
-        <node concept="TZ5HA" id="7Aoa2yVI_LY" role="TZ5H$">
-          <node concept="1dT_AC" id="7Aoa2yVI_LZ" role="1dT_Ay">
-            <property role="1dT_AB" value="Only used by tests." />
+        <node concept="1PaTwC" id="M_dau6OgGW" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgGX" role="1PaTwD">
+            <property role="3oM_SC" value="Only" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGY" role="1PaTwD">
+            <property role="3oM_SC" value="used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgGZ" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgH0" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
           </node>
         </node>
       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
index ab18c4fa..42c16c97 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
@@ -29,7 +29,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index eed26398..aeee5814 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -9,7 +9,7 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
@@ -511,28 +511,24 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="2546654756694997551" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTag" flags="ng" index="92FcH">
-        <child id="2546654756694997556" name="reference" index="92FcQ" />
-        <child id="3106559687488913694" name="line" index="2XjZqd" />
-      </concept>
       <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      <concept id="6971016359099800069" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldSingleCommentLine" flags="ngI" index="2JaDLO">
+        <child id="6971016359099801474" name="commentBody" index="2JaDBN" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
       <concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
         <reference id="2217234381367530213" name="classifier" index="VXe09" />
       </concept>
-      <concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
-        <child id="6962838954693749192" name="tag" index="qph3F" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
+      <concept id="5085607816306582224" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentTextElement" flags="ng" index="1Vtdud">
+        <child id="5085607816306582225" name="tag" index="1Vtduc" />
+      </concept>
+      <concept id="5085607816306647746" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTagTE" flags="ng" index="1VuXuv">
+        <child id="5085607816306647747" name="reference" index="1VuXuu" />
+      </concept>
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
@@ -3338,25 +3334,71 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
       <node concept="P$JXv" id="2zBk6uIerAC" role="lGtFl">
-        <node concept="TZ5HA" id="2zBk6uIerAD" role="TZ5H$">
-          <node concept="1dT_AC" id="2zBk6uIerAE" role="1dT_Ay">
-            <property role="1dT_AB" value="Overridden to be a NOP. See " />
+        <node concept="1PaTwC" id="M_dau6OgR0" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgR1" role="1PaTwD">
+            <property role="3oM_SC" value="Overridden" />
           </node>
-          <node concept="1dT_AA" id="2zBk6uIes3L" role="1dT_Ay">
-            <node concept="92FcH" id="2zBk6uIes3R" role="qph3F">
-              <node concept="TZ5HA" id="2zBk6uIes3T" role="2XjZqd" />
-              <node concept="VXe08" id="2zBk6uIeNrC" role="92FcQ">
+          <node concept="3oM_SD" id="M_dau6OgR2" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgR3" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgR4" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgR5" role="1PaTwD">
+            <property role="3oM_SC" value="NOP." />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgR6" role="1PaTwD">
+            <property role="3oM_SC" value="See" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6OgR7" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6OgR8" role="1Vtduc">
+              <node concept="VXe08" id="2zBk6uIeNrC" role="1VuXuu">
                 <ref role="VXe09" to="u30n:~TreeTableCellRenderer" resolve="TreeTableCellRenderer" />
               </node>
+              <node concept="1PaTwC" id="M_dau6OgRb" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6OgRc" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="2zBk6uIes3K" role="1dT_Ay">
-            <property role="1dT_AB" value="." />
+          <node concept="3oM_SD" id="M_dau6OgRd" role="1PaTwD">
+            <property role="3oM_SC" value="." />
           </node>
         </node>
-        <node concept="TZ5HA" id="2zBk6uIeOyK" role="TZ5H$">
-          <node concept="1dT_AC" id="2zBk6uIeOyL" role="1dT_Ay">
-            <property role="1dT_AB" value="The above class calls this method for no apparent reason." />
+        <node concept="1PaTwC" id="M_dau6OgRe" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgRf" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRg" role="1PaTwD">
+            <property role="3oM_SC" value="above" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRh" role="1PaTwD">
+            <property role="3oM_SC" value="class" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRi" role="1PaTwD">
+            <property role="3oM_SC" value="calls" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRj" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRk" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRl" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRm" role="1PaTwD">
+            <property role="3oM_SC" value="no" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRn" role="1PaTwD">
+            <property role="3oM_SC" value="apparent" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRo" role="1PaTwD">
+            <property role="3oM_SC" value="reason." />
           </node>
         </node>
       </node>
@@ -3841,61 +3883,150 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
       <node concept="P$JXv" id="2WvBUTaA7LJ" role="lGtFl">
-        <node concept="TZ5HA" id="2WvBUTaA7LK" role="TZ5H$">
-          <node concept="1dT_AC" id="2WvBUTaA7LL" role="1dT_Ay">
-            <property role="1dT_AB" value="See " />
+        <node concept="1PaTwC" id="M_dau6OgRp" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgRq" role="1PaTwD">
+            <property role="3oM_SC" value="See" />
           </node>
-          <node concept="1dT_AA" id="2WvBUTaA8$V" role="1dT_Ay">
-            <node concept="92FcH" id="2WvBUTaA8An" role="qph3F">
-              <node concept="TZ5HA" id="2WvBUTaA8Ap" role="2XjZqd" />
-              <node concept="VXe08" id="2WvBUTaAwEN" role="92FcQ">
+          <node concept="1Vtdud" id="M_dau6OgRr" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6OgRs" role="1Vtduc">
+              <node concept="VXe08" id="2WvBUTaAwEN" role="1VuXuu">
                 <ref role="VXe09" to="lzb2:~AbstractExpandableItemsHandler" resolve="AbstractExpandableItemsHandler" />
               </node>
-            </node>
-          </node>
-          <node concept="1dT_AC" id="2WvBUTaA8$U" role="1dT_Ay">
-            <property role="1dT_AB" value="." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="2WvBUTaAzjX" role="TZ5H$">
-          <node concept="1dT_AC" id="2WvBUTaAzjY" role="1dT_Ay">
-            <property role="1dT_AB" value="See " />
-          </node>
-          <node concept="1dT_AA" id="2WvBUTaAzkW" role="1dT_Ay">
-            <node concept="92FcH" id="2WvBUTaAzlH" role="qph3F">
-              <node concept="TZ5HA" id="2WvBUTaAzlJ" role="2XjZqd" />
-              <node concept="VXe08" id="2WvBUTaAVoN" role="92FcQ">
-                <ref role="VXe09" to="3pb2:~JBTable" resolve="JBTable" />
+              <node concept="1PaTwC" id="M_dau6OgRv" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6OgRw" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="2WvBUTaAzkV" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+          <node concept="3oM_SD" id="M_dau6OgRx" role="1PaTwD">
+            <property role="3oM_SC" value="." />
           </node>
         </node>
-        <node concept="TZ5HA" id="2WvBUTaAxX1" role="TZ5H$">
-          <node concept="1dT_AC" id="2WvBUTaAxX2" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgRy" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgRz" role="1PaTwD">
+            <property role="3oM_SC" value="See" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6OgR$" role="1PaTwD">
+            <node concept="1VuXuv" id="M_dau6OgR_" role="1Vtduc">
+              <node concept="VXe08" id="2WvBUTaAVoN" role="1VuXuu">
+                <ref role="VXe09" to="3pb2:~JBTable" resolve="JBTable" />
+              </node>
+              <node concept="1PaTwC" id="M_dau6OgRC" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6OgRD" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRE" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="2WvBUTaAxXc" role="TZ5H$">
-          <node concept="1dT_AC" id="2WvBUTaAxXd" role="1dT_Ay">
-            <property role="1dT_AB" value="The method &quot;createTooTipImage&quot; in this class triggers firePropertyChange, which in turn forces" />
+        <node concept="1PaTwC" id="M_dau6OgRF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgRG" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="2WvBUTaAycq" role="TZ5H$">
-          <node concept="1dT_AC" id="2WvBUTaAycr" role="1dT_Ay">
-            <property role="1dT_AB" value="JBTableHeader in JBTable to revalidate and repaint the whole table." />
+        <node concept="1PaTwC" id="M_dau6OgRH" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgRI" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRJ" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRK" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;createTooTipImage&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRL" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRM" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRN" role="1PaTwD">
+            <property role="3oM_SC" value="class" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRO" role="1PaTwD">
+            <property role="3oM_SC" value="triggers" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRP" role="1PaTwD">
+            <property role="3oM_SC" value="firePropertyChange," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRQ" role="1PaTwD">
+            <property role="3oM_SC" value="which" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRR" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRS" role="1PaTwD">
+            <property role="3oM_SC" value="turn" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRT" role="1PaTwD">
+            <property role="3oM_SC" value="forces" />
           </node>
         </node>
-        <node concept="TZ5HA" id="2WvBUTaAWON" role="TZ5H$">
-          <node concept="1dT_AC" id="2WvBUTaAWOO" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgRU" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgRV" role="1PaTwD">
+            <property role="3oM_SC" value="JBTableHeader" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRW" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRX" role="1PaTwD">
+            <property role="3oM_SC" value="JBTable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRY" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgRZ" role="1PaTwD">
+            <property role="3oM_SC" value="revalidate" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgS0" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgS1" role="1PaTwD">
+            <property role="3oM_SC" value="repaint" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgS2" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgS3" role="1PaTwD">
+            <property role="3oM_SC" value="whole" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgS4" role="1PaTwD">
+            <property role="3oM_SC" value="table." />
           </node>
         </node>
-        <node concept="TZ5HA" id="2WvBUTaAWPS" role="TZ5H$">
-          <node concept="1dT_AC" id="2WvBUTaAWPT" role="1dT_Ay">
-            <property role="1dT_AB" value="Seriously, who revalidates everything on every property change?" />
+        <node concept="1PaTwC" id="M_dau6OgS5" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgS6" role="1PaTwD">
+            <property role="3oM_SC" value="" />
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6OgS7" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgS8" role="1PaTwD">
+            <property role="3oM_SC" value="Seriously," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgS9" role="1PaTwD">
+            <property role="3oM_SC" value="who" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSa" role="1PaTwD">
+            <property role="3oM_SC" value="revalidates" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSb" role="1PaTwD">
+            <property role="3oM_SC" value="everything" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSc" role="1PaTwD">
+            <property role="3oM_SC" value="on" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSd" role="1PaTwD">
+            <property role="3oM_SC" value="every" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSe" role="1PaTwD">
+            <property role="3oM_SC" value="property" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSf" role="1PaTwD">
+            <property role="3oM_SC" value="change?" />
           </node>
         </node>
       </node>
@@ -20377,9 +20508,57 @@
       <node concept="3Tm1VV" id="3ZNrYIhINBp" role="1B3o_S" />
       <node concept="3clFbS" id="3ZNrYIhINBq" role="3clF47" />
       <node concept="P$JXv" id="7vxJ_H4wRkr" role="lGtFl">
-        <node concept="TZ5HA" id="7vxJ_H4wRks" role="TZ5H$">
-          <node concept="1dT_AC" id="7vxJ_H4wRkt" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns a list of lists of integer indices, each corresponding to the nodes in the tree paths. " />
+        <node concept="1PaTwC" id="M_dau6OgSg" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgSh" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSi" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSj" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSk" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSl" role="1PaTwD">
+            <property role="3oM_SC" value="lists" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSm" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSn" role="1PaTwD">
+            <property role="3oM_SC" value="integer" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSo" role="1PaTwD">
+            <property role="3oM_SC" value="indices," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSp" role="1PaTwD">
+            <property role="3oM_SC" value="each" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSq" role="1PaTwD">
+            <property role="3oM_SC" value="corresponding" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSr" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSs" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSt" role="1PaTwD">
+            <property role="3oM_SC" value="nodes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSu" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSv" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSw" role="1PaTwD">
+            <property role="3oM_SC" value="tree" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSx" role="1PaTwD">
+            <property role="3oM_SC" value="paths." />
           </node>
         </node>
       </node>
@@ -20402,9 +20581,57 @@
       <node concept="3Tm1VV" id="JuOqj4kyj2" role="1B3o_S" />
       <node concept="3clFbS" id="JuOqj4kyj3" role="3clF47" />
       <node concept="P$JXv" id="JuOqj4kyj4" role="lGtFl">
-        <node concept="TZ5HA" id="JuOqj4kyj5" role="TZ5H$">
-          <node concept="1dT_AC" id="JuOqj4kyj6" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns a list of lists of integer indices, each corresponding to the nodes in the tree paths. " />
+        <node concept="1PaTwC" id="M_dau6OgSy" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgSz" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgS$" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgS_" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSA" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSB" role="1PaTwD">
+            <property role="3oM_SC" value="lists" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSC" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSD" role="1PaTwD">
+            <property role="3oM_SC" value="integer" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSE" role="1PaTwD">
+            <property role="3oM_SC" value="indices," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSF" role="1PaTwD">
+            <property role="3oM_SC" value="each" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSG" role="1PaTwD">
+            <property role="3oM_SC" value="corresponding" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSH" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSI" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSJ" role="1PaTwD">
+            <property role="3oM_SC" value="nodes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSK" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSL" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSM" role="1PaTwD">
+            <property role="3oM_SC" value="tree" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSN" role="1PaTwD">
+            <property role="3oM_SC" value="paths." />
           </node>
         </node>
       </node>
@@ -20430,14 +20657,74 @@
       <node concept="3Tm1VV" id="3ZNrYIhIPzC" role="1B3o_S" />
       <node concept="3clFbS" id="3ZNrYIhIPzD" role="3clF47" />
       <node concept="P$JXv" id="7vxJ_H4wRkJ" role="lGtFl">
-        <node concept="TZ5HA" id="7vxJ_H4wRkK" role="TZ5H$">
-          <node concept="1dT_AC" id="7vxJ_H4wRkL" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns a list of objects corresponding to the node indices. " />
+        <node concept="1PaTwC" id="M_dau6OgSO" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgSP" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSQ" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSR" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSS" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgST" role="1PaTwD">
+            <property role="3oM_SC" value="objects" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSU" role="1PaTwD">
+            <property role="3oM_SC" value="corresponding" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSV" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSW" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSX" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgSY" role="1PaTwD">
+            <property role="3oM_SC" value="indices." />
           </node>
         </node>
-        <node concept="TZ5HA" id="7vxJ_H4wRl2" role="TZ5H$">
-          <node concept="1dT_AC" id="7vxJ_H4wRl3" role="1dT_Ay">
-            <property role="1dT_AB" value="This is usually a path to a tree node from the root. " />
+        <node concept="1PaTwC" id="M_dau6OgSZ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgT0" role="1PaTwD">
+            <property role="3oM_SC" value="This" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT1" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT2" role="1PaTwD">
+            <property role="3oM_SC" value="usually" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT3" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT4" role="1PaTwD">
+            <property role="3oM_SC" value="path" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT5" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT6" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT7" role="1PaTwD">
+            <property role="3oM_SC" value="tree" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT8" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgT9" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTa" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTb" role="1PaTwD">
+            <property role="3oM_SC" value="root." />
           </node>
         </node>
       </node>
@@ -20463,14 +20750,71 @@
       <node concept="3Tm1VV" id="7vxJ_H4vD3Q" role="1B3o_S" />
       <node concept="3clFbS" id="7vxJ_H4vD3R" role="3clF47" />
       <node concept="P$JXv" id="7vxJ_H4wRl8" role="lGtFl">
-        <node concept="TZ5HA" id="7vxJ_H4wRl9" role="TZ5H$">
-          <node concept="1dT_AC" id="7vxJ_H4wRla" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns a list of lists of objects, each corresponding to a tree path, with the last node having the" />
+        <node concept="1PaTwC" id="M_dau6OgTc" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgTd" role="1PaTwD">
+            <property role="3oM_SC" value="Returns" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTe" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTf" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTg" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTh" role="1PaTwD">
+            <property role="3oM_SC" value="lists" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTi" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTj" role="1PaTwD">
+            <property role="3oM_SC" value="objects," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTk" role="1PaTwD">
+            <property role="3oM_SC" value="each" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTl" role="1PaTwD">
+            <property role="3oM_SC" value="corresponding" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTm" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTn" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTo" role="1PaTwD">
+            <property role="3oM_SC" value="tree" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTp" role="1PaTwD">
+            <property role="3oM_SC" value="path," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTq" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTr" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTs" role="1PaTwD">
+            <property role="3oM_SC" value="last" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTt" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTu" role="1PaTwD">
+            <property role="3oM_SC" value="having" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTv" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
           </node>
         </node>
-        <node concept="TZ5HA" id="7vxJ_H4xpps" role="TZ5H$">
-          <node concept="1dT_AC" id="7vxJ_H4xppt" role="1dT_Ay">
-            <property role="1dT_AB" value="requested kind. " />
+        <node concept="1PaTwC" id="M_dau6OgTw" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgTx" role="1PaTwD">
+            <property role="3oM_SC" value="requested" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTy" role="1PaTwD">
+            <property role="3oM_SC" value="kind." />
           </node>
         </node>
       </node>
@@ -26727,9 +27071,18 @@
         </node>
       </node>
       <node concept="z59LJ" id="4ot3PHQHUK3" role="lGtFl">
-        <node concept="TZ5HA" id="4ot3PHQHUK4" role="TZ5H$">
-          <node concept="1dT_AC" id="4ot3PHQHUK5" role="1dT_Ay">
-            <property role="1dT_AB" value="TOP, LEFT, BOTTOM, RIGHT" />
+        <node concept="1PaTwC" id="M_dau6OgQQ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgQR" role="1PaTwD">
+            <property role="3oM_SC" value="TOP," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQS" role="1PaTwD">
+            <property role="3oM_SC" value="LEFT," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQT" role="1PaTwD">
+            <property role="3oM_SC" value="BOTTOM," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQU" role="1PaTwD">
+            <property role="3oM_SC" value="RIGHT" />
           </node>
         </node>
       </node>
@@ -26756,9 +27109,18 @@
         </node>
       </node>
       <node concept="z59LJ" id="4ot3PHQTzKj" role="lGtFl">
-        <node concept="TZ5HA" id="4ot3PHQTzKk" role="TZ5H$">
-          <node concept="1dT_AC" id="4ot3PHQTzKl" role="1dT_Ay">
-            <property role="1dT_AB" value="TOP, LEFT, BOTTOM, RIGHT" />
+        <node concept="1PaTwC" id="M_dau6OgQV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgQW" role="1PaTwD">
+            <property role="3oM_SC" value="TOP," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQX" role="1PaTwD">
+            <property role="3oM_SC" value="LEFT," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQY" role="1PaTwD">
+            <property role="3oM_SC" value="BOTTOM," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQZ" role="1PaTwD">
+            <property role="3oM_SC" value="RIGHT" />
           </node>
         </node>
       </node>
@@ -27628,14 +27990,23 @@
       <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
     </node>
     <node concept="3UR2Jj" id="3WU9yfA8AfW" role="lGtFl">
-      <node concept="TZ5HA" id="3WU9yfA8AfX" role="TZ5H$">
-        <node concept="1dT_AC" id="3WU9yfA8AfY" role="1dT_Ay">
-          <property role="1dT_AB" value="TMP stub for icons " />
+      <node concept="1PaTwC" id="M_dau6OgQJ" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgQK" role="1PaTwD">
+          <property role="3oM_SC" value="TMP" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQL" role="1PaTwD">
+          <property role="3oM_SC" value="stub" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQM" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQN" role="1PaTwD">
+          <property role="3oM_SC" value="icons" />
         </node>
       </node>
-      <node concept="TZ5HA" id="3WU9yfA9yL$" role="TZ5H$">
-        <node concept="1dT_AC" id="3WU9yfA9yL_" role="1dT_Ay">
-          <property role="1dT_AB" value="http://stackoverflow.com/a/9312849" />
+      <node concept="1PaTwC" id="M_dau6OgQO" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgQP" role="1PaTwD">
+          <property role="3oM_SC" value="http://stackoverflow.com/a/9312849" />
         </node>
       </node>
     </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
index 5ee28d74..3e70c1e6 100644
--- a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
+++ b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
@@ -27,7 +27,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index dfb5a100..592b3c07 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -7,7 +7,7 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 96596cab..e9531dcf 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -10,7 +10,7 @@
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
@@ -306,31 +306,23 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="2546654756694997551" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTag" flags="ng" index="92FcH">
-        <child id="2546654756694997556" name="reference" index="92FcQ" />
-        <child id="3106559687488913694" name="line" index="2XjZqd" />
-      </concept>
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      <concept id="6971016359099800069" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldSingleCommentLine" flags="ngI" index="2JaDLO">
+        <child id="6971016359099801474" name="commentBody" index="2JaDBN" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="6612597108003615641" name="jetbrains.mps.baseLanguage.javadoc.structure.HTMLElement" flags="ng" index="2U$1Ah">
-        <property id="6612597108003615642" name="name" index="2U$1Ai" />
-        <child id="6612597108003615643" name="line" index="2U$1Aj" />
-      </concept>
       <concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
         <reference id="2217234381367530213" name="classifier" index="VXe09" />
       </concept>
-      <concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
-        <child id="6962838954693749192" name="tag" index="qph3F" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
+      <concept id="5085607816306582224" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentTextElement" flags="ng" index="1Vtdud">
+        <child id="5085607816306582225" name="tag" index="1Vtduc" />
+      </concept>
+      <concept id="5085607816306647746" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTagTE" flags="ng" index="1VuXuv">
+        <child id="5085607816306647747" name="reference" index="1VuXuu" />
+      </concept>
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
@@ -367,6 +359,10 @@
       </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="1436320362825107485" name="jetbrains.mps.lang.text.structure.UniversalHtmlTag" flags="ng" index="22dLRv">
+        <property id="1436320362825107486" name="name" index="22dLRs" />
+        <child id="1436320362825109043" name="body" index="22dLJL" />
+      </concept>
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
         <property id="155656958578482949" name="value" index="3oM_SC" />
       </concept>
@@ -698,30 +694,67 @@
     </node>
     <node concept="2tJIrI" id="51ek2rQN976" role="jymVt" />
     <node concept="3UR2Jj" id="FQ_DIuP4GE" role="lGtFl">
-      <node concept="TZ5HA" id="FQ_DIuP4GF" role="TZ5H$">
-        <node concept="1dT_AC" id="FQ_DIuP4GG" role="1dT_Ay">
-          <property role="1dT_AB" value="A stage in typechecking process. Employs a pattern of &quot;composable effects&quot;. See " />
+      <node concept="1PaTwC" id="M_dau6OgUZ" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgV0" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
         </node>
-        <node concept="1dT_AA" id="FQ_DIuPC2f" role="1dT_Ay">
-          <node concept="92FcH" id="FQ_DIuPC2h" role="qph3F">
-            <node concept="TZ5HA" id="FQ_DIuPC2j" role="2XjZqd" />
-            <node concept="VXe08" id="FQ_DIuPC2n" role="92FcQ">
+        <node concept="3oM_SD" id="M_dau6OgV1" role="1PaTwD">
+          <property role="3oM_SC" value="stage" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV2" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV3" role="1PaTwD">
+          <property role="3oM_SC" value="typechecking" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV4" role="1PaTwD">
+          <property role="3oM_SC" value="process." />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV5" role="1PaTwD">
+          <property role="3oM_SC" value="Employs" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV6" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV7" role="1PaTwD">
+          <property role="3oM_SC" value="pattern" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV8" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV9" role="1PaTwD">
+          <property role="3oM_SC" value="&quot;composable" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVa" role="1PaTwD">
+          <property role="3oM_SC" value="effects&quot;." />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVb" role="1PaTwD">
+          <property role="3oM_SC" value="See" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6OgVc" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgVd" role="1Vtduc">
+            <node concept="VXe08" id="FQ_DIuPC2n" role="1VuXuu">
               <ref role="VXe09" node="5lpFZvOkOLg" resolve="AbstractEffect" />
             </node>
+            <node concept="1PaTwC" id="M_dau6OgVg" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgVh" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="FQ_DIuPC2e" role="1dT_Ay">
-          <property role="1dT_AB" value="." />
+        <node concept="3oM_SD" id="M_dau6OgVi" role="1PaTwD">
+          <property role="3oM_SC" value="." />
         </node>
       </node>
-      <node concept="TZ5HA" id="FQ_DIuP5Mt" role="TZ5H$">
-        <node concept="1dT_AC" id="FQ_DIuP5Mu" role="1dT_Ay">
-          <property role="1dT_AB" value="&lt;p&gt;" />
+      <node concept="1PaTwC" id="M_dau6OgVj" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgVk" role="1PaTwD">
+          <property role="3oM_SC" value="&lt;p&gt;" />
         </node>
       </node>
-      <node concept="TZ5HA" id="FQ_DIuP6aH" role="TZ5H$">
-        <node concept="1dT_AC" id="FQ_DIuP6aI" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6OgVl" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgVm" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
     </node>
@@ -3409,9 +3442,27 @@
         </node>
       </node>
       <node concept="P$JXv" id="19fWAfxeGbY" role="lGtFl">
-        <node concept="TZ5HA" id="19fWAfxeGbZ" role="TZ5H$">
-          <node concept="1dT_AC" id="19fWAfxeGc0" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called from a read action." />
+        <node concept="1PaTwC" id="M_dau6OgWo" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgWp" role="1PaTwD">
+            <property role="3oM_SC" value="Must" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWq" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWr" role="1PaTwD">
+            <property role="3oM_SC" value="called" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWs" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWt" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWu" role="1PaTwD">
+            <property role="3oM_SC" value="read" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWv" role="1PaTwD">
+            <property role="3oM_SC" value="action." />
           </node>
         </node>
       </node>
@@ -4346,46 +4397,87 @@
       <property role="TrG5h" value="T" />
     </node>
     <node concept="3UR2Jj" id="FQ_DItJL_2" role="lGtFl">
-      <node concept="TZ5HA" id="FQ_DItJL_3" role="TZ5H$">
-        <node concept="1dT_AC" id="FQ_DItJL_4" role="1dT_Ay">
-          <property role="1dT_AB" value="A minimal rx component." />
+      <node concept="1PaTwC" id="M_dau6OgVn" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgVo" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVp" role="1PaTwD">
+          <property role="3oM_SC" value="minimal" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVq" role="1PaTwD">
+          <property role="3oM_SC" value="rx" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVr" role="1PaTwD">
+          <property role="3oM_SC" value="component." />
         </node>
       </node>
-      <node concept="TZ5HA" id="FQ_DIum1DQ" role="TZ5H$">
-        <node concept="1dT_AC" id="FQ_DIum1DR" role="1dT_Ay">
-          <property role="1dT_AB" value="&lt;p&gt;" />
+      <node concept="1PaTwC" id="M_dau6OgVs" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgVt" role="1PaTwD">
+          <property role="3oM_SC" value="&lt;p&gt;" />
         </node>
       </node>
-      <node concept="TZ5HA" id="FQ_DIum2Ml" role="TZ5H$">
-        <node concept="1dT_AC" id="FQ_DIum2Mm" role="1dT_Ay">
-          <property role="1dT_AB" value="The minimal rx framework comprises this class along with " />
+      <node concept="1PaTwC" id="M_dau6OgVu" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgVv" role="1PaTwD">
+          <property role="3oM_SC" value="The" />
         </node>
-        <node concept="1dT_AA" id="FQ_DIum3UP" role="1dT_Ay">
-          <node concept="92FcH" id="FQ_DIum3UR" role="qph3F">
-            <node concept="TZ5HA" id="FQ_DIum3UT" role="2XjZqd" />
-            <node concept="VXe08" id="FQ_DIum4c$" role="92FcQ">
+        <node concept="3oM_SD" id="M_dau6OgVw" role="1PaTwD">
+          <property role="3oM_SC" value="minimal" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVx" role="1PaTwD">
+          <property role="3oM_SC" value="rx" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVy" role="1PaTwD">
+          <property role="3oM_SC" value="framework" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVz" role="1PaTwD">
+          <property role="3oM_SC" value="comprises" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV$" role="1PaTwD">
+          <property role="3oM_SC" value="this" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgV_" role="1PaTwD">
+          <property role="3oM_SC" value="class" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVA" role="1PaTwD">
+          <property role="3oM_SC" value="along" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVB" role="1PaTwD">
+          <property role="3oM_SC" value="with" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6OgVC" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgVD" role="1Vtduc">
+            <node concept="VXe08" id="FQ_DIum4c$" role="1VuXuu">
               <ref role="VXe09" node="FQ_DItchtg" resolve="Scheduler" />
             </node>
-          </node>
-        </node>
-        <node concept="1dT_AC" id="FQ_DIum3UO" role="1dT_Ay">
-          <property role="1dT_AB" value=", " />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="FQ_DIum4kx" role="TZ5H$">
-        <node concept="1dT_AC" id="FQ_DIum4ky" role="1dT_Ay">
-          <property role="1dT_AB" value="and " />
-        </node>
-        <node concept="1dT_AA" id="FQ_DIum5HJ" role="1dT_Ay">
-          <node concept="92FcH" id="FQ_DIum5HL" role="qph3F">
-            <node concept="TZ5HA" id="FQ_DIum5HN" role="2XjZqd" />
-            <node concept="VXe08" id="FQ_DIum5HR" role="92FcQ">
-              <ref role="VXe09" node="FQ_DItdPSf" resolve="SingleObserver" />
+            <node concept="1PaTwC" id="M_dau6OgVG" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgVH" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="FQ_DIum5HI" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+        <node concept="3oM_SD" id="M_dau6OgVI" role="1PaTwD">
+          <property role="3oM_SC" value="," />
+        </node>
+      </node>
+      <node concept="1PaTwC" id="M_dau6OgVJ" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgVK" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6OgVL" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgVM" role="1Vtduc">
+            <node concept="VXe08" id="FQ_DIum5HR" role="1VuXuu">
+              <ref role="VXe09" node="FQ_DItdPSf" resolve="SingleObserver" />
+            </node>
+            <node concept="1PaTwC" id="M_dau6OgVP" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgVQ" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVR" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
     </node>
@@ -5350,29 +5442,218 @@
         </node>
       </node>
       <node concept="P$JXv" id="51ek2rQL$Fh" role="lGtFl">
-        <node concept="TZ5HA" id="51ek2rQL$Fi" role="TZ5H$">
-          <node concept="1dT_AC" id="51ek2rQL$Fj" role="1dT_Ay">
-            <property role="1dT_AB" value="First check if this Effect's result is successful. " />
+        <node concept="1PaTwC" id="M_dau6OgWw" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgWx" role="1PaTwD">
+            <property role="3oM_SC" value="First" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWy" role="1PaTwD">
+            <property role="3oM_SC" value="check" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWz" role="1PaTwD">
+            <property role="3oM_SC" value="if" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgW$" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgW_" role="1PaTwD">
+            <property role="3oM_SC" value="Effect's" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWA" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWB" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWC" role="1PaTwD">
+            <property role="3oM_SC" value="successful." />
           </node>
         </node>
-        <node concept="TZ5HA" id="51ek2rQLJD1" role="TZ5H$">
-          <node concept="1dT_AC" id="51ek2rQLJD2" role="1dT_Ay">
-            <property role="1dT_AB" value="Then produce a composition of this Effect and the one returned from the Supplier argument." />
+        <node concept="1PaTwC" id="M_dau6OgWD" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgWE" role="1PaTwD">
+            <property role="3oM_SC" value="Then" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWF" role="1PaTwD">
+            <property role="3oM_SC" value="produce" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWG" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWH" role="1PaTwD">
+            <property role="3oM_SC" value="composition" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWI" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWJ" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWK" role="1PaTwD">
+            <property role="3oM_SC" value="Effect" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWL" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWM" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWN" role="1PaTwD">
+            <property role="3oM_SC" value="one" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWO" role="1PaTwD">
+            <property role="3oM_SC" value="returned" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWP" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWQ" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWR" role="1PaTwD">
+            <property role="3oM_SC" value="Supplier" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWS" role="1PaTwD">
+            <property role="3oM_SC" value="argument." />
           </node>
         </node>
-        <node concept="TZ5HA" id="51ek2rQM4VJ" role="TZ5H$">
-          <node concept="1dT_AC" id="51ek2rQM4VK" role="1dT_Ay">
-            <property role="1dT_AB" value="Given a and b both being Effect, this produces a composition, or direct multiplication of effects: (a x b)." />
+        <node concept="1PaTwC" id="M_dau6OgWT" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgWU" role="1PaTwD">
+            <property role="3oM_SC" value="Given" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWV" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWW" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWX" role="1PaTwD">
+            <property role="3oM_SC" value="b" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWY" role="1PaTwD">
+            <property role="3oM_SC" value="both" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgWZ" role="1PaTwD">
+            <property role="3oM_SC" value="being" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX0" role="1PaTwD">
+            <property role="3oM_SC" value="Effect," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX1" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX2" role="1PaTwD">
+            <property role="3oM_SC" value="produces" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX3" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX4" role="1PaTwD">
+            <property role="3oM_SC" value="composition," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX5" role="1PaTwD">
+            <property role="3oM_SC" value="or" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX6" role="1PaTwD">
+            <property role="3oM_SC" value="direct" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX7" role="1PaTwD">
+            <property role="3oM_SC" value="multiplication" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX8" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX9" role="1PaTwD">
+            <property role="3oM_SC" value="effects:" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXa" role="1PaTwD">
+            <property role="3oM_SC" value="(a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXb" role="1PaTwD">
+            <property role="3oM_SC" value="x" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXc" role="1PaTwD">
+            <property role="3oM_SC" value="b)." />
           </node>
         </node>
-        <node concept="TZ5HA" id="51ek2rQM4o9" role="TZ5H$">
-          <node concept="1dT_AC" id="51ek2rQM4oa" role="1dT_Ay">
-            <property role="1dT_AB" value="The combination is left-associative, meaning the rightmost (most recent) effect providing a certain value has priority." />
+        <node concept="1PaTwC" id="M_dau6OgXd" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgXe" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXf" role="1PaTwD">
+            <property role="3oM_SC" value="combination" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXg" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXh" role="1PaTwD">
+            <property role="3oM_SC" value="left-associative," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXi" role="1PaTwD">
+            <property role="3oM_SC" value="meaning" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXj" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXk" role="1PaTwD">
+            <property role="3oM_SC" value="rightmost" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXl" role="1PaTwD">
+            <property role="3oM_SC" value="(most" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXm" role="1PaTwD">
+            <property role="3oM_SC" value="recent)" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXn" role="1PaTwD">
+            <property role="3oM_SC" value="effect" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXo" role="1PaTwD">
+            <property role="3oM_SC" value="providing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXp" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXq" role="1PaTwD">
+            <property role="3oM_SC" value="certain" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXr" role="1PaTwD">
+            <property role="3oM_SC" value="value" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXs" role="1PaTwD">
+            <property role="3oM_SC" value="has" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXt" role="1PaTwD">
+            <property role="3oM_SC" value="priority." />
           </node>
         </node>
-        <node concept="TZ5HA" id="51ek2rQM7IB" role="TZ5H$">
-          <node concept="1dT_AC" id="51ek2rQM7IC" role="1dT_Ay">
-            <property role="1dT_AB" value="Effects that are produced later override values in earlier effects." />
+        <node concept="1PaTwC" id="M_dau6OgXu" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgXv" role="1PaTwD">
+            <property role="3oM_SC" value="Effects" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXw" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXx" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXy" role="1PaTwD">
+            <property role="3oM_SC" value="produced" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXz" role="1PaTwD">
+            <property role="3oM_SC" value="later" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX$" role="1PaTwD">
+            <property role="3oM_SC" value="override" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgX_" role="1PaTwD">
+            <property role="3oM_SC" value="values" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXA" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXB" role="1PaTwD">
+            <property role="3oM_SC" value="earlier" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgXC" role="1PaTwD">
+            <property role="3oM_SC" value="effects." />
           </node>
         </node>
       </node>
@@ -6287,35 +6568,92 @@
     </node>
     <node concept="2tJIrI" id="36y_5CsNN40" role="jymVt" />
     <node concept="3UR2Jj" id="5lpFZvQYOh_" role="lGtFl">
-      <node concept="TZ5HA" id="2daneBOXatd" role="TZ5H$">
-        <node concept="1dT_AC" id="2daneBOXate" role="1dT_Ay">
-          <property role="1dT_AB" value="Effects are characterized by values they carry." />
+      <node concept="1PaTwC" id="M_dau6OgVS" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgVT" role="1PaTwD">
+          <property role="3oM_SC" value="Effects" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVU" role="1PaTwD">
+          <property role="3oM_SC" value="are" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVV" role="1PaTwD">
+          <property role="3oM_SC" value="characterized" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVW" role="1PaTwD">
+          <property role="3oM_SC" value="by" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVX" role="1PaTwD">
+          <property role="3oM_SC" value="values" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVY" role="1PaTwD">
+          <property role="3oM_SC" value="they" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgVZ" role="1PaTwD">
+          <property role="3oM_SC" value="carry." />
         </node>
       </node>
-      <node concept="TZ5HA" id="19OC8ZO$Hr" role="TZ5H$">
-        <node concept="1dT_AC" id="19OC8ZO$Hs" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6OgW0" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgW1" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
-      <node concept="TZ5HA" id="19OC8ZO$Hx" role="TZ5H$">
-        <node concept="1dT_AC" id="19OC8ZO$Hy" role="1dT_Ay">
-          <property role="1dT_AB" value="Use constructs like " />
+      <node concept="1PaTwC" id="M_dau6OgW2" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgW3" role="1PaTwD">
+          <property role="3oM_SC" value="Use" />
         </node>
-        <node concept="2U$1Ah" id="19OC8ZO$JH" role="1dT_Ay">
-          <property role="2U$1Ai" value="code" />
-          <node concept="TZ5HA" id="19OC8ZO$JI" role="2U$1Aj">
-            <node concept="1dT_AC" id="19OC8ZO$JN" role="1dT_Ay">
-              <property role="1dT_AB" value="Effect.of(KEY1.is(value1), KEY2.is(value2))" />
+        <node concept="3oM_SD" id="M_dau6OgW4" role="1PaTwD">
+          <property role="3oM_SC" value="constructs" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgW5" role="1PaTwD">
+          <property role="3oM_SC" value="like" />
+        </node>
+        <node concept="22dLRv" id="M_dau6OgW6" role="1PaTwD">
+          <property role="22dLRs" value="code" />
+          <node concept="1PaTwC" id="M_dau6OgW8" role="22dLJL">
+            <node concept="3oM_SD" id="M_dau6OgW9" role="1PaTwD">
+              <property role="3oM_SC" value="Effect.of(KEY1.is(value1)," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgWa" role="1PaTwD">
+              <property role="3oM_SC" value="KEY2.is(value2))" />
             </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="19OC8ZO$JG" role="1dT_Ay">
-          <property role="1dT_AB" value=" to create an effect." />
+        <node concept="3oM_SD" id="M_dau6OgWb" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWc" role="1PaTwD">
+          <property role="3oM_SC" value="create" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWd" role="1PaTwD">
+          <property role="3oM_SC" value="an" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWe" role="1PaTwD">
+          <property role="3oM_SC" value="effect." />
         </node>
       </node>
-      <node concept="TZ5HA" id="19OC8ZO$JP" role="TZ5H$">
-        <node concept="1dT_AC" id="19OC8ZO$JQ" role="1dT_Ay">
-          <property role="1dT_AB" value="Use compose() to receive a composition of effects." />
+      <node concept="1PaTwC" id="M_dau6OgWf" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgWg" role="1PaTwD">
+          <property role="3oM_SC" value="Use" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWh" role="1PaTwD">
+          <property role="3oM_SC" value="compose()" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWi" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWj" role="1PaTwD">
+          <property role="3oM_SC" value="receive" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWk" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWl" role="1PaTwD">
+          <property role="3oM_SC" value="composition" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWm" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgWn" role="1PaTwD">
+          <property role="3oM_SC" value="effects." />
         </node>
       </node>
     </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
index c5530ef8..5e86d1f8 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
@@ -20,11 +20,12 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="3" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
index 48eea005..7c2cf63c 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
   </languages>
   <imports>
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
@@ -66,16 +66,10 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -85,6 +79,14 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
   </registry>
   <node concept="312cEu" id="7km57Pkjxf4">
     <property role="TrG5h" value="TypecheckingAspect" />
@@ -133,14 +135,59 @@
       <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
     </node>
     <node concept="3UR2Jj" id="7P_FdVPWD2k" role="lGtFl">
-      <node concept="TZ5HA" id="7P_FdVPWD2l" role="TZ5H$">
-        <node concept="1dT_AC" id="7P_FdVPWD2m" role="1dT_Ay">
-          <property role="1dT_AB" value="All allFor* methods return the list sorted in topological order, so that the extending" />
+      <node concept="1PaTwC" id="M_dau6OgQs" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgQt" role="1PaTwD">
+          <property role="3oM_SC" value="All" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQu" role="1PaTwD">
+          <property role="3oM_SC" value="allFor*" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQv" role="1PaTwD">
+          <property role="3oM_SC" value="methods" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQw" role="1PaTwD">
+          <property role="3oM_SC" value="return" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQx" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQy" role="1PaTwD">
+          <property role="3oM_SC" value="list" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQz" role="1PaTwD">
+          <property role="3oM_SC" value="sorted" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQ$" role="1PaTwD">
+          <property role="3oM_SC" value="in" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQ_" role="1PaTwD">
+          <property role="3oM_SC" value="topological" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQA" role="1PaTwD">
+          <property role="3oM_SC" value="order," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQB" role="1PaTwD">
+          <property role="3oM_SC" value="so" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQC" role="1PaTwD">
+          <property role="3oM_SC" value="that" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQD" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQE" role="1PaTwD">
+          <property role="3oM_SC" value="extending" />
         </node>
       </node>
-      <node concept="TZ5HA" id="7P_FdVPWEBW" role="TZ5H$">
-        <node concept="1dT_AC" id="7P_FdVPWEBX" role="1dT_Ay">
-          <property role="1dT_AB" value="aspects come first. " />
+      <node concept="1PaTwC" id="M_dau6OgQF" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgQG" role="1PaTwD">
+          <property role="3oM_SC" value="aspects" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQH" role="1PaTwD">
+          <property role="3oM_SC" value="come" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgQI" role="1PaTwD">
+          <property role="3oM_SC" value="first." />
         </node>
       </node>
     </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index 9ef96053..c2a947bc 100644
--- a/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -21,8 +21,9 @@
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
index c40528d6..ef943e5b 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
+++ b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
@@ -25,7 +25,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:5dc5fc0d-37ef-4782-8192-8b5ce1f69f80:jetbrains.mps.baseLanguage.extensionMethods" version="0" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index f7cad09c..6abe795b 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -7,7 +7,7 @@
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -217,16 +217,10 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
       <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
@@ -6024,19 +6018,76 @@
     <node concept="2tJIrI" id="1LBj9wB4gOk" role="jymVt" />
     <node concept="3Tm1VV" id="1LBj9wB4sZR" role="1B3o_S" />
     <node concept="3UR2Jj" id="1LBj9wBgMM7" role="lGtFl">
-      <node concept="TZ5HA" id="1LBj9wBgMM8" role="TZ5H$">
-        <node concept="1dT_AC" id="1LBj9wBgMM9" role="1dT_Ay">
-          <property role="1dT_AB" value="A simplified mocking framework to replace Mockito which has become a royal PITA recently. " />
+      <node concept="1PaTwC" id="M_dau6OguL" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OguM" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguN" role="1PaTwD">
+          <property role="3oM_SC" value="simplified" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguO" role="1PaTwD">
+          <property role="3oM_SC" value="mocking" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguP" role="1PaTwD">
+          <property role="3oM_SC" value="framework" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguQ" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguR" role="1PaTwD">
+          <property role="3oM_SC" value="replace" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguS" role="1PaTwD">
+          <property role="3oM_SC" value="Mockito" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguT" role="1PaTwD">
+          <property role="3oM_SC" value="which" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguU" role="1PaTwD">
+          <property role="3oM_SC" value="has" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguV" role="1PaTwD">
+          <property role="3oM_SC" value="become" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguW" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguX" role="1PaTwD">
+          <property role="3oM_SC" value="royal" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguY" role="1PaTwD">
+          <property role="3oM_SC" value="PITA" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OguZ" role="1PaTwD">
+          <property role="3oM_SC" value="recently." />
         </node>
       </node>
-      <node concept="TZ5HA" id="1LBj9wBgOzm" role="TZ5H$">
-        <node concept="1dT_AC" id="1LBj9wBgOzn" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6Ogv0" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogv1" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
-      <node concept="TZ5HA" id="1LBj9wBgO$q" role="TZ5H$">
-        <node concept="1dT_AC" id="1LBj9wBgO$r" role="1dT_Ay">
-          <property role="1dT_AB" value="Supports only in-order, total specification of interactions." />
+      <node concept="1PaTwC" id="M_dau6Ogv2" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogv3" role="1PaTwD">
+          <property role="3oM_SC" value="Supports" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogv4" role="1PaTwD">
+          <property role="3oM_SC" value="only" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogv5" role="1PaTwD">
+          <property role="3oM_SC" value="in-order," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogv6" role="1PaTwD">
+          <property role="3oM_SC" value="total" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogv7" role="1PaTwD">
+          <property role="3oM_SC" value="specification" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogv8" role="1PaTwD">
+          <property role="3oM_SC" value="of" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6Ogv9" role="1PaTwD">
+          <property role="3oM_SC" value="interactions." />
         </node>
       </node>
     </node>
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 9609e57e..8658e164 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -68,7 +68,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
index f05bdce4..a72605e5 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
@@ -14,6 +14,9 @@
     <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -62,7 +65,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -178,9 +180,9 @@
                 <node concept="1xIGOp" id="3w0n0hzjSWs" role="1xVPHs" />
               </node>
             </node>
-            <node concept="2qgKlT" id="3w0n0hzjTgg" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og2S" role="2OqNvi">
               <ref role="37wK5l" to="qd7f:3w0n0hzjKLG" resolve="isRuleSupported" />
-              <node concept="2DD5aU" id="3w0n0hzjTDM" role="37wK5m" />
+              <node concept="2DD5aU" id="M_dau6Og2U" role="37wK5m" />
             </node>
           </node>
         </node>
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 666bcf00..898175ff 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
     <devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
@@ -18,6 +18,9 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
@@ -136,15 +139,9 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
       </concept>
     </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
@@ -170,7 +167,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
@@ -1020,7 +1016,7 @@
                                   <node concept="3A2sRY" id="2CF5XF5sRob" role="2Oq$k0">
                                     <ref role="3A2yKK" node="Vo$tzLEGtN" resolve="fi" />
                                   </node>
-                                  <node concept="2qgKlT" id="2CF5XF5sRoc" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og2V" role="2OqNvi">
                                     <ref role="37wK5l" to="qd7f:5jVx7S20nJ_" resolve="allInScope" />
                                   </node>
                                 </node>
@@ -3332,9 +3328,48 @@
         </node>
       </node>
       <node concept="P$JXv" id="2cLnr$rESwb" role="lGtFl">
-        <node concept="TZ5HA" id="2cLnr$rESwc" role="TZ5H$">
-          <node concept="1dT_AC" id="2cLnr$rESwd" role="1dT_Ay">
-            <property role="1dT_AB" value="Collect free variable names under quantifiers of one of the variables specified in `quantVars`." />
+        <node concept="1PaTwC" id="M_dau6Ogux" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Oguy" role="1PaTwD">
+            <property role="3oM_SC" value="Collect" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Oguz" role="1PaTwD">
+            <property role="3oM_SC" value="free" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogu$" role="1PaTwD">
+            <property role="3oM_SC" value="variable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogu_" role="1PaTwD">
+            <property role="3oM_SC" value="names" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguA" role="1PaTwD">
+            <property role="3oM_SC" value="under" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguB" role="1PaTwD">
+            <property role="3oM_SC" value="quantifiers" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguC" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguD" role="1PaTwD">
+            <property role="3oM_SC" value="one" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguE" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguF" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguG" role="1PaTwD">
+            <property role="3oM_SC" value="variables" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguH" role="1PaTwD">
+            <property role="3oM_SC" value="specified" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguI" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OguJ" role="1PaTwD">
+            <property role="3oM_SC" value="`quantVars`." />
           </node>
         </node>
       </node>
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 97ef89d7..f6d8f651 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -68,7 +68,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
index 668cb776..e7f4779f 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
@@ -18,6 +18,9 @@
     <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -66,7 +69,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -149,9 +151,9 @@
                 <node concept="1xIGOp" id="3w0n0hzjSWs" role="1xVPHs" />
               </node>
             </node>
-            <node concept="2qgKlT" id="3w0n0hzjTgg" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og3t" role="2OqNvi">
               <ref role="37wK5l" to="qd7f:3w0n0hzjKLG" resolve="isRuleSupported" />
-              <node concept="2DD5aU" id="3w0n0hzjTDM" role="37wK5m" />
+              <node concept="2DD5aU" id="M_dau6Og3v" role="37wK5m" />
             </node>
           </node>
         </node>
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 dbb978df..beede3cd 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -66,7 +66,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
diff --git a/samples/fitch/languages/samples.fitch/models/behavior.mps b/samples/fitch/languages/samples.fitch/models/behavior.mps
index 402b98ac..0b34ac72 100644
--- a/samples/fitch/languages/samples.fitch/models/behavior.mps
+++ b/samples/fitch/languages/samples.fitch/models/behavior.mps
@@ -21,6 +21,7 @@
         <property id="1225194472834" name="isAbstract" index="13i0iv" />
       </concept>
       <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -75,7 +76,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -162,7 +162,7 @@
                         <node concept="1mfA1w" id="5jVx7S20Bs0" role="2OqNvi" />
                       </node>
                     </node>
-                    <node concept="2qgKlT" id="5jVx7S20EVk" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Ogd9" role="2OqNvi">
                       <ref role="37wK5l" node="5jVx7S20nJ_" resolve="allInScope" />
                     </node>
                   </node>
diff --git a/samples/fitch/languages/samples.fitch/models/constraints.mps b/samples/fitch/languages/samples.fitch/models/constraints.mps
index d8b65510..c1ba0847 100644
--- a/samples/fitch/languages/samples.fitch/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch/models/constraints.mps
@@ -13,6 +13,9 @@
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -133,7 +136,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -404,7 +406,7 @@
                           <node concept="1xIGOp" id="5p9vXslDHuB" role="1xVPHs" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="5p9vXslDHuC" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Ogdb" role="2OqNvi">
                         <ref role="37wK5l" to="qd7f:5jVx7S20nJ_" resolve="allInScope" />
                       </node>
                     </node>
diff --git a/samples/fitch/languages/samples.fitch/models/editor.mps b/samples/fitch/languages/samples.fitch/models/editor.mps
index 2eecaa80..4d5d2dab 100644
--- a/samples/fitch/languages/samples.fitch/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch/models/editor.mps
@@ -14,6 +14,9 @@
     <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
       <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
@@ -217,7 +220,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -1020,7 +1022,7 @@
                           </node>
                           <node concept="1yR$tW" id="2AfSc6JyrF7" role="1m5AlR" />
                         </node>
-                        <node concept="2qgKlT" id="5jVx7S20KqM" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogdd" role="2OqNvi">
                           <ref role="37wK5l" to="qd7f:5jVx7S20nJ_" resolve="allInScope" />
                         </node>
                       </node>
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 351b9938..afc9eeaf 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -65,7 +65,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
index 77e56353..1ea765e7 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
@@ -27,6 +27,7 @@
         <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
       </concept>
       <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
@@ -142,7 +143,6 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -206,7 +206,7 @@
                   <ref role="3Tt5mk" to="8tt8:3_qfG1EP6Op" resolve="argType" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="3g9UT2j9to2" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogak" role="2OqNvi">
                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
               </node>
             </node>
@@ -223,7 +223,7 @@
                   <ref role="3Tt5mk" to="8tt8:3_qfG1EP6O_" resolve="resType" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="3g9UT2j9y4Y" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogam" role="2OqNvi">
                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
               </node>
             </node>
@@ -355,7 +355,7 @@
                               <property role="Xl_RC" value=" " />
                             </node>
                             <node concept="2OqwBi" id="48ZGLP7qqlj" role="3uHU7w">
-                              <node concept="2qgKlT" id="48ZGLP7qrVO" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Ogao" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                               </node>
                               <node concept="37vLTw" id="48ZGLP7qtlQ" role="2Oq$k0">
@@ -402,7 +402,7 @@
                     <node concept="37vLTw" id="48ZGLP7qXAG" role="2Oq$k0">
                       <ref role="3cqZAo" node="48ZGLP7q4CP" resolve="tv" />
                     </node>
-                    <node concept="2qgKlT" id="48ZGLP7qYOE" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Ogaq" role="2OqNvi">
                       <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                     </node>
                   </node>
@@ -528,7 +528,7 @@
                     <node concept="37vLTw" id="2O9ahh6o_AG" role="2Oq$k0">
                       <ref role="3cqZAo" node="2O9ahh6o8Lk" resolve="ctr" />
                     </node>
-                    <node concept="2qgKlT" id="2O9ahh6oIhJ" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Ogas" role="2OqNvi">
                       <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                     </node>
                   </node>
@@ -577,7 +577,7 @@
                         <node concept="37vLTw" id="2O9ahh6oJvS" role="2Oq$k0">
                           <ref role="3cqZAo" node="2O9ahh6o8Lk" resolve="ctr" />
                         </node>
-                        <node concept="2qgKlT" id="2O9ahh6oJvT" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogau" role="2OqNvi">
                           <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                         </node>
                       </node>
@@ -656,7 +656,7 @@
                     <ref role="3Tt5mk" to="8tt8:12dHl3ZCFaI" resolve="type" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="48ZGLP7rBX9" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Ogaw" role="2OqNvi">
                   <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
                 </node>
               </node>
@@ -701,7 +701,7 @@
                   <ref role="3Tt5mk" to="8tt8:JqEP$8shbd" resolve="fstType" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="JqEP$8shoz" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogay" role="2OqNvi">
                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
               </node>
             </node>
@@ -718,7 +718,7 @@
                   <ref role="3Tt5mk" to="8tt8:JqEP$8shbb" resolve="sndType" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="JqEP$8shoF" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Oga$" role="2OqNvi">
                 <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
               </node>
             </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 84dc2dfc..53c782a5 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -8,7 +8,7 @@
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index f17c8088..042829ae 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
@@ -26,7 +26,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
index 05910e79..87385e5b 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -7,7 +7,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
   </languages>
   <imports>
     <import index="ysck" ref="r:64f472af-c4b1-4900-9ea3-aec5c51b6e6e(samples.lambdacalc.demo)" />
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
index c962e7d4..245e4fae 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
@@ -22,7 +22,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
index faf9d51b..a127f1d5 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -60,7 +60,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
index 049810ef..eae9aa98 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -69,7 +69,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
index 709a54f0..ea47496c 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
@@ -16,6 +16,9 @@
     <import index="tp4h" ref="r:00000000-0000-4000-0000-011c8959036d(jetbrains.mps.baseLanguage.classifiers.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -136,7 +139,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -899,7 +901,7 @@
               <node concept="3A2sRY" id="2q9s7foP$ur" role="2Oq$k0">
                 <ref role="3A2yKK" node="2q9s7foP$qk" resolve="sce" />
               </node>
-              <node concept="2qgKlT" id="2q9s7foP_Gc" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OfZC" role="2OqNvi">
                 <ref role="37wK5l" to="tp4h:hHOIkvz" resolve="getClassifier" />
               </node>
             </node>
@@ -928,11 +930,11 @@
                               <node concept="3A2sRY" id="2q9s7foPAgt" role="2Oq$k0">
                                 <ref role="3A2yKK" node="2q9s7foP$qk" resolve="sce" />
                               </node>
-                              <node concept="2qgKlT" id="2q9s7foPC4d" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6OfZE" role="2OqNvi">
                                 <ref role="37wK5l" to="tp4h:hHOIkvz" resolve="getClassifier" />
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="2q9s7foPDiF" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6OfZG" role="2OqNvi">
                               <ref role="37wK5l" to="tp4h:hHOGPWW" resolve="createSuperType" />
                             </node>
                           </node>
@@ -1002,7 +1004,7 @@
               <node concept="3A2sRY" id="2q9s7foPFaC" role="2Oq$k0">
                 <ref role="3A2yKK" node="2q9s7foPF43" resolve="tce" />
               </node>
-              <node concept="2qgKlT" id="2q9s7foPFMp" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OfZI" role="2OqNvi">
                 <ref role="37wK5l" to="tp4h:hEwJeDN" resolve="getClassifier" />
               </node>
             </node>
@@ -1031,11 +1033,11 @@
                               <node concept="3A2sRY" id="2q9s7foPFMV" role="2Oq$k0">
                                 <ref role="3A2yKK" node="2q9s7foPF43" resolve="tce" />
                               </node>
-                              <node concept="2qgKlT" id="2q9s7foPGp$" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6OfZK" role="2OqNvi">
                                 <ref role="37wK5l" to="tp4h:hEwJeDN" resolve="getClassifier" />
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="2q9s7foPHBO" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6OfZM" role="2OqNvi">
                               <ref role="37wK5l" to="tp4h:hEwJimy" resolve="createType" />
                             </node>
                           </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
index 606d91d6..9d899c8f 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -71,7 +71,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
index 1c10dc39..8716db9b 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
@@ -5,7 +5,7 @@
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
     <devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
   </languages>
@@ -35,6 +35,9 @@
         <child id="1238857834412" name="index" index="1LF_Uc" />
       </concept>
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -201,7 +204,6 @@
         <reference id="6832197706140518108" name="param" index="zr_51" />
       </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
         <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
@@ -209,11 +211,8 @@
         <property id="8465538089690881934" name="text" index="TUZQ4" />
         <child id="6832197706140518123" name="parameter" index="zr_5Q" />
       </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
@@ -268,7 +267,6 @@
         <child id="1803469493727536396" name="concept" index="hTh3Z" />
       </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -1333,7 +1331,7 @@
                                         <node concept="37vLTw" id="1uV2bz2c2O3" role="2Oq$k0">
                                           <ref role="3cqZAo" node="6E5fMGvfKOS" resolve="it" />
                                         </node>
-                                        <node concept="2qgKlT" id="1uV2bz2c46O" role="2OqNvi">
+                                        <node concept="3zqWPK" id="M_dau6OgaA" role="2OqNvi">
                                           <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
                                         </node>
                                       </node>
@@ -1410,7 +1408,7 @@
                                         <node concept="37vLTw" id="1uV2bz2capC" role="2Oq$k0">
                                           <ref role="3cqZAo" node="6E5fMGvfKOU" resolve="it" />
                                         </node>
-                                        <node concept="2qgKlT" id="1uV2bz2caMT" role="2OqNvi">
+                                        <node concept="3zqWPK" id="M_dau6OgaC" role="2OqNvi">
                                           <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
                                         </node>
                                       </node>
@@ -1509,7 +1507,7 @@
                                         <node concept="37vLTw" id="1uV2bz2bJVQ" role="2Oq$k0">
                                           <ref role="3cqZAo" node="6E5fMGvfKOW" resolve="it" />
                                         </node>
-                                        <node concept="2qgKlT" id="1uV2bz2bJVR" role="2OqNvi">
+                                        <node concept="3zqWPK" id="M_dau6OgaE" role="2OqNvi">
                                           <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
                                         </node>
                                       </node>
@@ -1553,7 +1551,7 @@
                           <ref role="3cqZAo" node="6E5fMGvfKOY" resolve="it" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="1aCOVac0y0X" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6OgaG" role="2OqNvi">
                         <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
                       </node>
                     </node>
@@ -2340,7 +2338,7 @@
                                   <node concept="37vLTw" id="1uV2bz28AQt" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6E5fMGvfKP0" resolve="it" />
                                   </node>
-                                  <node concept="2qgKlT" id="1uV2bz28AQu" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6OgaI" role="2OqNvi">
                                     <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
                                   </node>
                                 </node>
@@ -2683,7 +2681,7 @@
                         <node concept="3A2sRY" id="4S1mDSNQcAK" role="2Oq$k0">
                           <ref role="3A2yKK" node="4S1mDSNQcCb" resolve="inv" />
                         </node>
-                        <node concept="2qgKlT" id="4S1mDSNQjh8" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6OgaK" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -4177,7 +4175,7 @@
                   <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
                 </node>
                 <node concept="2OqwBi" id="7XyRbC9NJd" role="1m5AlR">
-                  <node concept="2qgKlT" id="7XyRbC9NJh" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6OgaM" role="2OqNvi">
                     <ref role="37wK5l" to="tpek:i2fhS7A" resolve="getLastStatement" />
                   </node>
                   <node concept="37vLTw" id="5jbgz$E60lB" role="2Oq$k0">
@@ -6060,19 +6058,107 @@
         <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
       </node>
       <node concept="P$JXv" id="3DgB4rOxmj1" role="lGtFl">
-        <node concept="TZ5HA" id="3DgB4rOxmj2" role="TZ5H$">
-          <node concept="1dT_AC" id="3DgB4rOxmj3" role="1dT_Ay">
-            <property role="1dT_AB" value="Looks up functional classifier by a key specifying function type." />
-          </node>
-        </node>
         <node concept="TUZQ0" id="3DgB4rOxmj4" role="3nqlJM">
-          <property role="TUZQ4" value="tuple specifying function: [is non-void return, number of arguments, number of throwed exceptions from signature]" />
+          <property role="TUZQ4" value="" />
           <node concept="zr_55" id="3DgB4rOxmj6" role="zr_5Q">
             <ref role="zr_51" node="3DgB4rOwVRI" resolve="functionTypeKey" />
           </node>
+          <node concept="1PaTwC" id="M_dau6OgTM" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgTN" role="1PaTwD">
+              <property role="3oM_SC" value="tuple" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTO" role="1PaTwD">
+              <property role="3oM_SC" value="specifying" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTP" role="1PaTwD">
+              <property role="3oM_SC" value="function:" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTQ" role="1PaTwD">
+              <property role="3oM_SC" value="[is" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTR" role="1PaTwD">
+              <property role="3oM_SC" value="non-void" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTS" role="1PaTwD">
+              <property role="3oM_SC" value="return," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTT" role="1PaTwD">
+              <property role="3oM_SC" value="number" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTU" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTV" role="1PaTwD">
+              <property role="3oM_SC" value="arguments," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTW" role="1PaTwD">
+              <property role="3oM_SC" value="number" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTX" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTY" role="1PaTwD">
+              <property role="3oM_SC" value="throwed" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgTZ" role="1PaTwD">
+              <property role="3oM_SC" value="exceptions" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgU0" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgU1" role="1PaTwD">
+              <property role="3oM_SC" value="signature]" />
+            </node>
+          </node>
         </node>
         <node concept="x79VA" id="3DgB4rOxmj7" role="3nqlJM">
-          <property role="x79VB" value="functional classifier or null" />
+          <property role="x79VB" value="" />
+          <node concept="1PaTwC" id="M_dau6OgU2" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgU3" role="1PaTwD">
+              <property role="3oM_SC" value="functional" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgU4" role="1PaTwD">
+              <property role="3oM_SC" value="classifier" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgU5" role="1PaTwD">
+              <property role="3oM_SC" value="or" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgU6" role="1PaTwD">
+              <property role="3oM_SC" value="null" />
+            </node>
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6OgTB" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgTC" role="1PaTwD">
+            <property role="3oM_SC" value="Looks" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTD" role="1PaTwD">
+            <property role="3oM_SC" value="up" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTE" role="1PaTwD">
+            <property role="3oM_SC" value="functional" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTF" role="1PaTwD">
+            <property role="3oM_SC" value="classifier" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTG" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTH" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTI" role="1PaTwD">
+            <property role="3oM_SC" value="key" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTJ" role="1PaTwD">
+            <property role="3oM_SC" value="specifying" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTK" role="1PaTwD">
+            <property role="3oM_SC" value="function" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgTL" role="1PaTwD">
+            <property role="3oM_SC" value="type." />
+          </node>
         </node>
       </node>
     </node>
@@ -6121,19 +6207,89 @@
         <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
       </node>
       <node concept="P$JXv" id="64$y60zcFFQ" role="lGtFl">
-        <node concept="TZ5HA" id="64$y60zcFFR" role="TZ5H$">
-          <node concept="1dT_AC" id="64$y60zcFFS" role="1dT_Ay">
-            <property role="1dT_AB" value="Looks up functional classifier by a key specifying function type." />
-          </node>
-        </node>
         <node concept="TUZQ0" id="64$y60zcFFT" role="3nqlJM">
-          <property role="TUZQ4" value="tuple specifying function: [is non-void return, number of arguments]" />
+          <property role="TUZQ4" value="" />
           <node concept="zr_55" id="64$y60zcFFU" role="zr_5Q">
             <ref role="zr_51" node="64$y60zcFFE" resolve="functionTypeKey" />
           </node>
+          <node concept="1PaTwC" id="M_dau6OgUi" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgUj" role="1PaTwD">
+              <property role="3oM_SC" value="tuple" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUk" role="1PaTwD">
+              <property role="3oM_SC" value="specifying" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUl" role="1PaTwD">
+              <property role="3oM_SC" value="function:" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUm" role="1PaTwD">
+              <property role="3oM_SC" value="[is" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUn" role="1PaTwD">
+              <property role="3oM_SC" value="non-void" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUo" role="1PaTwD">
+              <property role="3oM_SC" value="return," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUp" role="1PaTwD">
+              <property role="3oM_SC" value="number" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUq" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUr" role="1PaTwD">
+              <property role="3oM_SC" value="arguments]" />
+            </node>
+          </node>
         </node>
         <node concept="x79VA" id="64$y60zcFFV" role="3nqlJM">
-          <property role="x79VB" value="functional classifier or null" />
+          <property role="x79VB" value="" />
+          <node concept="1PaTwC" id="M_dau6OgUs" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgUt" role="1PaTwD">
+              <property role="3oM_SC" value="functional" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUu" role="1PaTwD">
+              <property role="3oM_SC" value="classifier" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUv" role="1PaTwD">
+              <property role="3oM_SC" value="or" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUw" role="1PaTwD">
+              <property role="3oM_SC" value="null" />
+            </node>
+          </node>
+        </node>
+        <node concept="1PaTwC" id="M_dau6OgU7" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgU8" role="1PaTwD">
+            <property role="3oM_SC" value="Looks" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgU9" role="1PaTwD">
+            <property role="3oM_SC" value="up" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUa" role="1PaTwD">
+            <property role="3oM_SC" value="functional" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUb" role="1PaTwD">
+            <property role="3oM_SC" value="classifier" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUc" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUd" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUe" role="1PaTwD">
+            <property role="3oM_SC" value="key" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUf" role="1PaTwD">
+            <property role="3oM_SC" value="specifying" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUg" role="1PaTwD">
+            <property role="3oM_SC" value="function" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUh" role="1PaTwD">
+            <property role="3oM_SC" value="type." />
+          </node>
         </node>
       </node>
     </node>
@@ -15393,7 +15549,7 @@
                   </node>
                 </node>
                 <node concept="2OqwBi" id="3DgB4rOyq1Q" role="33vP2m">
-                  <node concept="2qgKlT" id="3DgB4rOyq1S" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6OgaO" role="2OqNvi">
                     <ref role="37wK5l" to="tpek:4_LVZ3pBKCn" resolve="methods" />
                   </node>
                   <node concept="37vLTw" id="3DgB4rOytpo" role="2Oq$k0">
@@ -15423,7 +15579,7 @@
                               <node concept="37vLTw" id="3DgB4rOyq25" role="2Oq$k0">
                                 <ref role="3cqZAo" node="6E5fMGvfKPc" resolve="m" />
                               </node>
-                              <node concept="2qgKlT" id="3DgB4rOyq26" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6OgaQ" role="2OqNvi">
                                 <ref role="37wK5l" to="tpek:28P2dHxCoRl" resolve="isAnAbstractMethod" />
                               </node>
                             </node>
@@ -15545,13 +15701,69 @@
         </node>
       </node>
       <node concept="P$JXv" id="3DgB4rOyuH2" role="lGtFl">
-        <node concept="TZ5HA" id="3DgB4rOyuH3" role="TZ5H$">
-          <node concept="1dT_AC" id="3DgB4rOyuH4" role="1dT_Ay">
-            <property role="1dT_AB" value="Get method declaration for a functional interface." />
+        <node concept="x79VA" id="3DgB4rOyuH8" role="3nqlJM">
+          <property role="x79VB" value="" />
+          <node concept="1PaTwC" id="M_dau6OgUD" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgUE" role="1PaTwD">
+              <property role="3oM_SC" value="method" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUF" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUG" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUH" role="1PaTwD">
+              <property role="3oM_SC" value="functional" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUI" role="1PaTwD">
+              <property role="3oM_SC" value="classifier" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUJ" role="1PaTwD">
+              <property role="3oM_SC" value="if" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUK" role="1PaTwD">
+              <property role="3oM_SC" value="it" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUL" role="1PaTwD">
+              <property role="3oM_SC" value="indeed" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUM" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUN" role="1PaTwD">
+              <property role="3oM_SC" value="functional," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUO" role="1PaTwD">
+              <property role="3oM_SC" value="or" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgUP" role="1PaTwD">
+              <property role="3oM_SC" value="null" />
+            </node>
           </node>
         </node>
-        <node concept="x79VA" id="3DgB4rOyuH8" role="3nqlJM">
-          <property role="x79VB" value="method of this functional classifier if it indeed is functional, or null" />
+        <node concept="1PaTwC" id="M_dau6OgUx" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgUy" role="1PaTwD">
+            <property role="3oM_SC" value="Get" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUz" role="1PaTwD">
+            <property role="3oM_SC" value="method" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgU$" role="1PaTwD">
+            <property role="3oM_SC" value="declaration" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgU_" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUA" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUB" role="1PaTwD">
+            <property role="3oM_SC" value="functional" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgUC" role="1PaTwD">
+            <property role="3oM_SC" value="interface." />
+          </node>
         </node>
       </node>
     </node>
@@ -15580,7 +15792,7 @@
               <node concept="3A2sRY" id="1aCOVac_PI9" role="2Oq$k0">
                 <ref role="3A2yKK" node="1aCOVac_Nu4" resolve="pd" />
               </node>
-              <node concept="2qgKlT" id="1aCOVac_PMl" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OgaS" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
               </node>
             </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
index 59876b67..15abd0c7 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -72,7 +72,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
index 5181afdd..301ecd10 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
@@ -23,6 +23,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -173,7 +176,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -456,7 +458,7 @@
                     </node>
                     <node concept="2yIwOk" id="3Z1xyIw0QdT" role="2OqNvi" />
                   </node>
-                  <node concept="2qgKlT" id="3Z1xyIw0QCp" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og4p" role="2OqNvi">
                     <ref role="37wK5l" to="tp2z:5cL0w3DYWgB" resolve="getAllApplicableTypes" />
                   </node>
                 </node>
@@ -9867,7 +9869,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTdeM" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTddP" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTdKF" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4r" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -9930,7 +9932,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTe25" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTe2l" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTe26" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4t" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -9993,7 +9995,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTe5g" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTe5w" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTe5h" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4v" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10056,7 +10058,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTe8g" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTe8w" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTe8h" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4x" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10139,7 +10141,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTean" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTeaB" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTeao" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4z" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10306,7 +10308,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTefQ" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTeg6" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTefR" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4_" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10389,7 +10391,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTecT" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTed9" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTecU" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4B" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10466,7 +10468,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTeje" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTeju" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTejf" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4D" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10543,7 +10545,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTen1" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTenh" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTen2" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4F" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10606,7 +10608,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTerf" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTerv" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTerg" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4H" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10669,7 +10671,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTevS" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTew8" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTevT" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4J" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10732,7 +10734,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTfWP" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTfX5" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTfWQ" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4L" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10809,7 +10811,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTgSH" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTgSX" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTgSI" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4N" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10886,7 +10888,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvThUT" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvThV9" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvThUU" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4P" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -10963,7 +10965,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTi1e" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTi1u" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTi1f" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4R" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11040,7 +11042,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTi7Y" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTi8e" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTi7Z" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4T" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11103,7 +11105,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvVtv3" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvVtvs" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvVtv4" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4V" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11186,7 +11188,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTimJ" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTimZ" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTimK" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4X" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11269,7 +11271,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTiuK" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTiv0" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTiuL" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og4Z" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11352,7 +11354,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvTjpY" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvTjqe" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvTjpZ" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og51" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11435,7 +11437,7 @@
                         <node concept="3A2sRY" id="72jqiIMQ65N" role="2Oq$k0">
                           <ref role="3A2yKK" node="72jqiIMQ65C" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="72jqiIMQ65O" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og53" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11549,7 +11551,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvXt$W" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvXt_l" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvXt$X" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og55" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11704,7 +11706,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw58_q" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw58A6" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw58_r" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og57" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -11859,7 +11861,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw34lg" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw34lW" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw34lh" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og59" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -12014,7 +12016,7 @@
                         <node concept="3A2sRY" id="3Z1xyIvXwD_" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIvXwEm" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIvXwDA" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5b" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -12160,7 +12162,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw2kCm" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw2kCU" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw2kCn" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5d" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -12306,7 +12308,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw2kHo" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw2kHW" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw2kHp" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5f" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -12452,7 +12454,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw59WD" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw59Xb" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw59WE" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5h" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -12598,7 +12600,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw33DT" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw33Et" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw33DU" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5j" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -12744,7 +12746,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw3Glk" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw3GlS" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw3Gll" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5l" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -12890,7 +12892,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw3H5y" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw3H66" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw3H5z" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5n" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -13046,7 +13048,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw3O0S" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw3O1q" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw3O0T" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5p" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -13202,7 +13204,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw3P07" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw3P0D" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw3P08" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5r" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -13348,7 +13350,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw5bkM" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw5blk" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw5bkN" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5t" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -13494,7 +13496,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw5blv" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw5bm1" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw5blw" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5v" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -13663,7 +13665,7 @@
                         <node concept="3A2sRY" id="3Z1xyIw0ET9" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw0ERT" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIw0Fjp" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5x" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -13727,7 +13729,7 @@
               <node concept="3A2sRY" id="3Z1xyIwqZ9Q" role="2Oq$k0">
                 <ref role="3A2yKK" node="3Z1xyIwjezB" resolve="op" />
               </node>
-              <node concept="2qgKlT" id="3Z1xyIwqZv5" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og5z" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
               </node>
             </node>
@@ -13964,7 +13966,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwqQvt" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwqQv9" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwqQvu" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5_" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -14079,7 +14081,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwcCdT" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw6dvX" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwcCdU" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5B" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -14234,7 +14236,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwbleC" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwblfq" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwbleD" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5D" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -14461,7 +14463,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwcCHf" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwbnhy" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwcCHg" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5F" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -14623,7 +14625,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwcD12" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwbxi9" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwcD13" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5H" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -14785,7 +14787,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwimdO" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwin3y" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwimG2" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5J" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -14983,7 +14985,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwadZ2" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwadTM" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwadsM" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5L" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -15234,7 +15236,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwd$Ix" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIw7n6c" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwd$Iy" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5N" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -15363,7 +15365,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwd$Y8" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwbrAO" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwd$Y9" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5P" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -15492,7 +15494,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwd_eO" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwbskf" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwd_eP" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5R" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -15621,7 +15623,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwbNFg" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwbNGE" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwbNFh" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5T" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -15690,7 +15692,7 @@
                             <node concept="3A2sRY" id="3Z1xyIwbNFI" role="2Oq$k0">
                               <ref role="3A2yKK" node="3Z1xyIwbNGE" resolve="op" />
                             </node>
-                            <node concept="2qgKlT" id="3Z1xyIwbNFJ" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og5V" role="2OqNvi">
                               <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                             </node>
                           </node>
@@ -15869,7 +15871,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwboGX" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwboHJ" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwboGY" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og5X" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -15938,7 +15940,7 @@
                             <node concept="3A2sRY" id="3Z1xyIwbLP2" role="2Oq$k0">
                               <ref role="3A2yKK" node="3Z1xyIwboHJ" resolve="op" />
                             </node>
-                            <node concept="2qgKlT" id="3Z1xyIwbLP3" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og5Z" role="2OqNvi">
                               <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                             </node>
                           </node>
@@ -16117,7 +16119,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwd_p7" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwbg0Q" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwd_p8" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og61" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -16265,7 +16267,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwbAYc" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwbAYI" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwbAYd" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og63" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -16474,7 +16476,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwo$yI" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwo$z0" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwo$yJ" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og65" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -16692,7 +16694,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoAhw" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoAhM" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoAhx" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og67" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -16887,7 +16889,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoBWS" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoBXi" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoBWT" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og69" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -16963,7 +16965,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwjcOH" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwjb47" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwjcOI" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6b" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -17049,7 +17051,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwjdio" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwjbz3" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwjdip" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6d" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -17135,7 +17137,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwjdoV" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwjdpk" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwjdoW" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6f" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -17221,7 +17223,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwjdJT" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwjdKi" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwjdJU" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6h" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -17307,7 +17309,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwjdKt" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwjdKQ" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwjdKu" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6j" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -17486,7 +17488,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwmWsN" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwmUAG" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwmWsO" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6l" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -17651,7 +17653,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwn8sR" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwn8tg" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwn8sS" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6n" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -17864,7 +17866,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwn9i7" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwmAaq" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwn9i8" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6p" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -18051,7 +18053,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwnaab" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwnaa$" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwnaac" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6r" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -18217,7 +18219,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwnb9m" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwnb9J" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwnb9n" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6t" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -18376,7 +18378,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwndxX" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwndyg" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwndxY" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6v" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -18561,7 +18563,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwngoG" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwngp8" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwngoH" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6x" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -18743,7 +18745,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwni0Q" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwni1i" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwni0R" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6z" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -18899,7 +18901,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwnjOX" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwnjPf" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwnjOY" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6_" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -19062,7 +19064,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwnlla" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwnlls" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwnllb" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6B" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -19224,7 +19226,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwnnzs" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwnnzI" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwnnzt" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6D" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -19456,7 +19458,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwnrdd" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwnrdv" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwnrde" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6F" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -19656,7 +19658,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwnw2L" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwnw35" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwnw2M" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6H" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -19826,7 +19828,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwnyxn" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwnyxD" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwnyxo" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6J" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -19992,7 +19994,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwn$Yr" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwn$YH" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwn$Ys" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6L" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -20074,7 +20076,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoSzo" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoSz4" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoSzp" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6N" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -20202,7 +20204,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoSOW" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoSPt" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoSOX" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6P" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -20624,7 +20626,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoKBB" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoKC6" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoKBC" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6R" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -20766,7 +20768,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoNId" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoNII" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoNIe" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6T" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -20959,7 +20961,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoPuh" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoPv2" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoPui" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6V" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -21248,7 +21250,7 @@
                         <node concept="3A2sRY" id="3Z1xyIworIX" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIworJm" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIworIY" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6X" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -21441,7 +21443,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoFCL" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoDHP" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoFCM" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og6Z" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -21620,7 +21622,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoGl9" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoGlV" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoGla" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og71" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -21757,7 +21759,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoHsA" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoHtd" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoHsB" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og73" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -21904,7 +21906,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoLO5" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoLOG" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoLO6" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og75" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -22175,7 +22177,7 @@
                         <node concept="3A2sRY" id="3Z1xyIworZv" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIworZI" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIworZw" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og77" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -22412,7 +22414,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoyAf" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoyAx" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoyAg" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og79" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -22626,7 +22628,7 @@
                         <node concept="3A2sRY" id="3Z1xyIwoyYl" role="2Oq$k0">
                           <ref role="3A2yKK" node="3Z1xyIwoyYB" resolve="op" />
                         </node>
-                        <node concept="2qgKlT" id="3Z1xyIwoyYm" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og7b" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
index ad4a379d..b0a36386 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -68,7 +68,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
index c3fcb844..dd97ca41 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
@@ -16,7 +16,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -77,6 +77,7 @@
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
index 4652cbf9..ca283a9d 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -70,7 +70,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/models/jetbrains.mps.baseLanguage.kotlinRefsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/models/jetbrains.mps.baseLanguage.kotlinRefsExt.types.mps
index 5b994876..f1d28afe 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/models/jetbrains.mps.baseLanguage.kotlinRefsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/models/jetbrains.mps.baseLanguage.kotlinRefsExt.types.mps
@@ -22,6 +22,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -194,7 +197,6 @@
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
         <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
       </concept>
@@ -828,7 +830,7 @@
                   <ref role="3Tt5mk" to="48vp:1t03WazhIic" resolve="constructor" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="7doxVE4TbhY" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og7d" role="2OqNvi">
                 <ref role="37wK5l" to="hez:7WpE6U5evQG" resolve="getConstructedClass" />
               </node>
             </node>
@@ -960,7 +962,7 @@
                   <node concept="3A2sRY" id="7doxVE4TmqI" role="2Oq$k0">
                     <ref role="3A2yKK" node="7doxVE4TkDA" resolve="fcall" />
                   </node>
-                  <node concept="2qgKlT" id="7doxVE4TmqJ" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og7f" role="2OqNvi">
                     <ref role="37wK5l" to="w8y0:UG7NftRxKM" resolve="getReceiver" />
                   </node>
                 </node>
@@ -991,7 +993,7 @@
                   <node concept="3A2sRY" id="1aCOVadpOOL" role="2Oq$k0">
                     <ref role="3A2yKK" node="7doxVE4TkDA" resolve="fcall" />
                   </node>
-                  <node concept="2qgKlT" id="1aCOVadpMFa" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og7h" role="2OqNvi">
                     <ref role="37wK5l" to="w8y0:UG7NftRy8a" resolve="getFunctionReturnType" />
                   </node>
                 </node>
@@ -1109,7 +1111,7 @@
                         <node concept="3A2sRY" id="1aCOVadrrfv" role="2Oq$k0">
                           <ref role="3A2yKK" node="7doxVE4TkDA" resolve="fcall" />
                         </node>
-                        <node concept="2qgKlT" id="1aCOVadrpKh" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og7j" role="2OqNvi">
                           <ref role="37wK5l" to="w8y0:1t03WaySlJT" resolve="getFunctionTypeParameters" />
                         </node>
                       </node>
@@ -1336,7 +1338,7 @@
                 <node concept="3j8tct" id="1aCOVadiSHl" role="2Oq$k0">
                   <ref role="3j8tcu" node="1aCOVadieIf" resolve="fcall" />
                 </node>
-                <node concept="2qgKlT" id="1aCOVadiSHm" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og7l" role="2OqNvi">
                   <ref role="37wK5l" to="w8y0:1t03WaySlJT" resolve="getFunctionTypeParameters" />
                 </node>
               </node>
@@ -1910,7 +1912,7 @@
                   <node concept="3j8tct" id="1aCOVadjG28" role="2Oq$k0">
                     <ref role="3j8tcu" node="1aCOVadieIf" resolve="fcall" />
                   </node>
-                  <node concept="2qgKlT" id="UG7NftQqjI" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og7n" role="2OqNvi">
                     <ref role="37wK5l" to="w8y0:UG7NftR_2Q" resolve="getFunctionParameters" />
                   </node>
                 </node>
@@ -2047,7 +2049,7 @@
               <node concept="3j8tct" id="1aCOVadjTPp" role="2Oq$k0">
                 <ref role="3j8tcu" node="1aCOVadieIf" resolve="fcall" />
               </node>
-              <node concept="2qgKlT" id="UG7NftQFED" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og7p" role="2OqNvi">
                 <ref role="37wK5l" to="w8y0:UG7NftRy8a" resolve="getFunctionReturnType" />
               </node>
             </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
index 1dd2a89f..ba244c1e 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -72,7 +72,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
index 9e171e2a..36d960e4 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
@@ -14,6 +14,9 @@
     <import index="fa4b" ref="r:57e7708d-cfea-4f42-80e2-39fcd20eebc8(jetbrains.mps.baseLanguage.function.types)" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -137,7 +140,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -389,9 +391,9 @@
               <node concept="35c_gC" id="7Ift4Hg3jdC" role="2Oq$k0">
                 <ref role="35c_gD" to="tpee:g7pOWCK" resolve="Classifier" />
               </node>
-              <node concept="2qgKlT" id="L_Hr3kExKk" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og8R" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:5mDmeD1aaq0" resolve="getContextClassifier" />
-                <node concept="3A2sRY" id="6ZRhjsG9qB3" role="37wK5m">
+                <node concept="3A2sRY" id="M_dau6Og8T" role="37wK5m">
                   <ref role="3A2yKK" node="6ZRhjsG9oAt" resolve="mrse" />
                 </node>
               </node>
@@ -420,7 +422,7 @@
                           <ref role="3cqZAo" node="4cxv$9$mkQL" resolve="contextClassifier" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="6ZRhjsG9Ao4" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og8U" role="2OqNvi">
                         <ref role="37wK5l" to="tpek:i3H_lLu" resolve="getSuperclass" />
                       </node>
                     </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
index ccda4eac..76bc5a81 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -67,7 +67,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
index e3f76fa6..6c8ab626 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -71,7 +71,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
index 32d0ba1b..4aef2d23 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
@@ -24,6 +24,9 @@
         <child id="1238853845806" name="component" index="1Lso8e" />
       </concept>
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -191,7 +194,6 @@
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -1049,7 +1051,7 @@
                       <ref role="3Tt5mk" to="cx9y:i1LF_YG" resolve="index" />
                     </node>
                   </node>
-                  <node concept="2qgKlT" id="4E290qPZw3T" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og2X" role="2OqNvi">
                     <ref role="37wK5l" to="tpek:i1LOPRp" resolve="isCompileTimeConstant" />
                   </node>
                 </node>
@@ -1071,18 +1073,18 @@
                             <ref role="3Tt5mk" to="cx9y:i1LF_YG" resolve="index" />
                           </node>
                         </node>
-                        <node concept="2qgKlT" id="4E290qPZAvx" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og2Z" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:i1LP2xI" resolve="getCompileTimeConstantValue" />
-                          <node concept="2OqwBi" id="4E290qPZAP4" role="37wK5m">
-                            <node concept="liA8E" id="4E290qPZB3I" role="2OqNvi">
+                          <node concept="2OqwBi" id="M_dau6Og31" role="37wK5m">
+                            <node concept="liA8E" id="M_dau6Og32" role="2OqNvi">
                               <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
                             </node>
-                            <node concept="2JrnkZ" id="4E290qPZAPd" role="2Oq$k0">
-                              <node concept="2OqwBi" id="4E290qPZA_b" role="2JrQYb">
-                                <node concept="3A2sRY" id="4E290qPZAwR" role="2Oq$k0">
+                            <node concept="2JrnkZ" id="M_dau6Og33" role="2Oq$k0">
+                              <node concept="2OqwBi" id="M_dau6Og34" role="2JrQYb">
+                                <node concept="3A2sRY" id="M_dau6Og35" role="2Oq$k0">
                                   <ref role="3A2yKK" node="4E290qPYXzR" resolve="tupAcc" />
                                 </node>
-                                <node concept="I4A8Y" id="4E290qPZACu" role="2OqNvi" />
+                                <node concept="I4A8Y" id="M_dau6Og36" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
index 8ae64b96..77677038 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -68,7 +68,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
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 5047b6ea..af0538f5 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:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps
index ea8299fd..3e8254c8 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps
@@ -15,6 +15,9 @@
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
@@ -140,7 +143,6 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -563,7 +565,7 @@
                           <node concept="2Rxl7S" id="4s_lMmH640m" role="2OqNvi" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="4s_lMmHg6sS" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og7v" role="2OqNvi">
                         <ref role="37wK5l" to="x5bw:34$A1Mf3_WJ" resolve="handlerClosure" />
                       </node>
                     </node>
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 7d0a7053..8f2e95fd 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
@@ -8,7 +8,7 @@
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
     <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="5" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -47,6 +47,9 @@
         <child id="1238857834412" name="index" index="1LF_Uc" />
       </concept>
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -324,33 +327,27 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="2546654756694997551" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTag" flags="ng" index="92FcH">
-        <child id="2546654756694997556" name="reference" index="92FcQ" />
-        <child id="3106559687488913694" name="line" index="2XjZqd" />
-      </concept>
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      <concept id="6971016359099800069" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldSingleCommentLine" flags="ngI" index="2JaDLO">
+        <child id="6971016359099801474" name="commentBody" index="2JaDBN" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="2217234381367049075" name="jetbrains.mps.baseLanguage.javadoc.structure.CodeInlineDocTag" flags="ng" index="VVOAv">
-        <child id="3106559687488741665" name="line" index="2Xj1qM" />
-      </concept>
       <concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
         <reference id="2217234381367530213" name="classifier" index="VXe09" />
       </concept>
       <concept id="2217234381367530195" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocReference" flags="ng" index="VXe0Z">
         <reference id="2217234381367530196" name="methodDeclaration" index="VXe0S" />
       </concept>
-      <concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
-        <child id="6962838954693749192" name="tag" index="qph3F" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
+      <concept id="5085607816306582224" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentTextElement" flags="ng" index="1Vtdud">
+        <child id="5085607816306582225" name="tag" index="1Vtduc" />
+      </concept>
+      <concept id="5085607816306633585" name="jetbrains.mps.baseLanguage.javadoc.structure.CodeInlineDocTagTE" flags="ng" index="1VuTSG" />
+      <concept id="5085607816306647746" name="jetbrains.mps.baseLanguage.javadoc.structure.LinkInlineDocTagTE" flags="ng" index="1VuXuv">
+        <child id="5085607816306647747" name="reference" index="1VuXuu" />
+      </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
@@ -432,7 +429,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
@@ -2887,7 +2883,7 @@
                         <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
                         <node concept="37jhX" id="4xoHD1GtkGt" role="3AunhB">
                           <node concept="2OqwBi" id="4xoHD1GtkGv" role="37jj2">
-                            <node concept="2qgKlT" id="4xoHD1GtM3b" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og7x" role="2OqNvi">
                               <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                             </node>
                             <node concept="3A2sRY" id="4xoHD1Gz5aD" role="2Oq$k0">
@@ -3367,7 +3363,7 @@
                                       <ref role="3cqZAo" node="6E5fMGvfKPs" resolve="it" />
                                     </node>
                                   </node>
-                                  <node concept="2qgKlT" id="5ygLqKOKnnE" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og7z" role="2OqNvi">
                                     <ref role="37wK5l" to="tpek:59G_UM6ah0X" resolve="getAllSuperClassifiers" />
                                   </node>
                                 </node>
@@ -3785,7 +3781,7 @@
                 <property role="3TUv4t" value="true" />
                 <node concept="3Tqbb2" id="53tmmMsz1bN" role="1tU5fm" />
                 <node concept="2OqwBi" id="53tmmMsyZ5U" role="33vP2m">
-                  <node concept="2qgKlT" id="53tmmMsz024" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og7_" role="2OqNvi">
                     <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                   </node>
                   <node concept="1PxgMI" id="53tmmMszzhO" role="2Oq$k0">
@@ -4128,7 +4124,7 @@
                   <node concept="3fqX7Q" id="6zber0NPg0L" role="3uHU7w">
                     <node concept="1eOMI4" id="6zber0NPg0M" role="3fr31v">
                       <node concept="2OqwBi" id="6zber0NPg0S" role="1eOMHV">
-                        <node concept="2qgKlT" id="32iFMN79ped" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og7B" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:6r77ob2USS8" resolve="isStatic" />
                         </node>
                         <node concept="1PxgMI" id="32iFMN79oKP" role="2Oq$k0">
@@ -4935,7 +4931,7 @@
             <node concept="3A2sRY" id="2Pch256gLLJ" role="2Oq$k0">
               <ref role="3A2yKK" node="4xoHD1GpWgY" resolve="cc" />
             </node>
-            <node concept="2qgKlT" id="2Pch256gMRi" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og7D" role="2OqNvi">
               <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
             </node>
           </node>
@@ -5091,7 +5087,7 @@
                 <ref role="3cqZAo" node="3hZrJU5Y0Xc" resolve="isNested" />
               </node>
               <node concept="2OqwBi" id="3hZrJU5Y0X_" role="3K4E3e">
-                <node concept="2qgKlT" id="3hZrJU5Y0XA" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og7F" role="2OqNvi">
                   <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                 </node>
                 <node concept="37vLTw" id="3hZrJU5Y7aS" role="2Oq$k0">
@@ -5958,7 +5954,7 @@
             <node concept="3A2sRY" id="7doxVE4OsmR" role="2Oq$k0">
               <ref role="3A2yKK" node="4cyIOXugLCO" resolve="mcall" />
             </node>
-            <node concept="2qgKlT" id="7doxVE4OtZy" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og7H" role="2OqNvi">
               <ref role="37wK5l" to="tpek:4cxv$9$kw67" resolve="isInTypeInferenceContext" />
             </node>
           </node>
@@ -8671,7 +8667,7 @@
                                     <node concept="37vLTw" id="4lgunKfZtI2" role="2Oq$k0">
                                       <ref role="3cqZAo" node="4lgunKfZmNJ" resolve="meth" />
                                     </node>
-                                    <node concept="2qgKlT" id="4lgunKfZu2U" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og7J" role="2OqNvi">
                                       <ref role="37wK5l" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
                                     </node>
                                   </node>
@@ -8852,7 +8848,7 @@
                                 <node concept="37vLTw" id="4lgunKg9epQ" role="2Oq$k0">
                                   <ref role="3cqZAo" node="4lgunKg97p1" resolve="meth" />
                                 </node>
-                                <node concept="2qgKlT" id="4lgunKg9eMF" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og7L" role="2OqNvi">
                                   <ref role="37wK5l" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
                                 </node>
                               </node>
@@ -8903,7 +8899,7 @@
                 <node concept="37vLTw" id="4lgunKg99_9" role="2Oq$k0">
                   <ref role="3cqZAo" node="4lgunKg97p1" resolve="meth" />
                 </node>
-                <node concept="2qgKlT" id="4lgunKg99Y6" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og7N" role="2OqNvi">
                   <ref role="37wK5l" to="tpek:i2fhS7A" resolve="getLastStatement" />
                 </node>
               </node>
@@ -9061,7 +9057,7 @@
               <node concept="3A2sRY" id="4$mmEcR1rT5" role="2Oq$k0">
                 <ref role="3A2yKK" node="zb1Nk7a71U" resolve="bmd" />
               </node>
-              <node concept="2qgKlT" id="4$mmEcR1rT6" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og7P" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:i2fhS7A" resolve="getLastStatement" />
               </node>
             </node>
@@ -12410,7 +12406,7 @@
                     <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
                     <node concept="37jhX" id="C1f6iF6Caz" role="3AunhB">
                       <node concept="2OqwBi" id="C1f6iF6Ca$" role="37jj2">
-                        <node concept="2qgKlT" id="C1f6iF6CaA" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og7R" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                         <node concept="3A2sRY" id="C1f6iF6D9m" role="2Oq$k0">
@@ -12487,7 +12483,7 @@
                         <node concept="3A2sRY" id="C1f6iF6E_s" role="2Oq$k0">
                           <ref role="3A2yKK" node="C1f6iF6Eby" resolve="to" />
                         </node>
-                        <node concept="2qgKlT" id="C1f6iF6EyB" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og7T" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -30919,9 +30915,36 @@
     </node>
     <node concept="2tJIrI" id="6EY0p2w8VX3" role="jymVt" />
     <node concept="3UR2Jj" id="6EY0p2wsoRL" role="lGtFl">
-      <node concept="TZ5HA" id="6EY0p2wsoRM" role="TZ5H$">
-        <node concept="1dT_AC" id="6EY0p2wsoRN" role="1dT_Ay">
-          <property role="1dT_AB" value="A hierarchical substitution context binding declared type variables to logicals." />
+      <node concept="1PaTwC" id="M_dau6OgH1" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgH2" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgH3" role="1PaTwD">
+          <property role="3oM_SC" value="hierarchical" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgH4" role="1PaTwD">
+          <property role="3oM_SC" value="substitution" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgH5" role="1PaTwD">
+          <property role="3oM_SC" value="context" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgH6" role="1PaTwD">
+          <property role="3oM_SC" value="binding" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgH7" role="1PaTwD">
+          <property role="3oM_SC" value="declared" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgH8" role="1PaTwD">
+          <property role="3oM_SC" value="type" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgH9" role="1PaTwD">
+          <property role="3oM_SC" value="variables" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgHa" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgHb" role="1PaTwD">
+          <property role="3oM_SC" value="logicals." />
         </node>
       </node>
     </node>
@@ -35424,9 +35447,21 @@
       </node>
       <node concept="3Tm1VV" id="3bgqfmmxef1" role="1B3o_S" />
       <node concept="P$JXv" id="7AMUQZVAYm2" role="lGtFl">
-        <node concept="TZ5HA" id="7AMUQZVAYm3" role="TZ5H$">
-          <node concept="1dT_AC" id="7AMUQZVAYm4" role="1dT_Ay">
-            <property role="1dT_AB" value="Extract the contents of ListNode." />
+        <node concept="1PaTwC" id="M_dau6OgLp" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgLq" role="1PaTwD">
+            <property role="3oM_SC" value="Extract" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLr" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLs" role="1PaTwD">
+            <property role="3oM_SC" value="contents" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLt" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLu" role="1PaTwD">
+            <property role="3oM_SC" value="ListNode." />
           </node>
         </node>
       </node>
@@ -38891,7 +38926,7 @@
                       <node concept="37vLTw" id="53tmmMtcY4B" role="2Oq$k0">
                         <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
                       </node>
-                      <node concept="2qgKlT" id="53tmmMtcZEr" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og7V" role="2OqNvi">
                         <ref role="37wK5l" to="tpek:6r77ob2USS8" resolve="isStatic" />
                       </node>
                     </node>
@@ -39210,7 +39245,7 @@
                             <node concept="3A2sRY" id="5HVB6JRfhJr" role="2Oq$k0">
                               <ref role="3A2yKK" node="29sKO70xfxm" resolve="cls" />
                             </node>
-                            <node concept="2qgKlT" id="5HVB6JRfhJs" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og7X" role="2OqNvi">
                               <ref role="37wK5l" to="tpek:2RtWPFZ12w7" resolve="getThisType" />
                             </node>
                           </node>
@@ -41479,15 +41514,15 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="2qgKlT" id="1bodCZ_di2c" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og7Z" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:6dL7A1DpKo1" resolve="isDescendant" />
-                          <node concept="1PxgMI" id="1bodCZ_diuW" role="37wK5m">
+                          <node concept="1PxgMI" id="M_dau6Og81" role="37wK5m">
                             <property role="1BlNFB" value="true" />
-                            <node concept="chp4Y" id="1bodCZ_dizk" role="3oSUPX">
+                            <node concept="chp4Y" id="M_dau6Og82" role="3oSUPX">
                               <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
                             </node>
-                            <node concept="1Ft4W6" id="1bodCZ_didN" role="1m5AlR">
-                              <node concept="a7P8L" id="1bodCZ_didM" role="1FtiSR">
+                            <node concept="1Ft4W6" id="M_dau6Og83" role="1m5AlR">
+                              <node concept="a7P8L" id="M_dau6Og84" role="1FtiSR">
                                 <ref role="a7OzE" node="1bodCZ_deBo" resolve="BCls" />
                               </node>
                             </node>
@@ -41506,15 +41541,15 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="2qgKlT" id="1bodCZ_djAL" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og85" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:6dL7A1DpKo1" resolve="isDescendant" />
-                          <node concept="1PxgMI" id="1bodCZ_djAM" role="37wK5m">
+                          <node concept="1PxgMI" id="M_dau6Og87" role="37wK5m">
                             <property role="1BlNFB" value="true" />
-                            <node concept="chp4Y" id="1bodCZ_djAN" role="3oSUPX">
+                            <node concept="chp4Y" id="M_dau6Og88" role="3oSUPX">
                               <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
                             </node>
-                            <node concept="1Ft4W6" id="1bodCZ_djAO" role="1m5AlR">
-                              <node concept="a7P8L" id="1bodCZ_djKC" role="1FtiSR">
+                            <node concept="1Ft4W6" id="M_dau6Og89" role="1m5AlR">
+                              <node concept="a7P8L" id="M_dau6Og8a" role="1FtiSR">
                                 <ref role="a7OzE" node="1bodCZ_deAE" resolve="ACls" />
                               </node>
                             </node>
@@ -42104,7 +42139,7 @@
                 <node concept="37vLTw" id="53tmmMthGJy" role="2Oq$k0">
                   <ref role="3cqZAo" node="6EK6UBPpaQ$" resolve="ecls" />
                 </node>
-                <node concept="2qgKlT" id="53tmmMthFOX" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Og8b" role="2OqNvi">
                   <ref role="37wK5l" to="tpek:6r77ob2USS8" resolve="isStatic" />
                 </node>
               </node>
@@ -44634,7 +44669,7 @@
                   <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="44MBIFN6_tY" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og8d" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
               </node>
             </node>
@@ -45218,7 +45253,7 @@
                     </node>
                   </node>
                   <node concept="2OqwBi" id="53tmmMsbfen" role="3uHU7w">
-                    <node concept="2qgKlT" id="53tmmMsbfeo" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og8f" role="2OqNvi">
                       <ref role="37wK5l" to="tpek:6r77ob2USS8" resolve="isStatic" />
                     </node>
                     <node concept="1PxgMI" id="53tmmMsbfep" role="2Oq$k0">
@@ -47022,9 +47057,9 @@
                   <node concept="35c_gC" id="7Ift4Hg3jdA" role="2Oq$k0">
                     <ref role="35c_gD" to="tpee:g7pOWCK" resolve="Classifier" />
                   </node>
-                  <node concept="2qgKlT" id="L_Hr3kExJ0" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og8h" role="2OqNvi">
                     <ref role="37wK5l" to="tpek:5mDmeD1aaq0" resolve="getContextClassifier" />
-                    <node concept="3A2sRY" id="7uKpZGliVLK" role="37wK5m">
+                    <node concept="3A2sRY" id="M_dau6Og8j" role="37wK5m">
                       <ref role="3A2yKK" node="7gr_romnvxW" resolve="vref" />
                     </node>
                   </node>
@@ -47354,7 +47389,7 @@
                                     <node concept="37vLTw" id="7uKpZGlth5m" role="2Oq$k0">
                                       <ref role="3cqZAo" node="wfLGLyj6Tr" resolve="ctxCls" />
                                     </node>
-                                    <node concept="2qgKlT" id="7uKpZGlthV2" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og8k" role="2OqNvi">
                                       <ref role="37wK5l" to="tpek:2xreLMO8jma" resolve="getAllExtendedClassifiers" />
                                     </node>
                                   </node>
@@ -47629,9 +47664,9 @@
               <node concept="35c_gC" id="7uKpZGlErl0" role="2Oq$k0">
                 <ref role="35c_gD" to="tpee:g7pOWCK" resolve="Classifier" />
               </node>
-              <node concept="2qgKlT" id="7uKpZGlErl1" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og8m" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:5mDmeD1aaq0" resolve="getContextClassifier" />
-                <node concept="3A2sRY" id="7uKpZGlErl2" role="37wK5m">
+                <node concept="3A2sRY" id="M_dau6Og8o" role="37wK5m">
                   <ref role="3A2yKK" node="7uKpZGlErnU" resolve="pref" />
                 </node>
               </node>
@@ -47853,7 +47888,7 @@
                                 <node concept="37vLTw" id="7uKpZGlErms" role="2Oq$k0">
                                   <ref role="3cqZAo" node="7uKpZGlErkY" resolve="ctxCls" />
                                 </node>
-                                <node concept="2qgKlT" id="7uKpZGlErmt" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Og8p" role="2OqNvi">
                                   <ref role="37wK5l" to="tpek:2xreLMO8jma" resolve="getAllExtendedClassifiers" />
                                 </node>
                               </node>
@@ -48259,7 +48294,7 @@
                         <node concept="3A2sRY" id="12QmIo_cCGb" role="2Oq$k0">
                           <ref role="3A2yKK" node="12QmIo_cAc2" resolve="fro" />
                         </node>
-                        <node concept="2qgKlT" id="12QmIo_cCGc" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og8r" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -49006,74 +49041,242 @@
       </node>
       <node concept="3Tm1VV" id="74XSvyw4Fuf" role="1B3o_S" />
       <node concept="3UR2Jj" id="74XSvyw4GKr" role="lGtFl">
-        <node concept="TZ5HA" id="74XSvyw4GKs" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4GKt" role="1dT_Ay">
-            <property role="1dT_AB" value="Represents a vertex in a hierarchy graph. " />
+        <node concept="1PaTwC" id="M_dau6OgHc" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgHd" role="1PaTwD">
+            <property role="3oM_SC" value="Represents" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHe" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHf" role="1PaTwD">
+            <property role="3oM_SC" value="vertex" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHg" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHh" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHi" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHj" role="1PaTwD">
+            <property role="3oM_SC" value="graph." />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4GYn" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4GYo" role="1dT_Ay">
-            <property role="1dT_AB" value="Underlying data is a collection of all paths " />
+        <node concept="1PaTwC" id="M_dau6OgHk" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgHl" role="1PaTwD">
+            <property role="3oM_SC" value="Underlying" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHm" role="1PaTwD">
+            <property role="3oM_SC" value="data" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHn" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHo" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHp" role="1PaTwD">
+            <property role="3oM_SC" value="collection" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHq" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHr" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHs" role="1PaTwD">
+            <property role="3oM_SC" value="paths" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvywaLiS" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvywaLiT" role="1dT_Ay">
-            <property role="1dT_AB" value="starting from the original node in the hierarchy," />
+        <node concept="1PaTwC" id="M_dau6OgHt" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgHu" role="1PaTwD">
+            <property role="3oM_SC" value="starting" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHv" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHw" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHx" role="1PaTwD">
+            <property role="3oM_SC" value="original" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHy" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHz" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgH$" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgH_" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy," />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4HWV" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4HWW" role="1dT_Ay">
-            <property role="1dT_AB" value="and going up all the way to the root. " />
+        <node concept="1PaTwC" id="M_dau6OgHA" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgHB" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHC" role="1PaTwD">
+            <property role="3oM_SC" value="going" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHD" role="1PaTwD">
+            <property role="3oM_SC" value="up" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHE" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHF" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHG" role="1PaTwD">
+            <property role="3oM_SC" value="way" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHH" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHI" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHJ" role="1PaTwD">
+            <property role="3oM_SC" value="root." />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4I8T" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4I8U" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgHK" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgHL" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4I93" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4I94" role="1dT_Ay">
-            <property role="1dT_AB" value="Example. With original hierarchy looking like the following:" />
+        <node concept="1PaTwC" id="M_dau6OgHM" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgHN" role="1PaTwD">
+            <property role="3oM_SC" value="Example." />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHO" role="1PaTwD">
+            <property role="3oM_SC" value="With" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHP" role="1PaTwD">
+            <property role="3oM_SC" value="original" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHQ" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHR" role="1PaTwD">
+            <property role="3oM_SC" value="looking" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHS" role="1PaTwD">
+            <property role="3oM_SC" value="like" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHT" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHU" role="1PaTwD">
+            <property role="3oM_SC" value="following:" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4Iy_" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4IyA" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgHV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgHW" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4IyN" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4IyO" role="1dT_Ay">
-            <property role="1dT_AB" value="D -&gt; B -&gt; A -&gt; Root" />
+        <node concept="1PaTwC" id="M_dau6OgHX" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgHY" role="1PaTwD">
+            <property role="3oM_SC" value="D" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgHZ" role="1PaTwD">
+            <property role="3oM_SC" value="-&gt;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI0" role="1PaTwD">
+            <property role="3oM_SC" value="B" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI1" role="1PaTwD">
+            <property role="3oM_SC" value="-&gt;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI2" role="1PaTwD">
+            <property role="3oM_SC" value="A" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI3" role="1PaTwD">
+            <property role="3oM_SC" value="-&gt;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI4" role="1PaTwD">
+            <property role="3oM_SC" value="Root" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4IIT" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4IIU" role="1dT_Ay">
-            <property role="1dT_AB" value=" \-&gt; C -&gt; Root" />
+        <node concept="1PaTwC" id="M_dau6OgI5" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgI6" role="1PaTwD">
+            <property role="3oM_SC" value="" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI7" role="1PaTwD">
+            <property role="3oM_SC" value="\-&gt;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI8" role="1PaTwD">
+            <property role="3oM_SC" value="C" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI9" role="1PaTwD">
+            <property role="3oM_SC" value="-&gt;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIa" role="1PaTwD">
+            <property role="3oM_SC" value="Root" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4IKR" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4IKS" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgIb" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgIc" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4ILb" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4ILc" role="1dT_Ay">
-            <property role="1dT_AB" value="-- the graph vertex for node D would have this data:" />
+        <node concept="1PaTwC" id="M_dau6OgId" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgIe" role="1PaTwD">
+            <property role="3oM_SC" value="--" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIf" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIg" role="1PaTwD">
+            <property role="3oM_SC" value="graph" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIh" role="1PaTwD">
+            <property role="3oM_SC" value="vertex" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIi" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIj" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIk" role="1PaTwD">
+            <property role="3oM_SC" value="D" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIl" role="1PaTwD">
+            <property role="3oM_SC" value="would" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIm" role="1PaTwD">
+            <property role="3oM_SC" value="have" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIn" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIo" role="1PaTwD">
+            <property role="3oM_SC" value="data:" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4J7v" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4J7w" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgIp" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgIq" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4Jhb" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4Jhc" role="1dT_Ay">
-            <property role="1dT_AB" value="[[D,B,A,Root], [D,C,Root]]" />
+        <node concept="1PaTwC" id="M_dau6OgIr" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgIs" role="1PaTwD">
+            <property role="3oM_SC" value="[[D,B,A,Root]," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIt" role="1PaTwD">
+            <property role="3oM_SC" value="[D,C,Root]]" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvyw4J9X" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvyw4J9Y" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgIu" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgIv" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -49236,9 +49439,42 @@
           </node>
         </node>
         <node concept="P$JXv" id="3bgqfmm_eCr" role="lGtFl">
-          <node concept="TZ5HA" id="3bgqfmm_h_n" role="TZ5H$">
-            <node concept="1dT_AC" id="3bgqfmm_h_o" role="1dT_Ay">
-              <property role="1dT_AB" value="Supposed to be called from the template with the instantiated term path." />
+          <node concept="1PaTwC" id="M_dau6OgLv" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgLw" role="1PaTwD">
+              <property role="3oM_SC" value="Supposed" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLx" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLy" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLz" role="1PaTwD">
+              <property role="3oM_SC" value="called" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgL$" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgL_" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLA" role="1PaTwD">
+              <property role="3oM_SC" value="template" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLB" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLC" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLD" role="1PaTwD">
+              <property role="3oM_SC" value="instantiated" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLE" role="1PaTwD">
+              <property role="3oM_SC" value="term" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgLF" role="1PaTwD">
+              <property role="3oM_SC" value="path." />
             </node>
           </node>
         </node>
@@ -49271,19 +49507,94 @@
         <property role="TrG5h" value="T" />
       </node>
       <node concept="3UR2Jj" id="5OjpQKwjvP1" role="lGtFl">
-        <node concept="TZ5HA" id="5OjpQKwjvP2" role="TZ5H$">
-          <node concept="1dT_AC" id="5OjpQKwjvP3" role="1dT_Ay">
-            <property role="1dT_AB" value="Abstraction for a collection of instantiated paths in the hierarchy. " />
+        <node concept="1PaTwC" id="M_dau6OgIw" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgIx" role="1PaTwD">
+            <property role="3oM_SC" value="Abstraction" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIy" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIz" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI$" role="1PaTwD">
+            <property role="3oM_SC" value="collection" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgI_" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIA" role="1PaTwD">
+            <property role="3oM_SC" value="instantiated" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIB" role="1PaTwD">
+            <property role="3oM_SC" value="paths" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIC" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgID" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIE" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy." />
           </node>
         </node>
-        <node concept="TZ5HA" id="5OjpQKwjwBT" role="TZ5H$">
-          <node concept="1dT_AC" id="5OjpQKwjwBU" role="1dT_Ay">
-            <property role="1dT_AB" value="Need not correspond to a specific node in the hierarchy, " />
+        <node concept="1PaTwC" id="M_dau6OgIF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgIG" role="1PaTwD">
+            <property role="3oM_SC" value="Need" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIH" role="1PaTwD">
+            <property role="3oM_SC" value="not" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgII" role="1PaTwD">
+            <property role="3oM_SC" value="correspond" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIJ" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIK" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIL" role="1PaTwD">
+            <property role="3oM_SC" value="specific" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIM" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIN" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIO" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIP" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy," />
           </node>
         </node>
-        <node concept="TZ5HA" id="5OjpQKwjwTR" role="TZ5H$">
-          <node concept="1dT_AC" id="5OjpQKwjwTS" role="1dT_Ay">
-            <property role="1dT_AB" value="may indicate a result of finding the LUB. " />
+        <node concept="1PaTwC" id="M_dau6OgIQ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgIR" role="1PaTwD">
+            <property role="3oM_SC" value="may" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIS" role="1PaTwD">
+            <property role="3oM_SC" value="indicate" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIT" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIU" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIV" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIW" role="1PaTwD">
+            <property role="3oM_SC" value="finding" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIX" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgIY" role="1PaTwD">
+            <property role="3oM_SC" value="LUB." />
           </node>
         </node>
       </node>
@@ -49366,19 +49677,73 @@
         <property role="TrG5h" value="T" />
       </node>
       <node concept="3UR2Jj" id="74XSvywaJV8" role="lGtFl">
-        <node concept="TZ5HA" id="74XSvywaJV9" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvywaJVa" role="1dT_Ay">
-            <property role="1dT_AB" value="Represents an &quot;instantiated&quot; vertex in a hierarchy graph. " />
+        <node concept="1PaTwC" id="M_dau6OgIZ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgJ0" role="1PaTwD">
+            <property role="3oM_SC" value="Represents" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ1" role="1PaTwD">
+            <property role="3oM_SC" value="an" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ2" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;instantiated&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ3" role="1PaTwD">
+            <property role="3oM_SC" value="vertex" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ4" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ5" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ6" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ7" role="1PaTwD">
+            <property role="3oM_SC" value="graph." />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvywaKhU" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvywaKhV" role="1dT_Ay">
-            <property role="1dT_AB" value="Namely, instantiated are the terms corresponding to every " />
+        <node concept="1PaTwC" id="M_dau6OgJ8" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgJ9" role="1PaTwD">
+            <property role="3oM_SC" value="Namely," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJa" role="1PaTwD">
+            <property role="3oM_SC" value="instantiated" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJb" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJc" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJd" role="1PaTwD">
+            <property role="3oM_SC" value="terms" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJe" role="1PaTwD">
+            <property role="3oM_SC" value="corresponding" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJf" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJg" role="1PaTwD">
+            <property role="3oM_SC" value="every" />
           </node>
         </node>
-        <node concept="TZ5HA" id="74XSvywaK$C" role="TZ5H$">
-          <node concept="1dT_AC" id="74XSvywaK$D" role="1dT_Ay">
-            <property role="1dT_AB" value="origin in the prototype vertex. " />
+        <node concept="1PaTwC" id="M_dau6OgJh" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgJi" role="1PaTwD">
+            <property role="3oM_SC" value="origin" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJj" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJk" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJl" role="1PaTwD">
+            <property role="3oM_SC" value="prototype" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJm" role="1PaTwD">
+            <property role="3oM_SC" value="vertex." />
           </node>
         </node>
       </node>
@@ -49591,9 +49956,33 @@
         </node>
       </node>
       <node concept="3UR2Jj" id="5wYq9r4En8j" role="lGtFl">
-        <node concept="TZ5HA" id="5wYq9r4En8k" role="TZ5H$">
-          <node concept="1dT_AC" id="5wYq9r4En8l" role="1dT_Ay">
-            <property role="1dT_AB" value="A path with the objects from the original hierarchy." />
+        <node concept="1PaTwC" id="M_dau6OgJn" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgJo" role="1PaTwD">
+            <property role="3oM_SC" value="A" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJp" role="1PaTwD">
+            <property role="3oM_SC" value="path" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJq" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJr" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJs" role="1PaTwD">
+            <property role="3oM_SC" value="objects" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJt" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJu" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJv" role="1PaTwD">
+            <property role="3oM_SC" value="original" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJw" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy." />
           </node>
         </node>
       </node>
@@ -49918,24 +50307,108 @@
         <property role="TrG5h" value="T" />
       </node>
       <node concept="3UR2Jj" id="4JBuioHamyr" role="lGtFl">
-        <node concept="TZ5HA" id="4JBuioHamys" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioHamyt" role="1dT_Ay">
-            <property role="1dT_AB" value="A pair of paths: " />
+        <node concept="1PaTwC" id="M_dau6OgJx" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgJy" role="1PaTwD">
+            <property role="3oM_SC" value="A" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJz" role="1PaTwD">
+            <property role="3oM_SC" value="pair" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ$" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJ_" role="1PaTwD">
+            <property role="3oM_SC" value="paths:" />
           </node>
         </node>
-        <node concept="TZ5HA" id="4JBuioHaqt8" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioHaqt9" role="1dT_Ay">
-            <property role="1dT_AB" value=" - the original hierarchy path; and" />
+        <node concept="1PaTwC" id="M_dau6OgJA" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgJB" role="1PaTwD">
+            <property role="3oM_SC" value="" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJC" role="1PaTwD">
+            <property role="3oM_SC" value="-" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJD" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJE" role="1PaTwD">
+            <property role="3oM_SC" value="original" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJF" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJG" role="1PaTwD">
+            <property role="3oM_SC" value="path;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJH" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
           </node>
         </node>
-        <node concept="TZ5HA" id="4JBuioHaqzO" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioHaqzP" role="1dT_Ay">
-            <property role="1dT_AB" value=" - the &quot;instantiated&quot; path of terms. " />
+        <node concept="1PaTwC" id="M_dau6OgJI" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgJJ" role="1PaTwD">
+            <property role="3oM_SC" value="" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJK" role="1PaTwD">
+            <property role="3oM_SC" value="-" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJL" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJM" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;instantiated&quot;" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJN" role="1PaTwD">
+            <property role="3oM_SC" value="path" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJO" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJP" role="1PaTwD">
+            <property role="3oM_SC" value="terms." />
           </node>
         </node>
-        <node concept="TZ5HA" id="4JBuioHaqFq" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioHaqFr" role="1dT_Ay">
-            <property role="1dT_AB" value="Both start with the original node and end with the root of the hierarchy. " />
+        <node concept="1PaTwC" id="M_dau6OgJQ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgJR" role="1PaTwD">
+            <property role="3oM_SC" value="Both" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJS" role="1PaTwD">
+            <property role="3oM_SC" value="start" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJT" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJU" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJV" role="1PaTwD">
+            <property role="3oM_SC" value="original" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJW" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJX" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJY" role="1PaTwD">
+            <property role="3oM_SC" value="end" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgJZ" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgK0" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgK1" role="1PaTwD">
+            <property role="3oM_SC" value="root" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgK2" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgK3" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgK4" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy." />
           </node>
         </node>
       </node>
@@ -50372,14 +50845,47 @@
         </node>
       </node>
       <node concept="P$JXv" id="3bgqfmmGS3_" role="lGtFl">
-        <node concept="TZ5HA" id="5wYq9r4N8OB" role="TZ5H$">
-          <node concept="1dT_AC" id="5wYq9r4N8OC" role="1dT_Ay">
-            <property role="1dT_AB" value="Create term path corresponding to the shortest hierarchy path" />
+        <node concept="1PaTwC" id="M_dau6OgLG" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgLH" role="1PaTwD">
+            <property role="3oM_SC" value="Create" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLI" role="1PaTwD">
+            <property role="3oM_SC" value="term" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLJ" role="1PaTwD">
+            <property role="3oM_SC" value="path" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLK" role="1PaTwD">
+            <property role="3oM_SC" value="corresponding" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLL" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLM" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLN" role="1PaTwD">
+            <property role="3oM_SC" value="shortest" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLO" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLP" role="1PaTwD">
+            <property role="3oM_SC" value="path" />
           </node>
         </node>
-        <node concept="TZ5HA" id="5wYq9r4N8T0" role="TZ5H$">
-          <node concept="1dT_AC" id="5wYq9r4N8T1" role="1dT_Ay">
-            <property role="1dT_AB" value="from source to target." />
+        <node concept="1PaTwC" id="M_dau6OgLQ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgLR" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLS" role="1PaTwD">
+            <property role="3oM_SC" value="source" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLT" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLU" role="1PaTwD">
+            <property role="3oM_SC" value="target." />
           </node>
         </node>
       </node>
@@ -50493,24 +50999,144 @@
         </node>
       </node>
       <node concept="P$JXv" id="5wYq9r4LNsd" role="lGtFl">
-        <node concept="TZ5HA" id="5wYq9r4LW_x" role="TZ5H$">
-          <node concept="1dT_AC" id="5wYq9r4LW_y" role="1dT_Ay">
-            <property role="1dT_AB" value="Finds the shortest path in the hierarchy graph originating at the node" />
+        <node concept="1PaTwC" id="M_dau6OgLV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgLW" role="1PaTwD">
+            <property role="3oM_SC" value="Finds" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLX" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLY" role="1PaTwD">
+            <property role="3oM_SC" value="shortest" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgLZ" role="1PaTwD">
+            <property role="3oM_SC" value="path" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM0" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM1" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM2" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM3" role="1PaTwD">
+            <property role="3oM_SC" value="graph" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM4" role="1PaTwD">
+            <property role="3oM_SC" value="originating" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM5" role="1PaTwD">
+            <property role="3oM_SC" value="at" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM6" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM7" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
           </node>
         </node>
-        <node concept="TZ5HA" id="5wYq9r4LW_z" role="TZ5H$">
-          <node concept="1dT_AC" id="5wYq9r4LW_$" role="1dT_Ay">
-            <property role="1dT_AB" value="represented by source, and ending at the node represented by target. " />
+        <node concept="1PaTwC" id="M_dau6OgM8" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgM9" role="1PaTwD">
+            <property role="3oM_SC" value="represented" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMa" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMb" role="1PaTwD">
+            <property role="3oM_SC" value="source," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMc" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMd" role="1PaTwD">
+            <property role="3oM_SC" value="ending" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMe" role="1PaTwD">
+            <property role="3oM_SC" value="at" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMf" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMg" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMh" role="1PaTwD">
+            <property role="3oM_SC" value="represented" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMi" role="1PaTwD">
+            <property role="3oM_SC" value="by" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMj" role="1PaTwD">
+            <property role="3oM_SC" value="target." />
           </node>
         </node>
-        <node concept="TZ5HA" id="5wYq9r4LW__" role="TZ5H$">
-          <node concept="1dT_AC" id="5wYq9r4LW_A" role="1dT_Ay">
-            <property role="1dT_AB" value="The target here is supposed to be higher in the hierarchy." />
+        <node concept="1PaTwC" id="M_dau6OgMk" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgMl" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMm" role="1PaTwD">
+            <property role="3oM_SC" value="target" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMn" role="1PaTwD">
+            <property role="3oM_SC" value="here" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMo" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMp" role="1PaTwD">
+            <property role="3oM_SC" value="supposed" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMq" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMr" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMs" role="1PaTwD">
+            <property role="3oM_SC" value="higher" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMt" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMu" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMv" role="1PaTwD">
+            <property role="3oM_SC" value="hierarchy." />
           </node>
         </node>
-        <node concept="TZ5HA" id="5wYq9r4LW_B" role="TZ5H$">
-          <node concept="1dT_AC" id="5wYq9r4LW_C" role="1dT_Ay">
-            <property role="1dT_AB" value="Throws an EvaluationFailureException in case no path can be found. " />
+        <node concept="1PaTwC" id="M_dau6OgMw" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgMx" role="1PaTwD">
+            <property role="3oM_SC" value="Throws" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMy" role="1PaTwD">
+            <property role="3oM_SC" value="an" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMz" role="1PaTwD">
+            <property role="3oM_SC" value="EvaluationFailureException" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM$" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgM_" role="1PaTwD">
+            <property role="3oM_SC" value="case" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMA" role="1PaTwD">
+            <property role="3oM_SC" value="no" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMB" role="1PaTwD">
+            <property role="3oM_SC" value="path" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMC" role="1PaTwD">
+            <property role="3oM_SC" value="can" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMD" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgME" role="1PaTwD">
+            <property role="3oM_SC" value="found." />
           </node>
         </node>
       </node>
@@ -50893,29 +51519,173 @@
         </node>
       </node>
       <node concept="P$JXv" id="4JBuioH3jEH" role="lGtFl">
-        <node concept="TZ5HA" id="4JBuioH3rXL" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioH3rXM" role="1dT_Ay">
-            <property role="1dT_AB" value="Finds the lowest upper bound of two vertices. " />
+        <node concept="1PaTwC" id="M_dau6OgMF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgMG" role="1PaTwD">
+            <property role="3oM_SC" value="Finds" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMH" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMI" role="1PaTwD">
+            <property role="3oM_SC" value="lowest" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMJ" role="1PaTwD">
+            <property role="3oM_SC" value="upper" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMK" role="1PaTwD">
+            <property role="3oM_SC" value="bound" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgML" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMM" role="1PaTwD">
+            <property role="3oM_SC" value="two" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMN" role="1PaTwD">
+            <property role="3oM_SC" value="vertices." />
           </node>
         </node>
-        <node concept="TZ5HA" id="4JBuioH3s4_" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioH3s4A" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgMO" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgMP" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="4JBuioH3s4H" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioH3s4I" role="1dT_Ay">
-            <property role="1dT_AB" value="The result is the nested list of unique parametrizations of terms representing the LUB of the two types." />
+        <node concept="1PaTwC" id="M_dau6OgMQ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgMR" role="1PaTwD">
+            <property role="3oM_SC" value="The" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMS" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMT" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMU" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMV" role="1PaTwD">
+            <property role="3oM_SC" value="nested" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMW" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMX" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMY" role="1PaTwD">
+            <property role="3oM_SC" value="unique" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgMZ" role="1PaTwD">
+            <property role="3oM_SC" value="parametrizations" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN0" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN1" role="1PaTwD">
+            <property role="3oM_SC" value="terms" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN2" role="1PaTwD">
+            <property role="3oM_SC" value="representing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN3" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN4" role="1PaTwD">
+            <property role="3oM_SC" value="LUB" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN5" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN6" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN7" role="1PaTwD">
+            <property role="3oM_SC" value="two" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN8" role="1PaTwD">
+            <property role="3oM_SC" value="types." />
           </node>
         </node>
-        <node concept="TZ5HA" id="4JBuioH3jEI" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioH3jEJ" role="1dT_Ay">
-            <property role="1dT_AB" value="More specifically, the result is a term representing a list of term pairs," />
+        <node concept="1PaTwC" id="M_dau6OgN9" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgNa" role="1PaTwD">
+            <property role="3oM_SC" value="More" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNb" role="1PaTwD">
+            <property role="3oM_SC" value="specifically," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNc" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNd" role="1PaTwD">
+            <property role="3oM_SC" value="result" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNe" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNf" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNg" role="1PaTwD">
+            <property role="3oM_SC" value="term" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNh" role="1PaTwD">
+            <property role="3oM_SC" value="representing" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNi" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNj" role="1PaTwD">
+            <property role="3oM_SC" value="list" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNk" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNl" role="1PaTwD">
+            <property role="3oM_SC" value="term" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNm" role="1PaTwD">
+            <property role="3oM_SC" value="pairs," />
           </node>
         </node>
-        <node concept="TZ5HA" id="4JBuioH3svu" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioH3svv" role="1dT_Ay">
-            <property role="1dT_AB" value="where each pair contains two types with potentially different parameters but same identity." />
+        <node concept="1PaTwC" id="M_dau6OgNn" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgNo" role="1PaTwD">
+            <property role="3oM_SC" value="where" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNp" role="1PaTwD">
+            <property role="3oM_SC" value="each" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNq" role="1PaTwD">
+            <property role="3oM_SC" value="pair" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNr" role="1PaTwD">
+            <property role="3oM_SC" value="contains" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNs" role="1PaTwD">
+            <property role="3oM_SC" value="two" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNt" role="1PaTwD">
+            <property role="3oM_SC" value="types" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNu" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNv" role="1PaTwD">
+            <property role="3oM_SC" value="potentially" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNw" role="1PaTwD">
+            <property role="3oM_SC" value="different" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNx" role="1PaTwD">
+            <property role="3oM_SC" value="parameters" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNy" role="1PaTwD">
+            <property role="3oM_SC" value="but" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgNz" role="1PaTwD">
+            <property role="3oM_SC" value="same" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgN$" role="1PaTwD">
+            <property role="3oM_SC" value="identity." />
           </node>
         </node>
       </node>
@@ -51286,19 +52056,157 @@
           </node>
         </node>
         <node concept="P$JXv" id="4JBuioH3sQA" role="lGtFl">
-          <node concept="TZ5HA" id="4JBuioH3uRg" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3uRh" role="1dT_Ay">
-              <property role="1dT_AB" value="The algorithm compares pairwise all paths from &quot;left&quot; and &quot;right&quot; and finds, for each pair," />
+          <node concept="1PaTwC" id="M_dau6OgN_" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgNA" role="1PaTwD">
+              <property role="3oM_SC" value="The" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNB" role="1PaTwD">
+              <property role="3oM_SC" value="algorithm" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNC" role="1PaTwD">
+              <property role="3oM_SC" value="compares" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgND" role="1PaTwD">
+              <property role="3oM_SC" value="pairwise" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNE" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNF" role="1PaTwD">
+              <property role="3oM_SC" value="paths" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNG" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNH" role="1PaTwD">
+              <property role="3oM_SC" value="&quot;left&quot;" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNI" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNJ" role="1PaTwD">
+              <property role="3oM_SC" value="&quot;right&quot;" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNK" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNL" role="1PaTwD">
+              <property role="3oM_SC" value="finds," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNM" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNN" role="1PaTwD">
+              <property role="3oM_SC" value="each" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNO" role="1PaTwD">
+              <property role="3oM_SC" value="pair," />
             </node>
           </node>
-          <node concept="TZ5HA" id="4JBuioH3uRi" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3uRj" role="1dT_Ay">
-              <property role="1dT_AB" value="the farthest from the root matching term, remembering the intermediate visited terms in the process. " />
+          <node concept="1PaTwC" id="M_dau6OgNP" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgNQ" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNR" role="1PaTwD">
+              <property role="3oM_SC" value="farthest" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNS" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNT" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNU" role="1PaTwD">
+              <property role="3oM_SC" value="root" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNV" role="1PaTwD">
+              <property role="3oM_SC" value="matching" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNW" role="1PaTwD">
+              <property role="3oM_SC" value="term," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNX" role="1PaTwD">
+              <property role="3oM_SC" value="remembering" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNY" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgNZ" role="1PaTwD">
+              <property role="3oM_SC" value="intermediate" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO0" role="1PaTwD">
+              <property role="3oM_SC" value="visited" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO1" role="1PaTwD">
+              <property role="3oM_SC" value="terms" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO2" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO3" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO4" role="1PaTwD">
+              <property role="3oM_SC" value="process." />
             </node>
           </node>
-          <node concept="TZ5HA" id="4JBuioH3uRk" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3uRl" role="1dT_Ay">
-              <property role="1dT_AB" value="It then walks all the paths again in order to eliminate all terms that should be marked as intermediate." />
+          <node concept="1PaTwC" id="M_dau6OgO5" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgO6" role="1PaTwD">
+              <property role="3oM_SC" value="It" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO7" role="1PaTwD">
+              <property role="3oM_SC" value="then" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO8" role="1PaTwD">
+              <property role="3oM_SC" value="walks" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO9" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOa" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOb" role="1PaTwD">
+              <property role="3oM_SC" value="paths" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOc" role="1PaTwD">
+              <property role="3oM_SC" value="again" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOd" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOe" role="1PaTwD">
+              <property role="3oM_SC" value="order" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOf" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOg" role="1PaTwD">
+              <property role="3oM_SC" value="eliminate" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOh" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOi" role="1PaTwD">
+              <property role="3oM_SC" value="terms" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOj" role="1PaTwD">
+              <property role="3oM_SC" value="that" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOk" role="1PaTwD">
+              <property role="3oM_SC" value="should" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOl" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOm" role="1PaTwD">
+              <property role="3oM_SC" value="marked" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOn" role="1PaTwD">
+              <property role="3oM_SC" value="as" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOo" role="1PaTwD">
+              <property role="3oM_SC" value="intermediate." />
             </node>
           </node>
         </node>
@@ -51688,51 +52596,135 @@
           </node>
         </node>
         <node concept="P$JXv" id="4JBuioH3v7b" role="lGtFl">
-          <node concept="TZ5HA" id="4JBuioH3xau" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3xav" role="1dT_Ay">
-              <property role="1dT_AB" value="Compare all paths pairwise and find the matching term farthest from the path root, storing" />
+          <node concept="1PaTwC" id="M_dau6OgOp" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgOq" role="1PaTwD">
+              <property role="3oM_SC" value="Compare" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOr" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOs" role="1PaTwD">
+              <property role="3oM_SC" value="paths" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOt" role="1PaTwD">
+              <property role="3oM_SC" value="pairwise" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOu" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOv" role="1PaTwD">
+              <property role="3oM_SC" value="find" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOw" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOx" role="1PaTwD">
+              <property role="3oM_SC" value="matching" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOy" role="1PaTwD">
+              <property role="3oM_SC" value="term" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOz" role="1PaTwD">
+              <property role="3oM_SC" value="farthest" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO$" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgO_" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOA" role="1PaTwD">
+              <property role="3oM_SC" value="path" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOB" role="1PaTwD">
+              <property role="3oM_SC" value="root," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOC" role="1PaTwD">
+              <property role="3oM_SC" value="storing" />
             </node>
           </node>
-          <node concept="TZ5HA" id="4JBuioH3xaw" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3xax" role="1dT_Ay">
-              <property role="1dT_AB" value="the results in " />
+          <node concept="1PaTwC" id="M_dau6OgOD" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgOE" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
             </node>
-            <node concept="1dT_AC" id="4JBuioH3xay" role="1dT_Ay">
-              <property role="1dT_AB" value="" />
+            <node concept="3oM_SD" id="M_dau6OgOF" role="1PaTwD">
+              <property role="3oM_SC" value="results" />
             </node>
-            <node concept="1dT_AA" id="4JBuioH3xaz" role="1dT_Ay">
-              <node concept="VVOAv" id="4JBuioH3zjO" role="qph3F">
-                <node concept="TZ5HA" id="4JBuioH3zjQ" role="2Xj1qM">
-                  <node concept="1dT_AC" id="4JBuioH3zk2" role="1dT_Ay">
-                    <property role="1dT_AB" value="id2candidates" />
+            <node concept="3oM_SD" id="M_dau6OgOG" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOH" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="1Vtdud" id="M_dau6OgOI" role="1PaTwD">
+              <node concept="1VuTSG" id="M_dau6OgOJ" role="1Vtduc">
+                <node concept="1PaTwC" id="M_dau6OgOM" role="2JaDBN">
+                  <node concept="3oM_SD" id="M_dau6OgON" role="1PaTwD">
+                    <property role="3oM_SC" value="id2candidates" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="1dT_AC" id="4JBuioH3xaB" role="1dT_Ay">
-              <property role="1dT_AB" value="." />
+            <node concept="3oM_SD" id="M_dau6OgOO" role="1PaTwD">
+              <property role="3oM_SC" value="." />
             </node>
           </node>
-          <node concept="TZ5HA" id="4JBuioH3z_3" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3z_4" role="1dT_Ay">
-              <property role="1dT_AB" value="Only unique pairs are allowed per each identity." />
+          <node concept="1PaTwC" id="M_dau6OgOP" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgOQ" role="1PaTwD">
+              <property role="3oM_SC" value="Only" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOR" role="1PaTwD">
+              <property role="3oM_SC" value="unique" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOS" role="1PaTwD">
+              <property role="3oM_SC" value="pairs" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOT" role="1PaTwD">
+              <property role="3oM_SC" value="are" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOU" role="1PaTwD">
+              <property role="3oM_SC" value="allowed" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOV" role="1PaTwD">
+              <property role="3oM_SC" value="per" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOW" role="1PaTwD">
+              <property role="3oM_SC" value="each" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgOX" role="1PaTwD">
+              <property role="3oM_SC" value="identity." />
             </node>
           </node>
-          <node concept="TZ5HA" id="4JBuioH3xaC" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3xaD" role="1dT_Ay">
-              <property role="1dT_AB" value="All intermediate terms get collected into " />
+          <node concept="1PaTwC" id="M_dau6OgOY" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgOZ" role="1PaTwD">
+              <property role="3oM_SC" value="All" />
             </node>
-            <node concept="1dT_AA" id="4JBuioH3z7W" role="1dT_Ay">
-              <node concept="VVOAv" id="4JBuioH3z92" role="qph3F">
-                <node concept="TZ5HA" id="4JBuioH3z94" role="2Xj1qM">
-                  <node concept="1dT_AC" id="4JBuioH3z9g" role="1dT_Ay">
-                    <property role="1dT_AB" value="intermediateIds" />
+            <node concept="3oM_SD" id="M_dau6OgP0" role="1PaTwD">
+              <property role="3oM_SC" value="intermediate" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgP1" role="1PaTwD">
+              <property role="3oM_SC" value="terms" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgP2" role="1PaTwD">
+              <property role="3oM_SC" value="get" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgP3" role="1PaTwD">
+              <property role="3oM_SC" value="collected" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgP4" role="1PaTwD">
+              <property role="3oM_SC" value="into" />
+            </node>
+            <node concept="1Vtdud" id="M_dau6OgP5" role="1PaTwD">
+              <node concept="1VuTSG" id="M_dau6OgP6" role="1Vtduc">
+                <node concept="1PaTwC" id="M_dau6OgP9" role="2JaDBN">
+                  <node concept="3oM_SD" id="M_dau6OgPa" role="1PaTwD">
+                    <property role="3oM_SC" value="intermediateIds" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="1dT_AC" id="4JBuioH3z7V" role="1dT_Ay">
-              <property role="1dT_AB" value="." />
+            <node concept="3oM_SD" id="M_dau6OgPb" role="1PaTwD">
+              <property role="3oM_SC" value="." />
             </node>
           </node>
         </node>
@@ -52011,31 +53003,139 @@
           </node>
         </node>
         <node concept="P$JXv" id="4JBuioH3zWr" role="lGtFl">
-          <node concept="TZ5HA" id="4JBuioH3_JN" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3_JO" role="1dT_Ay">
-              <property role="1dT_AB" value="Walk the path until first &quot;candidate&quot; is found, and record it. Then walk further until the next" />
+          <node concept="1PaTwC" id="M_dau6OgPc" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgPd" role="1PaTwD">
+              <property role="3oM_SC" value="Walk" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPe" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPf" role="1PaTwD">
+              <property role="3oM_SC" value="path" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPg" role="1PaTwD">
+              <property role="3oM_SC" value="until" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPh" role="1PaTwD">
+              <property role="3oM_SC" value="first" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPi" role="1PaTwD">
+              <property role="3oM_SC" value="&quot;candidate&quot;" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPj" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPk" role="1PaTwD">
+              <property role="3oM_SC" value="found," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPl" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPm" role="1PaTwD">
+              <property role="3oM_SC" value="record" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPn" role="1PaTwD">
+              <property role="3oM_SC" value="it." />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPo" role="1PaTwD">
+              <property role="3oM_SC" value="Then" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPp" role="1PaTwD">
+              <property role="3oM_SC" value="walk" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPq" role="1PaTwD">
+              <property role="3oM_SC" value="further" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPr" role="1PaTwD">
+              <property role="3oM_SC" value="until" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPs" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPt" role="1PaTwD">
+              <property role="3oM_SC" value="next" />
             </node>
           </node>
-          <node concept="TZ5HA" id="4JBuioH3_JP" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3_JQ" role="1dT_Ay">
-              <property role="1dT_AB" value="&quot;candidate&quot;, recording all visited terms. If the second &quot;candidate&quot; is found, all the recorded terms" />
+          <node concept="1PaTwC" id="M_dau6OgPu" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgPv" role="1PaTwD">
+              <property role="3oM_SC" value="&quot;candidate&quot;," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPw" role="1PaTwD">
+              <property role="3oM_SC" value="recording" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPx" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPy" role="1PaTwD">
+              <property role="3oM_SC" value="visited" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPz" role="1PaTwD">
+              <property role="3oM_SC" value="terms." />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgP$" role="1PaTwD">
+              <property role="3oM_SC" value="If" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgP_" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPA" role="1PaTwD">
+              <property role="3oM_SC" value="second" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPB" role="1PaTwD">
+              <property role="3oM_SC" value="&quot;candidate&quot;" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPC" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPD" role="1PaTwD">
+              <property role="3oM_SC" value="found," />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPE" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPF" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPG" role="1PaTwD">
+              <property role="3oM_SC" value="recorded" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPH" role="1PaTwD">
+              <property role="3oM_SC" value="terms" />
             </node>
           </node>
-          <node concept="TZ5HA" id="4JBuioH3_JR" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioH3_JS" role="1dT_Ay">
-              <property role="1dT_AB" value="are added to " />
+          <node concept="1PaTwC" id="M_dau6OgPI" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgPJ" role="1PaTwD">
+              <property role="3oM_SC" value="are" />
             </node>
-            <node concept="1dT_AA" id="4JBuioH3_JT" role="1dT_Ay">
-              <node concept="VVOAv" id="4JBuioH3BVC" role="qph3F">
-                <node concept="TZ5HA" id="4JBuioH3BVE" role="2Xj1qM">
-                  <node concept="1dT_AC" id="4JBuioH3BVQ" role="1dT_Ay">
-                    <property role="1dT_AB" value="intermediateIds" />
+            <node concept="3oM_SD" id="M_dau6OgPK" role="1PaTwD">
+              <property role="3oM_SC" value="added" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPL" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="1Vtdud" id="M_dau6OgPM" role="1PaTwD">
+              <node concept="1VuTSG" id="M_dau6OgPN" role="1Vtduc">
+                <node concept="1PaTwC" id="M_dau6OgPQ" role="2JaDBN">
+                  <node concept="3oM_SD" id="M_dau6OgPR" role="1PaTwD">
+                    <property role="3oM_SC" value="intermediateIds" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="1dT_AC" id="4JBuioH3_JX" role="1dT_Ay">
-              <property role="1dT_AB" value=". Then the process repeats." />
+            <node concept="3oM_SD" id="M_dau6OgPS" role="1PaTwD">
+              <property role="3oM_SC" value="." />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPT" role="1PaTwD">
+              <property role="3oM_SC" value="Then" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPU" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPV" role="1PaTwD">
+              <property role="3oM_SC" value="process" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPW" role="1PaTwD">
+              <property role="3oM_SC" value="repeats." />
             </node>
           </node>
         </node>
@@ -52230,9 +53330,15 @@
         <ref role="3uigEE" to="tpfl:6GYQG_Spvw5" resolve="UnificationPredicate.UnificationSolver" />
       </node>
       <node concept="3UR2Jj" id="4JBuioGxJxW" role="lGtFl">
-        <node concept="TZ5HA" id="4JBuioGxJxX" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioGxJxY" role="1dT_Ay">
-            <property role="1dT_AB" value="Used from tests." />
+        <node concept="1PaTwC" id="M_dau6OgK5" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgK6" role="1PaTwD">
+            <property role="3oM_SC" value="Used" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgK7" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgK8" role="1PaTwD">
+            <property role="3oM_SC" value="tests." />
           </node>
         </node>
       </node>
@@ -52253,46 +53359,126 @@
     <node concept="2tJIrI" id="74XSvyw4Fbi" role="jymVt" />
     <node concept="3Tm1VV" id="74XSvyw4EBk" role="1B3o_S" />
     <node concept="3UR2Jj" id="74XSvyw4FQk" role="lGtFl">
-      <node concept="TZ5HA" id="74XSvyw4FQl" role="TZ5H$">
-        <node concept="1dT_AC" id="74XSvyw4FQm" role="1dT_Ay">
-          <property role="1dT_AB" value="Provides utilities to work with a hierarchy, such as classes inheritance, without the need" />
+      <node concept="1PaTwC" id="M_dau6OgK9" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgKa" role="1PaTwD">
+          <property role="3oM_SC" value="Provides" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKb" role="1PaTwD">
+          <property role="3oM_SC" value="utilities" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKc" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKd" role="1PaTwD">
+          <property role="3oM_SC" value="work" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKe" role="1PaTwD">
+          <property role="3oM_SC" value="with" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKf" role="1PaTwD">
+          <property role="3oM_SC" value="a" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKg" role="1PaTwD">
+          <property role="3oM_SC" value="hierarchy," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKh" role="1PaTwD">
+          <property role="3oM_SC" value="such" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKi" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKj" role="1PaTwD">
+          <property role="3oM_SC" value="classes" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKk" role="1PaTwD">
+          <property role="3oM_SC" value="inheritance," />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKl" role="1PaTwD">
+          <property role="3oM_SC" value="without" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKm" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKn" role="1PaTwD">
+          <property role="3oM_SC" value="need" />
         </node>
       </node>
-      <node concept="TZ5HA" id="74XSvyw4Gvd" role="TZ5H$">
-        <node concept="1dT_AC" id="74XSvyw4Gve" role="1dT_Ay">
-          <property role="1dT_AB" value="to use the underlying objects." />
+      <node concept="1PaTwC" id="M_dau6OgKo" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgKp" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKq" role="1PaTwD">
+          <property role="3oM_SC" value="use" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKr" role="1PaTwD">
+          <property role="3oM_SC" value="the" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKs" role="1PaTwD">
+          <property role="3oM_SC" value="underlying" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKt" role="1PaTwD">
+          <property role="3oM_SC" value="objects." />
         </node>
       </node>
-      <node concept="TZ5HA" id="4JBuioHaueu" role="TZ5H$">
-        <node concept="1dT_AC" id="4JBuioHauev" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6OgKu" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgKv" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
-      <node concept="TZ5HA" id="4JBuioHazZI" role="TZ5H$">
-        <node concept="1dT_AC" id="4JBuioHazZJ" role="1dT_Ay">
-          <property role="1dT_AB" value="Used as facade for finding hierarchy path " />
+      <node concept="1PaTwC" id="M_dau6OgKw" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgKx" role="1PaTwD">
+          <property role="3oM_SC" value="Used" />
         </node>
-        <node concept="1dT_AA" id="4JBuioHa_6q" role="1dT_Ay">
-          <node concept="92FcH" id="4JBuioHa_6w" role="qph3F">
-            <node concept="TZ5HA" id="4JBuioHa_6y" role="2XjZqd" />
-            <node concept="VXe0Z" id="3bgqfmmtnjd" role="92FcQ">
+        <node concept="3oM_SD" id="M_dau6OgKy" role="1PaTwD">
+          <property role="3oM_SC" value="as" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKz" role="1PaTwD">
+          <property role="3oM_SC" value="facade" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgK$" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgK_" role="1PaTwD">
+          <property role="3oM_SC" value="finding" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKA" role="1PaTwD">
+          <property role="3oM_SC" value="hierarchy" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKB" role="1PaTwD">
+          <property role="3oM_SC" value="path" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6OgKC" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgKD" role="1Vtduc">
+            <node concept="VXe0Z" id="3bgqfmmtnjd" role="1VuXuu">
               <ref role="VXe0S" node="3bgqfmmljvI" resolve="buildPath" />
             </node>
-          </node>
-        </node>
-        <node concept="1dT_AC" id="4JBuioHa_6p" role="1dT_Ay">
-          <property role="1dT_AB" value=" and LUB " />
-        </node>
-        <node concept="1dT_AA" id="4JBuioHa_Ph" role="1dT_Ay">
-          <node concept="92FcH" id="4JBuioHa_S4" role="qph3F">
-            <node concept="TZ5HA" id="4JBuioHa_S6" role="2XjZqd" />
-            <node concept="VXe0Z" id="4JBuioHa_TX" role="92FcQ">
-              <ref role="VXe0S" node="4JBuioGg$$g" resolve="buildLub" />
+            <node concept="1PaTwC" id="M_dau6OgKG" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgKH" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="4JBuioHa_Pg" role="1dT_Ay">
-          <property role="1dT_AB" value="." />
+        <node concept="3oM_SD" id="M_dau6OgKI" role="1PaTwD">
+          <property role="3oM_SC" value="and" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKJ" role="1PaTwD">
+          <property role="3oM_SC" value="LUB" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6OgKK" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgKL" role="1Vtduc">
+            <node concept="VXe0Z" id="4JBuioHa_TX" role="1VuXuu">
+              <ref role="VXe0S" node="4JBuioGg$$g" resolve="buildLub" />
+            </node>
+            <node concept="1PaTwC" id="M_dau6OgKO" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgKP" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgKQ" role="1PaTwD">
+          <property role="3oM_SC" value="." />
         </node>
       </node>
     </node>
@@ -52388,14 +53574,44 @@
           </node>
         </node>
         <node concept="P$JXv" id="4JBuioHXyRC" role="lGtFl">
-          <node concept="TZ5HA" id="4JBuioHXyRD" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioHXyRE" role="1dT_Ay">
-              <property role="1dT_AB" value="Returns the type with all type variable references replaced with " />
+          <node concept="1PaTwC" id="M_dau6OgPX" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgPY" role="1PaTwD">
+              <property role="3oM_SC" value="Returns" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgPZ" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQ0" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQ1" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQ2" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQ3" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQ4" role="1PaTwD">
+              <property role="3oM_SC" value="variable" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQ5" role="1PaTwD">
+              <property role="3oM_SC" value="references" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQ6" role="1PaTwD">
+              <property role="3oM_SC" value="replaced" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQ7" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
             </node>
           </node>
-          <node concept="TZ5HA" id="4JBuioHXzXz" role="TZ5H$">
-            <node concept="1dT_AC" id="4JBuioHXzX$" role="1dT_Ay">
-              <property role="1dT_AB" value="appropriate bindings. " />
+          <node concept="1PaTwC" id="M_dau6OgQ8" role="1Vez_I">
+            <node concept="3oM_SD" id="M_dau6OgQ9" role="1PaTwD">
+              <property role="3oM_SC" value="appropriate" />
+            </node>
+            <node concept="3oM_SD" id="M_dau6OgQa" role="1PaTwD">
+              <property role="3oM_SC" value="bindings." />
             </node>
           </node>
         </node>
@@ -52656,9 +53872,39 @@
       </node>
       <node concept="3Tm1VV" id="74XSvywJjPc" role="1B3o_S" />
       <node concept="3UR2Jj" id="4JBuioHVnrO" role="lGtFl">
-        <node concept="TZ5HA" id="4JBuioHVnrP" role="TZ5H$">
-          <node concept="1dT_AC" id="4JBuioHVnrQ" role="1dT_Ay">
-            <property role="1dT_AB" value="Maintains a map from type variable declarations to the substited types." />
+        <node concept="1PaTwC" id="M_dau6OgKR" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgKS" role="1PaTwD">
+            <property role="3oM_SC" value="Maintains" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgKT" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgKU" role="1PaTwD">
+            <property role="3oM_SC" value="map" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgKV" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgKW" role="1PaTwD">
+            <property role="3oM_SC" value="type" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgKX" role="1PaTwD">
+            <property role="3oM_SC" value="variable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgKY" role="1PaTwD">
+            <property role="3oM_SC" value="declarations" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgKZ" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgL0" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgL1" role="1PaTwD">
+            <property role="3oM_SC" value="substited" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgL2" role="1PaTwD">
+            <property role="3oM_SC" value="types." />
           </node>
         </node>
       </node>
@@ -53145,20 +54391,30 @@
       </node>
     </node>
     <node concept="3UR2Jj" id="4JBuioHcqG5" role="lGtFl">
-      <node concept="TZ5HA" id="4JBuioHcqG6" role="TZ5H$">
-        <node concept="1dT_AC" id="4JBuioHcqG7" role="1dT_Ay">
-          <property role="1dT_AB" value="Specifies " />
+      <node concept="1PaTwC" id="M_dau6OgL3" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgL4" role="1PaTwD">
+          <property role="3oM_SC" value="Specifies" />
         </node>
-        <node concept="1dT_AA" id="4JBuioHcrQa" role="1dT_Ay">
-          <node concept="92FcH" id="4JBuioHcrQg" role="qph3F">
-            <node concept="TZ5HA" id="4JBuioHcrQi" role="2XjZqd" />
-            <node concept="VXe08" id="4JBuioHcrVD" role="92FcQ">
+        <node concept="1Vtdud" id="M_dau6OgL5" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgL6" role="1Vtduc">
+            <node concept="VXe08" id="4JBuioHcrVD" role="1VuXuu">
               <ref role="VXe09" node="74XSvyw4EBj" resolve="HierarchyGraph" />
             </node>
+            <node concept="1PaTwC" id="M_dau6OgL9" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgLa" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="4JBuioHcrQ9" role="1dT_Ay">
-          <property role="1dT_AB" value=" for classifier hierarchy. " />
+        <node concept="3oM_SD" id="M_dau6OgLb" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgLc" role="1PaTwD">
+          <property role="3oM_SC" value="classifier" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgLd" role="1PaTwD">
+          <property role="3oM_SC" value="hierarchy." />
         </node>
       </node>
     </node>
@@ -53231,7 +54487,7 @@
                                         <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="74XSvywIt6j" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og8t" role="2OqNvi">
                                       <ref role="37wK5l" to="tpek:1UeCwxlWKny" resolve="getExtendedClassifierTypes" />
                                     </node>
                                   </node>
@@ -53505,7 +54761,7 @@
                                             <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
                                           </node>
                                         </node>
-                                        <node concept="2qgKlT" id="74XSvywImjL" role="2OqNvi">
+                                        <node concept="3zqWPK" id="M_dau6Og8v" role="2OqNvi">
                                           <ref role="37wK5l" to="tpek:1UeCwxlWKny" resolve="getExtendedClassifierTypes" />
                                         </node>
                                       </node>
@@ -53803,20 +55059,30 @@
     <node concept="2tJIrI" id="74XSvywIK8V" role="jymVt" />
     <node concept="3Tm1VV" id="74XSvywIK4x" role="1B3o_S" />
     <node concept="3UR2Jj" id="4JBuioHcmce" role="lGtFl">
-      <node concept="TZ5HA" id="4JBuioHcmcf" role="TZ5H$">
-        <node concept="1dT_AC" id="4JBuioHcmcg" role="1dT_Ay">
-          <property role="1dT_AB" value="A factory for " />
+      <node concept="1PaTwC" id="M_dau6OgLe" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6OgLf" role="1PaTwD">
+          <property role="3oM_SC" value="A" />
         </node>
-        <node concept="1dT_AA" id="4JBuioHcp_Q" role="1dT_Ay">
-          <node concept="92FcH" id="4JBuioHcp_W" role="qph3F">
-            <node concept="TZ5HA" id="4JBuioHcp_Y" role="2XjZqd" />
-            <node concept="VXe08" id="4JBuioHcpJz" role="92FcQ">
+        <node concept="3oM_SD" id="M_dau6OgLg" role="1PaTwD">
+          <property role="3oM_SC" value="factory" />
+        </node>
+        <node concept="3oM_SD" id="M_dau6OgLh" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
+        </node>
+        <node concept="1Vtdud" id="M_dau6OgLi" role="1PaTwD">
+          <node concept="1VuXuv" id="M_dau6OgLj" role="1Vtduc">
+            <node concept="VXe08" id="4JBuioHcpJz" role="1VuXuu">
               <ref role="VXe09" node="rZZ6H4XHN" resolve="ClassHierarchyGraph" />
             </node>
+            <node concept="1PaTwC" id="M_dau6OgLm" role="2JaDBN">
+              <node concept="3oM_SD" id="M_dau6OgLn" role="1PaTwD">
+                <property role="3oM_SC" value="" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="1dT_AC" id="4JBuioHcp_P" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+        <node concept="3oM_SD" id="M_dau6OgLo" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
     </node>
@@ -57170,7 +58436,7 @@
               <node concept="3A2sRY" id="3ZfjIHupt5f" role="2Oq$k0">
                 <ref role="3A2yKK" node="3ZfjIHupsIq" resolve="cfp" />
               </node>
-              <node concept="2qgKlT" id="3ZfjIHupt5g" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og8x" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:27DJnJtIQ9C" resolve="getType" />
               </node>
             </node>
@@ -57259,7 +58525,7 @@
               <node concept="3A2sRY" id="4dm7SwSpZqe" role="2Oq$k0">
                 <ref role="3A2yKK" node="4dm7SwSpaCu" resolve="cf" />
               </node>
-              <node concept="2qgKlT" id="4dm7SwSpZqf" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og8z" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:hEwIGRD" resolve="getExpectedReturnType" />
               </node>
             </node>
@@ -57474,7 +58740,7 @@
               <node concept="3A2sRY" id="4dm7SwSpC8B" role="2Oq$k0">
                 <ref role="3A2yKK" node="4dm7SwSpaCu" resolve="cf" />
               </node>
-              <node concept="2qgKlT" id="4dm7SwSpuPW" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og8_" role="2OqNvi">
                 <ref role="37wK5l" to="tpek:i2fhS7A" resolve="getLastStatement" />
               </node>
             </node>
@@ -59435,7 +60701,7 @@
                   <node concept="37vLTw" id="vrUbzhyIyl" role="2Oq$k0">
                     <ref role="3cqZAo" node="vrUbzhyIyf" resolve="container" />
                   </node>
-                  <node concept="2qgKlT" id="vrUbzhyFJs" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og8B" role="2OqNvi">
                     <ref role="37wK5l" to="tpek:i2fhS7A" resolve="getLastStatement" />
                   </node>
                 </node>
@@ -59536,9 +60802,9 @@
                             <node concept="37vLTw" id="5ZROos5iRhi" role="2Oq$k0">
                               <ref role="3cqZAo" node="5ZROos5iRhl" resolve="it" />
                             </node>
-                            <node concept="2qgKlT" id="5ZROos5iRhj" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og8D" role="2OqNvi">
                               <ref role="37wK5l" to="tpek:JiVENj$Z0y" resolve="canProvideInferenceContext" />
-                              <node concept="3A2sRY" id="5ZROos5iRhk" role="37wK5m">
+                              <node concept="3A2sRY" id="M_dau6Og8F" role="37wK5m">
                                 <ref role="3A2yKK" node="7o7XkDtsoc5" resolve="iie" />
                               </node>
                             </node>
@@ -59560,7 +60826,7 @@
             <node concept="3A2sRY" id="5ZROos5mKQg" role="2Oq$k0">
               <ref role="3A2yKK" node="7o7XkDtsoc5" resolve="iie" />
             </node>
-            <node concept="2qgKlT" id="5ZROos5mLsR" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og8G" role="2OqNvi">
               <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
             </node>
           </node>
@@ -59734,7 +61000,7 @@
                     <node concept="37vLTw" id="6mVkPJZtD0l" role="2Oq$k0">
                       <ref role="3cqZAo" node="6mVkPJZtoR4" resolve="cls" />
                     </node>
-                    <node concept="2qgKlT" id="6mVkPJZtDGV" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og8I" role="2OqNvi">
                       <ref role="37wK5l" to="tpek:2RtWPFZ12w7" resolve="getThisType" />
                     </node>
                   </node>
@@ -59757,21 +61023,45 @@
       </node>
       <node concept="3Tm1VV" id="6mVkPJZtoP6" role="1B3o_S" />
       <node concept="P$JXv" id="3HnYtOA9Jk$" role="lGtFl">
-        <node concept="TZ5HA" id="3HnYtOA9Jk_" role="TZ5H$">
-          <node concept="1dT_AC" id="3HnYtOA9JkA" role="1dT_Ay">
-            <property role="1dT_AB" value="A workaround for " />
+        <node concept="1PaTwC" id="M_dau6OgQb" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgQc" role="1PaTwD">
+            <property role="3oM_SC" value="A" />
           </node>
-          <node concept="1dT_AA" id="3HnYtOA9Jmn" role="1dT_Ay">
-            <node concept="VVOAv" id="3HnYtOA9JmH" role="qph3F">
-              <node concept="TZ5HA" id="3HnYtOA9JmJ" role="2Xj1qM">
-                <node concept="1dT_AC" id="3HnYtOA9Jn3" role="1dT_Ay">
-                  <property role="1dT_AB" value="AnonymousClass.getThisType()" />
+          <node concept="3oM_SD" id="M_dau6OgQd" role="1PaTwD">
+            <property role="3oM_SC" value="workaround" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQe" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="1Vtdud" id="M_dau6OgQf" role="1PaTwD">
+            <node concept="1VuTSG" id="M_dau6OgQg" role="1Vtduc">
+              <node concept="1PaTwC" id="M_dau6OgQj" role="2JaDBN">
+                <node concept="3oM_SD" id="M_dau6OgQk" role="1PaTwD">
+                  <property role="3oM_SC" value="AnonymousClass.getThisType()" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1dT_AC" id="3HnYtOA9Jmm" role="1dT_Ay">
-            <property role="1dT_AB" value=" which makes are recursive call to typechecker." />
+          <node concept="3oM_SD" id="M_dau6OgQl" role="1PaTwD">
+            <property role="3oM_SC" value="which" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQm" role="1PaTwD">
+            <property role="3oM_SC" value="makes" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQn" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQo" role="1PaTwD">
+            <property role="3oM_SC" value="recursive" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQp" role="1PaTwD">
+            <property role="3oM_SC" value="call" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQq" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgQr" role="1PaTwD">
+            <property role="3oM_SC" value="typechecker." />
           </node>
         </node>
       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
index 911becfc..3ec9b781 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -69,7 +69,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
index 76513d73..b952aa90 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -48,13 +48,20 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+        <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="e6d71378-a200-440d-aee2-16f93b792e86(jetbrains.mps.lang.behaviorExt)" version="0" />
         <module reference="64feabf9-0bb2-49ae-800e-ae9bc7f04c9e(jetbrains.mps.lang.behaviorExt.generator)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
@@ -68,7 +75,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps
index a110c139..55e1e738 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps
@@ -17,6 +17,9 @@
     <import index="1i04" ref="r:3270011d-8b2d-4938-8dff-d256a759e017(jetbrains.mps.lang.behavior.structure)" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -63,7 +66,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -182,7 +184,7 @@
                               <node concept="3A2sRY" id="2q9s7foHltT" role="2Oq$k0">
                                 <ref role="3A2yKK" node="2q9s7foHlh_" resolve="sce" />
                               </node>
-                              <node concept="2qgKlT" id="2q9s7foHmFU" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og3l" role="2OqNvi">
                                 <ref role="37wK5l" to="csvn:2k7p7sTvKkn" resolve="getSuperConcept" />
                               </node>
                             </node>
@@ -229,7 +231,7 @@
                           <node concept="3A2sRY" id="2q9s7foHmRe" role="2Oq$k0">
                             <ref role="3A2yKK" node="2q9s7foHmQ$" resolve="sne" />
                           </node>
-                          <node concept="2qgKlT" id="2q9s7foHo5b" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og3n" role="2OqNvi">
                             <ref role="37wK5l" to="csvn:4xnLoJyFYX5" resolve="isEnclosingMethodStatic" />
                           </node>
                         </node>
@@ -251,7 +253,7 @@
                                       <node concept="3A2sRY" id="2q9s7foHo8f" role="2Oq$k0">
                                         <ref role="3A2yKK" node="2q9s7foHmQ$" resolve="sne" />
                                       </node>
-                                      <node concept="2qgKlT" id="2q9s7foHpW0" role="2OqNvi">
+                                      <node concept="3zqWPK" id="M_dau6Og3p" role="2OqNvi">
                                         <ref role="37wK5l" to="csvn:2k7p7sTvKkn" resolve="getSuperConcept" />
                                       </node>
                                     </node>
@@ -281,7 +283,7 @@
                                         <node concept="3A2sRY" id="2q9s7foHpWA" role="2Oq$k0">
                                           <ref role="3A2yKK" node="2q9s7foHmQ$" resolve="sne" />
                                         </node>
-                                        <node concept="2qgKlT" id="2q9s7foHpWB" role="2OqNvi">
+                                        <node concept="3zqWPK" id="M_dau6Og3r" role="2OqNvi">
                                           <ref role="37wK5l" to="csvn:2k7p7sTvKkn" resolve="getSuperConcept" />
                                         </node>
                                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
index f948544e..17c80ea6 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -84,7 +84,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index abc8d0c6..ffd9680b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -22,6 +22,9 @@
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -147,7 +150,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -1079,11 +1081,11 @@
                             <node concept="3A2sRY" id="7LI_gNMXkT0" role="2Oq$k0">
                               <ref role="3A2yKK" node="7LI_gNMXkRz" resolve="qp" />
                             </node>
-                            <node concept="2qgKlT" id="7LI_gNMXl9x" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6OgcX" role="2OqNvi">
                               <ref role="37wK5l" to="x5bw:5EDW3XEbK7c" resolve="getQueryTemplate" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="7LI_gNMXB1c" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6OgcZ" role="2OqNvi">
                             <ref role="37wK5l" to="x5bw:7LI_gNMXm_R" resolve="getQueryClassifier" />
                           </node>
                         </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
index 210bd9a6..25fa474b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -72,7 +72,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps
index 2162fe6e..4cd5755d 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps
@@ -17,6 +17,9 @@
     <import index="tp22" ref="r:00000000-0000-4000-0000-011c89590306(jetbrains.mps.lang.constraints.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -92,7 +95,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
@@ -314,7 +316,7 @@
                                         <node concept="37vLTw" id="3ZfjIHtCMVJ" role="2Oq$k0">
                                           <ref role="3cqZAo" node="2_ZlElkqgbt" resolve="defaultScope" />
                                         </node>
-                                        <node concept="2qgKlT" id="3ZfjIHtCMVK" role="2OqNvi">
+                                        <node concept="3zqWPK" id="M_dau6Og4f" role="2OqNvi">
                                           <ref role="37wK5l" to="tp22:hEwIhhr" resolve="getReferentConcept" />
                                         </node>
                                       </node>
@@ -780,7 +782,7 @@
                                         <node concept="37vLTw" id="3GM_nagTxcC" role="2Oq$k0">
                                           <ref role="3cqZAo" node="5RKjesl1UWL" resolve="defaultScope" />
                                         </node>
-                                        <node concept="2qgKlT" id="5RKjesl1UXh" role="2OqNvi">
+                                        <node concept="3zqWPK" id="M_dau6Og4h" role="2OqNvi">
                                           <ref role="37wK5l" to="tp22:hEwIhhr" resolve="getReferentConcept" />
                                         </node>
                                       </node>
@@ -1089,7 +1091,7 @@
                   <ref role="3A2yKK" node="3ZfjIHtCTG9" resolve="cfpn" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="haqRxcm" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og4j" role="2OqNvi">
                 <ref role="37wK5l" to="tp22:hEwIMWq" resolve="getApplicableConcept" />
               </node>
             </node>
@@ -1112,7 +1114,7 @@
                       <ref role="3A2yKK" node="3ZfjIHtCTG9" resolve="cfpn" />
                     </node>
                   </node>
-                  <node concept="2qgKlT" id="3oQug8hr9PV" role="2OqNvi">
+                  <node concept="3zqWPK" id="M_dau6Og4l" role="2OqNvi">
                     <ref role="37wK5l" to="tp22:hEwIhhr" resolve="getReferentConcept" />
                   </node>
                 </node>
@@ -1366,7 +1368,7 @@
                         <ref role="3A2yKK" node="3ZfjIHtCVmA" resolve="cfp" />
                       </node>
                     </node>
-                    <node concept="2qgKlT" id="haqRx6B" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og4n" role="2OqNvi">
                       <ref role="37wK5l" to="tp22:hEwIoOT" resolve="getApplicableConcept" />
                     </node>
                   </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
index 1f2ddbb2..030545d6 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -72,7 +72,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
index d3006eb4..555b625b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
@@ -21,6 +21,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -120,7 +123,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -322,7 +324,7 @@
                                 <ref role="cht4Q" to="tpf8:6suuiWX$OMG" resolve="ContextVariableProvider" />
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="6suuiWXKFNR" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Ogae" role="2OqNvi">
                               <ref role="37wK5l" to="tpfh:6suuiWX_oN7" resolve="contextVariables" />
                             </node>
                           </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
index b4f02ac5..a17ee20f 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -72,7 +72,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps
index e3d83044..47cf6086 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps
@@ -24,6 +24,9 @@
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -153,7 +156,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -1824,7 +1826,7 @@
                 </node>
                 <node concept="2OqwBi" id="1vDgt48NGPP" role="33vP2m">
                   <node concept="2OqwBi" id="1vDgt48NGPQ" role="2Oq$k0">
-                    <node concept="2qgKlT" id="QzR6ThxNzG" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Ogdf" role="2OqNvi">
                       <ref role="37wK5l" to="tpfh:QzR6ThtRo7" resolve="getTemplate" />
                     </node>
                     <node concept="3A2sRY" id="3ZfjIHumnFT" role="2Oq$k0">
@@ -1891,9 +1893,9 @@
                       <node concept="37vLTw" id="27AGqGE$Dn6" role="2Oq$k0">
                         <ref role="3cqZAo" node="1vDgt48NGPV" resolve="ruleApplicableConcept" />
                       </node>
-                      <node concept="2qgKlT" id="73yVtVm0w7q" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Ogdh" role="2OqNvi">
                         <ref role="37wK5l" to="tpcn:73yVtVlWOga" resolve="isSubconceptOf" />
-                        <node concept="37vLTw" id="73yVtVm0wgL" role="37wK5m">
+                        <node concept="37vLTw" id="M_dau6Ogdj" role="37wK5m">
                           <ref role="3cqZAo" node="1vDgt48NGPN" resolve="templateApplicableConcept" />
                         </node>
                       </node>
@@ -1969,7 +1971,7 @@
                       <ref role="37wK5l" to="tpeq:EDoXYsb2Yk" resolve="closestConceptNode" />
                       <ref role="1Pybhc" to="tpeq:h9nq4jh" resolve="RulesUtil" />
                       <node concept="2OqwBi" id="3ZfjIHumtww" role="37wK5m">
-                        <node concept="2qgKlT" id="3ZfjIHumtwx" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogdk" role="2OqNvi">
                           <ref role="37wK5l" to="tpfh:hEwJbaf" resolve="getTemplateType" />
                         </node>
                         <node concept="3A2sRY" id="3ZfjIHumtwy" role="2Oq$k0">
@@ -2089,18 +2091,18 @@
                     <ref role="3Tt5mk" to="tpf8:gZ0HIsK" resolve="applicableConcept" />
                   </node>
                 </node>
-                <node concept="2qgKlT" id="3ZfjIHumrmD" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Ogdm" role="2OqNvi">
                   <ref role="37wK5l" to="tpcn:73yVtVlWOga" resolve="isSubconceptOf" />
-                  <node concept="2OqwBi" id="3ZfjIHumrNu" role="37wK5m">
-                    <node concept="2OqwBi" id="3ZfjIHumr_e" role="2Oq$k0">
-                      <node concept="3A2sRY" id="3ZfjIHumrqI" role="2Oq$k0">
+                  <node concept="2OqwBi" id="M_dau6Ogdo" role="37wK5m">
+                    <node concept="2OqwBi" id="M_dau6Ogdp" role="2Oq$k0">
+                      <node concept="3A2sRY" id="M_dau6Ogdq" role="2Oq$k0">
                         <ref role="3A2yKK" node="3ZfjIHumpnZ" resolve="bmr" />
                       </node>
-                      <node concept="3TrEf2" id="3ZfjIHumrAZ" role="2OqNvi">
+                      <node concept="3TrEf2" id="M_dau6Ogdr" role="2OqNvi">
                         <ref role="3Tt5mk" to="tpf8:husgKN8" resolve="labelDeclaration" />
                       </node>
                     </node>
-                    <node concept="3TrEf2" id="3ZfjIHums1u" role="2OqNvi">
+                    <node concept="3TrEf2" id="M_dau6Ogds" role="2OqNvi">
                       <ref role="3Tt5mk" to="tpf8:hurTdLu" resolve="sourceConcept" />
                     </node>
                   </node>
@@ -2319,7 +2321,7 @@
               <node concept="3A2sRY" id="3ZfjIHumzzI" role="2Oq$k0">
                 <ref role="3A2yKK" node="3ZfjIHumzaz" resolve="prmr" />
               </node>
-              <node concept="2qgKlT" id="3ZfjIHumzzJ" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogdt" role="2OqNvi">
                 <ref role="37wK5l" to="tpfh:1$dcvTE6OGV" resolve="getConcept" />
               </node>
             </node>
@@ -2407,7 +2409,7 @@
                                   <node concept="3A2sRY" id="3ZfjIHumBGl" role="2Oq$k0">
                                     <ref role="3A2yKK" node="3ZfjIHumzaz" resolve="prmr" />
                                   </node>
-                                  <node concept="2qgKlT" id="3ZfjIHumCcb" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Ogdv" role="2OqNvi">
                                     <ref role="37wK5l" to="tpfh:1$dcvTE731L" resolve="getTemplateType" />
                                   </node>
                                 </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
index 9587dfaa..233ca206 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -75,7 +75,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps
index b023a32f..7e75b0f3 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps
@@ -23,6 +23,9 @@
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -94,7 +97,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -472,7 +474,7 @@
                               <node concept="37vLTw" id="5sDn0Onncbx" role="2Oq$k0">
                                 <ref role="3cqZAo" node="2r4rhgaHeAd" resolve="link" />
                               </node>
-                              <node concept="2qgKlT" id="5sDn0OnncEA" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og2M" role="2OqNvi">
                                 <ref role="37wK5l" to="tpcn:hEwIfAt" resolve="isSingular" />
                               </node>
                             </node>
@@ -808,7 +810,7 @@
                     <node concept="3A2sRY" id="127bLwWTm76" role="2Oq$k0">
                       <ref role="3A2yKK" node="127bLwWThY6" resolve="lpvd" />
                     </node>
-                    <node concept="2qgKlT" id="127bLwWTm77" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og2O" role="2OqNvi">
                       <ref role="37wK5l" to="tpcu:1avfQ4BEFo6" resolve="getLink" />
                     </node>
                   </node>
@@ -1265,7 +1267,7 @@
                                     <node concept="3A2sRY" id="127bLwWXxxB" role="2Oq$k0">
                                       <ref role="3A2yKK" node="127bLwWXwi6" resolve="ppvd" />
                                     </node>
-                                    <node concept="2qgKlT" id="127bLwWXy$7" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og2Q" role="2OqNvi">
                                       <ref role="37wK5l" to="tpcu:121FNPYBLc9" resolve="getPropertyDeclaration" />
                                     </node>
                                   </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
index eb0f2541..8d99bab1 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -74,7 +74,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
index db2da6bf..482b37f9 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
@@ -23,6 +23,9 @@
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -108,7 +111,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -460,7 +462,7 @@
                         <node concept="3A2sRY" id="5zhVuyLcHoz" role="2Oq$k0">
                           <ref role="3A2yKK" node="5zhVuyLcGia" resolve="nbil" />
                         </node>
-                        <node concept="2qgKlT" id="5zhVuyLcHMD" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og8W" role="2OqNvi">
                           <ref role="37wK5l" to="ii9q:1o$2SUuvJqx" resolve="getInitValue" />
                         </node>
                       </node>
@@ -493,7 +495,7 @@
                               <ref role="3Tt5mk" to="tp3r:4IP40Bi38Ss" resolve="link" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="5zhVuyLcHbX" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og8Y" role="2OqNvi">
                             <ref role="37wK5l" to="tpcn:hEwIfAt" resolve="isSingular" />
                           </node>
                         </node>
@@ -632,7 +634,7 @@
                         <node concept="3A2sRY" id="5zhVuyLcLe8" role="2Oq$k0">
                           <ref role="3A2yKK" node="5zhVuyLcL8t" resolve="nbip" />
                         </node>
-                        <node concept="2qgKlT" id="5zhVuyLcLzt" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Og90" role="2OqNvi">
                           <ref role="37wK5l" to="ii9q:1o$2SUuvKUZ" resolve="getInitValue" />
                         </node>
                       </node>
@@ -1108,7 +1110,7 @@
                                   <node concept="3A2sRY" id="5c7SrrUYqyM" role="2Oq$k0">
                                     <ref role="3A2yKK" node="5c7SrrUYoSY" resolve="a" />
                                   </node>
-                                  <node concept="2qgKlT" id="5c7SrrUYqyN" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og92" role="2OqNvi">
                                     <ref role="37wK5l" to="ii9q:5e7X3XC_mgR" resolve="getAttributedLink" />
                                   </node>
                                 </node>
@@ -1147,7 +1149,7 @@
                             <node concept="3A2sRY" id="5c7SrrUYqOz" role="2Oq$k0">
                               <ref role="3A2yKK" node="5c7SrrUYoSY" resolve="a" />
                             </node>
-                            <node concept="2qgKlT" id="5c7SrrUYqO$" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og94" role="2OqNvi">
                               <ref role="37wK5l" to="ii9q:5e7X3XC_mgR" resolve="getAttributedLink" />
                             </node>
                           </node>
@@ -1298,7 +1300,7 @@
                           <node concept="3A2sRY" id="5c7SrrUY_VF" role="2Oq$k0">
                             <ref role="3A2yKK" node="5c7SrrUYuG1" resolve="pa" />
                           </node>
-                          <node concept="2qgKlT" id="5c7SrrUYApp" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og96" role="2OqNvi">
                             <ref role="37wK5l" to="tpcu:121FNPYBLc9" resolve="getPropertyDeclaration" />
                           </node>
                         </node>
@@ -1385,7 +1387,7 @@
                             <node concept="3A2sRY" id="5c7SrrUYCVn" role="2Oq$k0">
                               <ref role="3A2yKK" node="5c7SrrUYCre" resolve="ra" />
                             </node>
-                            <node concept="2qgKlT" id="5c7SrrUYDoZ" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og98" role="2OqNvi">
                               <ref role="37wK5l" to="tpcu:1avfQ4BEFo6" resolve="getLink" />
                             </node>
                           </node>
@@ -1400,7 +1402,7 @@
                                   <node concept="3A2sRY" id="5c7SrrUYEV6" role="2Oq$k0">
                                     <ref role="3A2yKK" node="5c7SrrUYCre" resolve="ra" />
                                   </node>
-                                  <node concept="2qgKlT" id="5c7SrrUYEV7" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og9a" role="2OqNvi">
                                     <ref role="37wK5l" to="tpcu:1avfQ4BEFo6" resolve="getLink" />
                                   </node>
                                 </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
index 39111f74..3023e8d7 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -66,7 +66,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
index b86902ca..b8d1052e 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -70,7 +70,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
index f5f61387..1938c1ff 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -74,7 +74,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
index 61039a6f..6b181dbc 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -82,7 +82,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
index 4c497d2c..3dc1c31b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
@@ -38,6 +38,9 @@
         <child id="1238853845806" name="component" index="1Lso8e" />
       </concept>
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -290,7 +293,6 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -620,7 +622,7 @@
                   <ref role="3Tt5mk" to="tp25:5zEkxuKhrAO" resolve="qualifier" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="6tm4iVtNLQ1" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OgaU" role="2OqNvi">
                 <ref role="37wK5l" to="tpeu:5zEkxuKhyRq" resolve="getTargetConcept" />
               </node>
             </node>
@@ -867,18 +869,18 @@
                   <ref role="3Tt5mk" to="tp25:2SljyToQhW6" resolve="ref" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="6tm4iVtPg0s" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OgaW" role="2OqNvi">
                 <ref role="37wK5l" to="xlb7:46J8CTY3sAt" resolve="toNode" />
-                <node concept="2OqwBi" id="6tm4iVtPg0t" role="37wK5m">
-                  <node concept="2JrnkZ" id="6tm4iVtPg0u" role="2Oq$k0">
-                    <node concept="2OqwBi" id="6tm4iVtPg0v" role="2JrQYb">
-                      <node concept="3A2sRY" id="6tm4iVtPg0w" role="2Oq$k0">
+                <node concept="2OqwBi" id="M_dau6OgaY" role="37wK5m">
+                  <node concept="2JrnkZ" id="M_dau6OgaZ" role="2Oq$k0">
+                    <node concept="2OqwBi" id="M_dau6Ogb0" role="2JrQYb">
+                      <node concept="3A2sRY" id="M_dau6Ogb1" role="2Oq$k0">
                         <ref role="3A2yKK" node="6tm4iVtPebd" resolve="pai" />
                       </node>
-                      <node concept="I4A8Y" id="6tm4iVtPg0x" role="2OqNvi" />
+                      <node concept="I4A8Y" id="M_dau6Ogb2" role="2OqNvi" />
                     </node>
                   </node>
-                  <node concept="liA8E" id="6tm4iVtPg0y" role="2OqNvi">
+                  <node concept="liA8E" id="M_dau6Ogb3" role="2OqNvi">
                     <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
@@ -1084,7 +1086,7 @@
                             <node concept="3A2sRY" id="6tm4iVtP$fb" role="2Oq$k0">
                               <ref role="3A2yKK" node="6tm4iVtPsVg" resolve="oplq" />
                             </node>
-                            <node concept="2qgKlT" id="6tm4iVtP$VZ" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Ogb4" role="2OqNvi">
                               <ref role="37wK5l" to="tpeu:2LDtYz_plxI" resolve="getLinkMetaclass" />
                             </node>
                           </node>
@@ -1467,7 +1469,7 @@
                                       <node concept="3A2sRY" id="6tm4iVtRPnR" role="2Oq$k0">
                                         <ref role="3A2yKK" node="6tm4iVtROHj" resolve="anre" />
                                       </node>
-                                      <node concept="2qgKlT" id="6tm4iVtRPEb" role="2OqNvi">
+                                      <node concept="3zqWPK" id="M_dau6Ogb6" role="2OqNvi">
                                         <ref role="37wK5l" to="tpeu:36vPRrqnscn" resolve="getTargetNode" />
                                       </node>
                                     </node>
@@ -1491,7 +1493,7 @@
               <node concept="3A2sRY" id="6tm4iVtRQ00" role="2Oq$k0">
                 <ref role="3A2yKK" node="6tm4iVtROHj" resolve="anre" />
               </node>
-              <node concept="2qgKlT" id="6tm4iVtRQ01" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogb8" role="2OqNvi">
                 <ref role="37wK5l" to="tpeu:36vPRrqnscn" resolve="getTargetNode" />
               </node>
             </node>
@@ -1747,7 +1749,7 @@
             <node concept="3A2sRY" id="6tm4iVtQzrr" role="2Oq$k0">
               <ref role="3A2yKK" node="6tm4iVtQyQX" resolve="npro" />
             </node>
-            <node concept="2qgKlT" id="6tm4iVtQzN$" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Ogba" role="2OqNvi">
               <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
             </node>
           </node>
@@ -1765,7 +1767,7 @@
                         <node concept="3A2sRY" id="6tm4iVtQ$us" role="2Oq$k0">
                           <ref role="3A2yKK" node="6tm4iVtQyQX" resolve="npro" />
                         </node>
-                        <node concept="2qgKlT" id="6tm4iVtQAdn" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogbc" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -2659,7 +2661,7 @@
                         <node concept="3A2sRY" id="6tm4iVtTKIV" role="2Oq$k0">
                           <ref role="3A2yKK" node="6tm4iVtTEO$" resolve="oco" />
                         </node>
-                        <node concept="2qgKlT" id="6tm4iVtTLhI" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogbe" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -3757,7 +3759,7 @@
                             <node concept="37vLTw" id="5OjpQKwc2Oy" role="2Oq$k0">
                               <ref role="3cqZAo" node="3bgqfmmM$g0" resolve="origin" />
                             </node>
-                            <node concept="2qgKlT" id="5OjpQKwc2O$" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Ogbg" role="2OqNvi">
                               <ref role="37wK5l" to="tpcn:hMuxyK2" resolve="getImmediateSuperconcepts" />
                             </node>
                           </node>
@@ -5031,9 +5033,9 @@
                 <node concept="3A2sRY" id="5OjpQKwiPh9" role="2Oq$k0">
                   <ref role="3A2yKK" node="5OjpQKwiNUr" resolve="sno" />
                 </node>
-                <node concept="2qgKlT" id="5OjpQKwiPha" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Ogbi" role="2OqNvi">
                   <ref role="37wK5l" to="tpeu:hEwJdHG" resolve="getParameter" />
-                  <node concept="35c_gC" id="5OjpQKwiPhb" role="37wK5m">
+                  <node concept="35c_gC" id="M_dau6Ogbk" role="37wK5m">
                     <ref role="35c_gD" to="tp25:gDxMEHC" resolve="OperationParm_Concept" />
                   </node>
                 </node>
@@ -5055,9 +5057,9 @@
                 <node concept="3A2sRY" id="5OjpQKwiPsc" role="2Oq$k0">
                   <ref role="3A2yKK" node="5OjpQKwiNUr" resolve="sno" />
                 </node>
-                <node concept="2qgKlT" id="5OjpQKwiPsd" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Ogbl" role="2OqNvi">
                   <ref role="37wK5l" to="tpeu:hEwJdHG" resolve="getParameter" />
-                  <node concept="35c_gC" id="5OjpQKwiPse" role="37wK5m">
+                  <node concept="35c_gC" id="M_dau6Ogbn" role="37wK5m">
                     <ref role="35c_gD" to="tp25:gNgmYLL" resolve="OperationParm_ConceptList" />
                   </node>
                 </node>
@@ -5822,9 +5824,9 @@
             <node concept="3A2sRY" id="6RzTUCTm2kl" role="2Oq$k0">
               <ref role="3A2yKK" node="6$6scRbXE2W" resolve="cd" />
             </node>
-            <node concept="2qgKlT" id="6RzTUCTm2km" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Ogbo" role="2OqNvi">
               <ref role="37wK5l" to="tpcn:2A8AB0rAWpG" resolve="getAllSuperConcepts" />
-              <node concept="3clFbT" id="6RzTUCTm2kn" role="37wK5m" />
+              <node concept="3clFbT" id="M_dau6Ogbq" role="37wK5m" />
             </node>
           </node>
         </node>
@@ -6197,7 +6199,7 @@
                         <node concept="3A2sRY" id="3bgqfmmLCtO" role="2Oq$k0">
                           <ref role="3A2yKK" node="3bgqfmmLCsp" resolve="co" />
                         </node>
-                        <node concept="2qgKlT" id="3bgqfmmLCKs" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogbr" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -7035,7 +7037,7 @@
                         <node concept="3A2sRY" id="6RzTUCSY03F" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCSXZAP" resolve="ndo" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCSY0q1" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogbt" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -7254,7 +7256,7 @@
               <node concept="3A2sRY" id="6RzTUCSY82I" role="2Oq$k0">
                 <ref role="3A2yKK" node="6RzTUCSY7nI" resolve="gco" />
               </node>
-              <node concept="2qgKlT" id="6RzTUCSY82J" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogbv" role="2OqNvi">
                 <ref role="37wK5l" to="tpeu:30XARhxpW1K" resolve="getLinkQualifier" />
               </node>
             </node>
@@ -7421,7 +7423,7 @@
                         <node concept="3A2sRY" id="6RzTUCSYf_9" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCSYcUZ" resolve="gco" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCSYfVJ" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogbx" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -8091,7 +8093,7 @@
                         <node concept="3A2sRY" id="6RzTUCSYwLX" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCSYw7g" resolve="gsco" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCSYwEg" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogbz" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -8327,7 +8329,7 @@
                               <node concept="3A2sRY" id="6RzTUCTjcCH" role="2Oq$k0">
                                 <ref role="3A2yKK" node="6RzTUCSY_Bu" resolve="iioo" />
                               </node>
-                              <node concept="2qgKlT" id="6RzTUCTjd5R" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Ogb_" role="2OqNvi">
                                 <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                               </node>
                             </node>
@@ -8525,18 +8527,18 @@
               <node concept="37vLTw" id="6RzTUCTjTYJ" role="2Oq$k0">
                 <ref role="3cqZAo" node="6RzTUCTjK8y" resolve="ref" />
               </node>
-              <node concept="2qgKlT" id="6RzTUCTjTYK" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OgbB" role="2OqNvi">
                 <ref role="37wK5l" to="xlb7:46J8CTY3sAt" resolve="toNode" />
-                <node concept="2OqwBi" id="6RzTUCTjTYL" role="37wK5m">
-                  <node concept="liA8E" id="6RzTUCTjTYM" role="2OqNvi">
+                <node concept="2OqwBi" id="M_dau6OgbD" role="37wK5m">
+                  <node concept="liA8E" id="M_dau6OgbE" role="2OqNvi">
                     <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                   </node>
-                  <node concept="2JrnkZ" id="6RzTUCTjTYN" role="2Oq$k0">
-                    <node concept="2OqwBi" id="6RzTUCTjTYO" role="2JrQYb">
-                      <node concept="3A2sRY" id="6RzTUCTjTYP" role="2Oq$k0">
+                  <node concept="2JrnkZ" id="M_dau6OgbF" role="2Oq$k0">
+                    <node concept="2OqwBi" id="M_dau6OgbG" role="2JrQYb">
+                      <node concept="3A2sRY" id="M_dau6OgbH" role="2Oq$k0">
                         <ref role="3A2yKK" node="6RzTUCTjIzZ" resolve="io" />
                       </node>
-                      <node concept="I4A8Y" id="6RzTUCTjTYQ" role="2OqNvi" />
+                      <node concept="I4A8Y" id="M_dau6OgbI" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
@@ -8577,7 +8579,7 @@
                             <node concept="3A2sRY" id="6RzTUCTjXR$" role="2Oq$k0">
                               <ref role="3A2yKK" node="6RzTUCTjIzZ" resolve="io" />
                             </node>
-                            <node concept="2qgKlT" id="6RzTUCTjYg$" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6OgbJ" role="2OqNvi">
                               <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                             </node>
                           </node>
@@ -8869,7 +8871,7 @@
                         <node concept="3A2sRY" id="6RzTUCTkgpN" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCTkepy" resolve="po" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTkgIj" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6OgbL" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -8961,18 +8963,18 @@
                   <ref role="3Tt5mk" to="tp25:6qMaajV39im" resolve="ref" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="6tm4iVtSccc" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OgbN" role="2OqNvi">
                 <ref role="37wK5l" to="xlb7:46J8CTY3sAt" resolve="toNode" />
-                <node concept="2OqwBi" id="6tm4iVtSccd" role="37wK5m">
-                  <node concept="liA8E" id="6tm4iVtScce" role="2OqNvi">
+                <node concept="2OqwBi" id="M_dau6OgbP" role="37wK5m">
+                  <node concept="liA8E" id="M_dau6OgbQ" role="2OqNvi">
                     <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                   </node>
-                  <node concept="2JrnkZ" id="6tm4iVtSccf" role="2Oq$k0">
-                    <node concept="2OqwBi" id="6tm4iVtSccg" role="2JrQYb">
-                      <node concept="3A2sRY" id="6tm4iVtScch" role="2Oq$k0">
+                  <node concept="2JrnkZ" id="M_dau6OgbR" role="2Oq$k0">
+                    <node concept="2OqwBi" id="M_dau6OgbS" role="2JrQYb">
+                      <node concept="3A2sRY" id="M_dau6OgbT" role="2Oq$k0">
                         <ref role="3A2yKK" node="6RzTUCTkou1" resolve="npe" />
                       </node>
-                      <node concept="I4A8Y" id="6tm4iVtScci" role="2OqNvi" />
+                      <node concept="I4A8Y" id="M_dau6OgbU" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
@@ -10877,7 +10879,7 @@
             <node concept="3j8tct" id="6RzTUCSVwgn" role="2Oq$k0">
               <ref role="3j8tcu" node="6RzTUCSVvXm" resolve="primdt" />
             </node>
-            <node concept="2qgKlT" id="6RzTUCSVwNc" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6OgbV" role="2OqNvi">
               <ref role="37wK5l" to="tpcn:hKtG1tp" resolve="isBoolean" />
             </node>
           </node>
@@ -10899,7 +10901,7 @@
               <node concept="3j8tct" id="6RzTUCSVxGY" role="2Oq$k0">
                 <ref role="3j8tcu" node="6RzTUCSVvXm" resolve="primdt" />
               </node>
-              <node concept="2qgKlT" id="6RzTUCSVyfN" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OgbX" role="2OqNvi">
                 <ref role="37wK5l" to="tpcn:hKtFYCF" resolve="isInteger" />
               </node>
             </node>
@@ -10922,7 +10924,7 @@
               <node concept="3j8tct" id="6RzTUCSVyoy" role="2Oq$k0">
                 <ref role="3j8tcu" node="6RzTUCSVvXm" resolve="primdt" />
               </node>
-              <node concept="2qgKlT" id="6RzTUCSVyOv" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OgbZ" role="2OqNvi">
                 <ref role="37wK5l" to="tpcn:hKtFRO6" resolve="isString" />
               </node>
             </node>
@@ -10962,7 +10964,7 @@
             <node concept="3j8tct" id="6RzTUCSVz6X" role="2Oq$k0">
               <ref role="3j8tcu" node="6RzTUCSVz7q" resolve="enumdt" />
             </node>
-            <node concept="2qgKlT" id="6RzTUCSVzSI" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Ogc1" role="2OqNvi">
               <ref role="37wK5l" to="tpcn:hKtGHoM" resolve="isEnumOfBoolean" />
             </node>
           </node>
@@ -10984,7 +10986,7 @@
               <node concept="3j8tct" id="6RzTUCSVz77" role="2Oq$k0">
                 <ref role="3j8tcu" node="6RzTUCSVz7q" resolve="enumdt" />
               </node>
-              <node concept="2qgKlT" id="6RzTUCSV$5h" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogc3" role="2OqNvi">
                 <ref role="37wK5l" to="tpcn:hKtGCmu" resolve="isEnumOfInteger" />
               </node>
             </node>
@@ -11007,7 +11009,7 @@
               <node concept="3j8tct" id="6RzTUCSVz7h" role="2Oq$k0">
                 <ref role="3j8tcu" node="6RzTUCSVz7q" resolve="enumdt" />
               </node>
-              <node concept="2qgKlT" id="6RzTUCSV$gO" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Ogc5" role="2OqNvi">
                 <ref role="37wK5l" to="tpcn:hKtGw8K" resolve="isEnumOfString" />
               </node>
             </node>
@@ -11394,7 +11396,7 @@
                         <node concept="3A2sRY" id="3bgqfmmKxfL" role="2Oq$k0">
                           <ref role="3A2yKK" node="3bgqfmmKxeH" resolve="cne" />
                         </node>
-                        <node concept="2qgKlT" id="3bgqfmmKxyn" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogc7" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -11470,7 +11472,7 @@
                         <node concept="3A2sRY" id="3bgqfmmKND8" role="2Oq$k0">
                           <ref role="3A2yKK" node="3bgqfmmKxeH" resolve="cne" />
                         </node>
-                        <node concept="2qgKlT" id="3bgqfmmKND9" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogc9" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -11828,7 +11830,7 @@
                         <node concept="3A2sRY" id="6RzTUCTktfH" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCTksg0" resolve="ano" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTkG70" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcb" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -11918,7 +11920,7 @@
                         <node concept="3A2sRY" id="3lXUvG03W$j" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCTksg0" resolve="ano" />
                         </node>
-                        <node concept="2qgKlT" id="3lXUvG03W$k" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcd" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -12060,7 +12062,7 @@
                         <node concept="3A2sRY" id="6RzTUCTm$DN" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCTm$4d" resolve="asc" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTm_09" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcf" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -12272,7 +12274,7 @@
                         <node concept="3A2sRY" id="6RzTUCTmMP2" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCTmIKU" resolve="gasc" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTmNaz" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogch" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -12486,7 +12488,7 @@
                         <node concept="3A2sRY" id="6RzTUCTmZZc" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCTmYhD" resolve="gasc" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTmZJ3" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcj" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -12716,7 +12718,7 @@
                         <node concept="3A2sRY" id="6RzTUCTn6bu" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCTn4x2" resolve="gdsc" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTn5Wv" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcl" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -13373,7 +13375,7 @@
                         <node concept="3A2sRY" id="6RzTUCTnrR1" role="2Oq$k0">
                           <ref role="3A2yKK" node="6RzTUCTnqft" resolve="co" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTns_1" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcn" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
@@ -13439,7 +13441,7 @@
                         <node concept="3A2sRY" id="3bgqfmmL5B1" role="2Oq$k0">
                           <ref role="3A2yKK" node="3bgqfmmL5A8" resolve="snco" />
                         </node>
-                        <node concept="2qgKlT" id="3bgqfmmLcWR" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcp" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -13599,7 +13601,7 @@
                         <node concept="3A2sRY" id="6RzTUCTkAoX" role="2Oq$k0">
                           <ref role="3A2yKK" node="3bgqfmmL5A8" resolve="snco" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTkAoY" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcr" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -13767,7 +13769,7 @@
                             <node concept="3A2sRY" id="3bgqfmmLs7z" role="2Oq$k0">
                               <ref role="3A2yKK" node="3bgqfmmLocF" resolve="sto" />
                             </node>
-                            <node concept="2qgKlT" id="2q9s7fqjQPi" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Ogct" role="2OqNvi">
                               <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                             </node>
                           </node>
@@ -13880,7 +13882,7 @@
                             <node concept="3A2sRY" id="6RzTUCTk$CK" role="2Oq$k0">
                               <ref role="3A2yKK" node="3bgqfmmLocF" resolve="sto" />
                             </node>
-                            <node concept="2qgKlT" id="2q9s7fqjSNP" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Ogcv" role="2OqNvi">
                               <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                             </node>
                           </node>
@@ -14016,7 +14018,7 @@
                         <node concept="3A2sRY" id="3bgqfmmLsPX" role="2Oq$k0">
                           <ref role="3A2yKK" node="3bgqfmmLsPA" resolve="anco" />
                         </node>
-                        <node concept="2qgKlT" id="3bgqfmmLt8z" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcx" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -14164,7 +14166,7 @@
                         <node concept="3A2sRY" id="6RzTUCTkBUA" role="2Oq$k0">
                           <ref role="3A2yKK" node="3bgqfmmLsPA" resolve="anco" />
                         </node>
-                        <node concept="2qgKlT" id="6RzTUCTkBUB" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Ogcz" role="2OqNvi">
                           <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                         </node>
                       </node>
@@ -14506,7 +14508,7 @@
                             <node concept="3A2sRY" id="6tm4iVtNYpK" role="2Oq$k0">
                               <ref role="3A2yKK" node="6tm4iVtNVXt" resolve="stpo" />
                             </node>
-                            <node concept="2qgKlT" id="6tm4iVtNYOk" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Ogc_" role="2OqNvi">
                               <ref role="37wK5l" to="tpeu:hEwJdGu" resolve="getLeftExpression" />
                             </node>
                           </node>
@@ -15259,7 +15261,7 @@
                 <node concept="3A2sRY" id="6RzTUCSVaFr" role="2Oq$k0">
                   <ref role="3A2yKK" node="6RzTUCSV3hQ" resolve="hvs" />
                 </node>
-                <node concept="2qgKlT" id="6RzTUCSVaFs" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6OgcB" role="2OqNvi">
                   <ref role="37wK5l" to="tpeu:hEwJdHi" resolve="getLeftExpressionOperation" />
                 </node>
               </node>
@@ -15351,7 +15353,7 @@
                                   <node concept="37vLTw" id="6RzTUCSVh9X" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6RzTUCSVbGi" resolve="dt" />
                                   </node>
-                                  <node concept="2qgKlT" id="6RzTUCSVhGN" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6OgcD" role="2OqNvi">
                                     <ref role="37wK5l" to="tpcn:hKtFG6a" resolve="isSimpleString" />
                                   </node>
                                 </node>
@@ -15360,7 +15362,7 @@
                                     <node concept="37vLTw" id="6RzTUCSVhOi" role="2Oq$k0">
                                       <ref role="3cqZAo" node="6RzTUCSVbGi" resolve="dt" />
                                     </node>
-                                    <node concept="2qgKlT" id="6RzTUCSVhVv" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6OgcF" role="2OqNvi">
                                       <ref role="37wK5l" to="tpcn:hKtGkcn" resolve="isSimpleInteger" />
                                     </node>
                                   </node>
@@ -15384,7 +15386,7 @@
                                     <node concept="37vLTw" id="6RzTUCSVi3Y" role="2Oq$k0">
                                       <ref role="3cqZAo" node="6RzTUCSVbGi" resolve="dt" />
                                     </node>
-                                    <node concept="2qgKlT" id="6RzTUCSVi8T" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6OgcH" role="2OqNvi">
                                       <ref role="37wK5l" to="tpcn:hKtGpIQ" resolve="isSimpleBoolean" />
                                     </node>
                                   </node>
@@ -15555,7 +15557,7 @@
                 <node concept="3A2sRY" id="6RzTUCSVq5D" role="2Oq$k0">
                   <ref role="3A2yKK" node="6RzTUCSVoqP" resolve="so" />
                 </node>
-                <node concept="2qgKlT" id="6RzTUCSVq5E" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6OgcJ" role="2OqNvi">
                   <ref role="37wK5l" to="tpeu:hEwJdHi" resolve="getLeftExpressionOperation" />
                 </node>
               </node>
@@ -15951,7 +15953,7 @@
                               <node concept="3A2sRY" id="6tm4iVtUoLi" role="2Oq$k0">
                                 <ref role="3A2yKK" node="6tm4iVtUmO2" resolve="efno" />
                               </node>
-                              <node concept="2qgKlT" id="6tm4iVtUp02" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6OgcL" role="2OqNvi">
                                 <ref role="37wK5l" to="tpeu:66cvXGSmQgk" resolve="getEnumDecl" />
                               </node>
                             </node>
@@ -16038,7 +16040,7 @@
                               <node concept="3A2sRY" id="6tm4iVtUsrt" role="2Oq$k0">
                                 <ref role="3A2yKK" node="6tm4iVtUqBH" resolve="efpo" />
                               </node>
-                              <node concept="2qgKlT" id="6tm4iVtUsMh" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6OgcN" role="2OqNvi">
                                 <ref role="37wK5l" to="tpeu:66cvXGSmQgk" resolve="getEnumDecl" />
                               </node>
                             </node>
@@ -16095,7 +16097,7 @@
                               <node concept="3A2sRY" id="6tm4iVtUuHu" role="2Oq$k0">
                                 <ref role="3A2yKK" node="6tm4iVtUu9h" resolve="eml" />
                               </node>
-                              <node concept="2qgKlT" id="6tm4iVtUv7D" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6OgcP" role="2OqNvi">
                                 <ref role="37wK5l" to="tpeu:66cvXGSmQgk" resolve="getEnumDecl" />
                               </node>
                             </node>
@@ -16156,7 +16158,7 @@
                                   <node concept="3A2sRY" id="6tm4iVtUxJB" role="2Oq$k0">
                                     <ref role="3A2yKK" node="6tm4iVtUw$J" resolve="emo" />
                                   </node>
-                                  <node concept="2qgKlT" id="6tm4iVtUy9H" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6OgcR" role="2OqNvi">
                                     <ref role="37wK5l" to="tpeu:66cvXGSmQgk" resolve="getEnumDecl" />
                                   </node>
                                 </node>
@@ -20572,7 +20574,7 @@
               <node concept="37vLTw" id="3GLv42Mz96T" role="2Oq$k0">
                 <ref role="3cqZAo" node="3GLv42MyEnz" resolve="mdecl" />
               </node>
-              <node concept="2qgKlT" id="3GLv42Mz96U" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6OgcT" role="2OqNvi">
                 <ref role="37wK5l" to="csvn:i3POAMX" resolve="getContainingConcept" />
               </node>
             </node>
@@ -20602,7 +20604,7 @@
                         <node concept="3A2sRY" id="3GLv42MyGUZ" role="2Oq$k0">
                           <ref role="3A2yKK" node="3GLv42MyDYR" resolve="ncmc" />
                         </node>
-                        <node concept="2qgKlT" id="3GLv42MyHtf" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6OgcV" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
index dd261baa..e53c7d5e 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -73,7 +73,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
index 7d0d3a13..92eab43f 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -84,7 +84,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps
index 5728f114..3c52e79b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps
@@ -15,6 +15,9 @@
     <import index="h103" ref="r:9c80bc3e-1982-4e7d-8fe4-1b25a1c02635(jetbrains.mps.lang.typechecking.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -44,7 +47,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -179,11 +181,11 @@
                             <node concept="3A2sRY" id="7LI_gNMXkT0" role="2Oq$k0">
                               <ref role="3A2yKK" node="3vih5250MoZ" resolve="tqp" />
                             </node>
-                            <node concept="2qgKlT" id="3vih5250XG3" role="2OqNvi">
+                            <node concept="3zqWPK" id="M_dau6Og7r" role="2OqNvi">
                               <ref role="37wK5l" to="h103:7lmP5gAYgVD" resolve="getTypecheckingQueryTemplate" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="3vih5250Y3t" role="2OqNvi">
+                          <node concept="3zqWPK" id="M_dau6Og7t" role="2OqNvi">
                             <ref role="37wK5l" to="h103:3vih52511I4" resolve="getQueryClassfier" />
                           </node>
                         </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
index fa01c0f9..2a122fc8 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -81,7 +81,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
index 9923e272..a729e9bf 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
@@ -25,6 +25,9 @@
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
   </imports>
   <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -129,7 +132,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -1238,7 +1240,7 @@
                   <ref role="3Tt5mk" to="tpd4:h5YuTL0" resolve="applicableNode" />
                 </node>
               </node>
-              <node concept="2qgKlT" id="25idkGdl1Ne" role="2OqNvi">
+              <node concept="3zqWPK" id="M_dau6Og8K" role="2OqNvi">
                 <ref role="37wK5l" to="tpdd:hEwIszL" resolve="getApplicableConcept" />
               </node>
             </node>
@@ -1415,9 +1417,9 @@
             <node concept="37vLTw" id="5zhVuyL7GqB" role="2Oq$k0">
               <ref role="3cqZAo" node="25idkGdl1N9" resolve="applicableConcept" />
             </node>
-            <node concept="2qgKlT" id="5zhVuyL7GUy" role="2OqNvi">
+            <node concept="3zqWPK" id="M_dau6Og8M" role="2OqNvi">
               <ref role="37wK5l" to="tpcn:73yVtVlWOga" resolve="isSubconceptOf" />
-              <node concept="3B5_sB" id="19B7r2KNkW" role="37wK5m">
+              <node concept="3B5_sB" id="M_dau6Og8O" role="37wK5m">
                 <ref role="3B5MYn" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
               </node>
             </node>
@@ -4017,7 +4019,7 @@
                           <ref role="3Tt5mk" to="tpd4:h5YbcJD" resolve="pattern" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="4vXWNHn2Z_m" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og8P" role="2OqNvi">
                         <ref role="37wK5l" to="tp2b:4vXWNHn1_L$" resolve="getQuotedNodeConcept" />
                       </node>
                     </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
index 328914e9..0119225d 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
@@ -28,7 +28,7 @@
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -72,7 +72,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps
index 7e13c8fc..c247fb3c 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps
@@ -39,6 +39,9 @@
       </concept>
       <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
@@ -212,7 +215,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -294,7 +296,7 @@
                 <node concept="37vLTw" id="2uP4pEPmbm" role="2Oq$k0">
                   <ref role="3cqZAo" node="2uP4pEPkZz" resolve="node" />
                 </node>
-                <node concept="2qgKlT" id="2uP4pEPl0y" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Oga4" role="2OqNvi">
                   <ref role="37wK5l" to="tpek:4_LVZ3pBKCn" resolve="methods" />
                 </node>
               </node>
@@ -306,7 +308,7 @@
                         <node concept="37vLTw" id="2uP4pEPl0C" role="2Oq$k0">
                           <ref role="3cqZAo" node="6E5fMGvfKVC" resolve="it" />
                         </node>
-                        <node concept="2qgKlT" id="2uP4pEPl0D" role="2OqNvi">
+                        <node concept="3zqWPK" id="M_dau6Oga6" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:28P2dHxCoRl" resolve="isAnAbstractMethod" />
                         </node>
                       </node>
@@ -957,7 +959,7 @@
                                                         <node concept="3xONca" id="MSv3owsiRn" role="2Oq$k0">
                                                           <ref role="3xOPvv" node="MSv3owsgb8" resolve="op1select" />
                                                         </node>
-                                                        <node concept="2qgKlT" id="MSv3owsjjO" role="2OqNvi">
+                                                        <node concept="3zqWPK" id="M_dau6Oga8" role="2OqNvi">
                                                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                                                         </node>
                                                       </node>
@@ -1042,7 +1044,7 @@
                                             <node concept="3xONca" id="MSv3owsqpB" role="2Oq$k0">
                                               <ref role="3xOPvv" node="MSv3owsgb8" resolve="op1select" />
                                             </node>
-                                            <node concept="2qgKlT" id="MSv3owsqpC" role="2OqNvi">
+                                            <node concept="3zqWPK" id="M_dau6Ogaa" role="2OqNvi">
                                               <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                                             </node>
                                           </node>
@@ -1130,7 +1132,7 @@
                                 <node concept="3xONca" id="MSv3owsWFC" role="2Oq$k0">
                                   <ref role="3xOPvv" node="MSv3owsgb8" resolve="op1select" />
                                 </node>
-                                <node concept="2qgKlT" id="MSv3owsWFD" role="2OqNvi">
+                                <node concept="3zqWPK" id="M_dau6Ogac" role="2OqNvi">
                                   <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                                 </node>
                               </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
index 8919fc7b..0810a445 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
@@ -32,7 +32,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:c1f5ad88-21f4-4e0e-927c-48b1ca0c2334:jetbrains.mps.baseLanguage.collectionsExt" version="0" />
     <language slang="l:96eeb076-cd7e-4797-9c2a-348e3f826e65:jetbrains.mps.baseLanguage.function" version="0" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:42d031fd-ccb3-45db-91ef-f9621eb0549e:jetbrains.mps.baseLanguage.javadocExt" version="0" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:88dcbb14-19c3-4776-8f81-33611ca4d87c:jetbrains.mps.baseLanguage.sequence" version="0" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps
index b81c4fd2..4131afdd 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps
@@ -4,7 +4,7 @@
   <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
@@ -261,17 +261,11 @@
       <concept id="8064396509828172209" name="jetbrains.mps.baseLanguage.structure.UnaryMinus" flags="nn" index="1ZRNhn" />
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+      <concept id="5085607816302529296" name="jetbrains.mps.baseLanguage.javadoc.structure.IHoldCommentLines" flags="ngI" index="1VezTd">
+        <child id="5085607816302529587" name="commentBody" index="1Vez_I" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -306,9 +300,9 @@
       <ref role="3uigEE" to="guwi:~Serializable" resolve="Serializable" />
     </node>
     <node concept="3UR2Jj" id="3489cc5$r$v" role="lGtFl">
-      <node concept="TZ5HA" id="3489cc5$r$E" role="TZ5H$">
-        <node concept="1dT_AC" id="3489cc5$r$F" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
+      <node concept="1PaTwC" id="M_dau6Ogvb" role="1Vez_I">
+        <node concept="3oM_SD" id="M_dau6Ogvc" role="1PaTwD">
+          <property role="3oM_SC" value="" />
         </node>
       </node>
     </node>
@@ -1573,9 +1567,9 @@
       <node concept="3Tm1VV" id="3489cc5$lKj" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$lKk" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$lKl" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$r$S" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$r$T" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvd" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogve" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -1668,9 +1662,9 @@
       <node concept="3Tm1VV" id="3489cc5$lK$" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$lK_" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$lKA" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$r_2" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$r_3" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvf" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvg" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -6944,9 +6938,9 @@
       <node concept="3Tm6S6" id="3489cc5$me0" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$me1" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$me2" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$r_c" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$r_d" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvh" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvi" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -7728,9 +7722,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$mis" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$r_A" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$r_B" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvj" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvk" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -8081,9 +8075,9 @@
       <node concept="3Tm6S6" id="3489cc5$mki" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mkj" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mkk" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$r_I" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$r_J" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvl" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvm" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -8153,9 +8147,9 @@
       <node concept="3Tm6S6" id="3489cc5$mkD" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mkE" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mkF" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$r_Q" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$r_R" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvn" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvo" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -8244,9 +8238,9 @@
       <node concept="3Tm6S6" id="3489cc5$mlf" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mlg" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mlh" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$r_U" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$r_V" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvp" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvq" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -8613,9 +8607,9 @@
       <node concept="3Tm6S6" id="3489cc5$mnw" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mnx" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mny" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$r_W" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$r_X" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvr" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvs" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -8714,9 +8708,9 @@
       <node concept="3Tm6S6" id="3489cc5$mo0" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mo1" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mo2" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rA0" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rA1" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvt" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvu" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -9214,9 +9208,9 @@
       <node concept="3Tm6S6" id="3489cc5$mq_" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mqA" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mqB" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rA2" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rA3" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvv" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvw" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -9704,9 +9698,9 @@
       <node concept="3Tm6S6" id="3489cc5$mtf" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mtg" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mth" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rA8" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rA9" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvx" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogvy" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -9968,9 +9962,9 @@
       <node concept="3Tm6S6" id="3489cc5$mut" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$muu" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$muv" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rAc" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rAd" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogvz" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogv$" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -9994,9 +9988,9 @@
         <ref role="3uigEE" to="z60i:~Dimension" resolve="Dimension" />
       </node>
       <node concept="P$JXv" id="3489cc5$muB" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rAg" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rAh" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogv_" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvA" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -12451,9 +12445,9 @@
         <ref role="3uigEE" to="z60i:~Dimension" resolve="Dimension" />
       </node>
       <node concept="P$JXv" id="3489cc5$mG4" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rAi" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rAj" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvB" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvC" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -14904,9 +14898,9 @@
         </node>
       </node>
       <node concept="P$JXv" id="3489cc5$mVq" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rAu" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rAv" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvD" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvE" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -15051,9 +15045,9 @@
       <node concept="3Tm6S6" id="3489cc5$mWm" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$mWn" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mWo" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rB0" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rB1" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvG" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -15208,9 +15202,9 @@
         <ref role="3uigEE" to="z60i:~Dimension" resolve="Dimension" />
       </node>
       <node concept="P$JXv" id="3489cc5$mX7" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rB2" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rB3" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvH" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvI" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -15473,9 +15467,9 @@
         <ref role="3uigEE" to="z60i:~Dimension" resolve="Dimension" />
       </node>
       <node concept="P$JXv" id="3489cc5$mY$" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rB6" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rB7" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvJ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvK" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -15504,9 +15498,9 @@
       <node concept="3Tm1VV" id="3489cc5$mYG" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mYH" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mYI" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rB8" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rB9" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvL" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvM" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -15601,9 +15595,9 @@
       <node concept="3Tm1VV" id="3489cc5$mZg" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$mZh" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mZi" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rBa" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rBb" role="1dT_Ay">
-            <property role="1dT_AB" value="~" />
+        <node concept="1PaTwC" id="M_dau6OgvN" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvO" role="1PaTwD">
+            <property role="3oM_SC" value="~" />
           </node>
         </node>
       </node>
@@ -15802,9 +15796,9 @@
       <node concept="3Tm1VV" id="3489cc5$mZ$" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$mZ_" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$mZA" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rBc" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rBd" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvP" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvQ" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -27843,9 +27837,9 @@
       <node concept="3Tm6S6" id="3489cc5$nUu" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$nUv" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$nUw" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rBs" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rBt" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvR" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvS" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -28084,9 +28078,9 @@
       <node concept="3Tm6S6" id="3489cc5$nVJ" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$nVK" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$nVL" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rCY" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rCZ" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvT" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvU" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -29012,9 +29006,9 @@
       <node concept="3Tm6S6" id="3489cc5$nZM" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$nZN" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$nZO" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rD0" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rD1" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvW" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -30931,9 +30925,9 @@
       <node concept="3Tm6S6" id="3489cc5$o93" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$o94" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$o95" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rDo" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rDp" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvX" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgvY" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -31066,9 +31060,9 @@
       <node concept="3Tm6S6" id="3489cc5$o9C" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$o9D" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$o9E" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rDC" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rDD" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgvZ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogw0" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -31971,9 +31965,9 @@
       <node concept="3Tm6S6" id="3489cc5$odr" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$ods" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$odt" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rDE" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rDF" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogw1" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogw2" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -32230,9 +32224,9 @@
       <node concept="3Tm6S6" id="3489cc5$oeU" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$oeV" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$oeW" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rE6" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rE7" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogw3" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogw4" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -32677,9 +32671,9 @@
       <node concept="3Tm6S6" id="3489cc5$ohg" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$ohh" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$ohi" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rE8" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rE9" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogw5" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogw6" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -33720,9 +33714,9 @@
       <node concept="3Tm6S6" id="3489cc5$olY" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$olZ" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$om0" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rEq" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rEr" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogw7" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogw8" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -34012,9 +34006,9 @@
       <node concept="3Tm1VV" id="3489cc5$on$" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$on_" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$onA" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rEU" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rEV" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogw9" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwa" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -34210,9 +34204,9 @@
       <node concept="3Tm6S6" id="3489cc5$ooE" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$ooF" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$ooG" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rF0" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rF1" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwb" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwc" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -34231,9 +34225,9 @@
       <node concept="3Tm1VV" id="3489cc5$ooL" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$ooM" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$ooN" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rF4" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rF5" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwd" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwe" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -36849,9 +36843,9 @@
       <node concept="3Tmbuc" id="3489cc5$o_Y" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$o_Z" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$oA0" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rF6" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rF7" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwf" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwg" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -41368,9 +41362,9 @@
       <node concept="3Tm6S6" id="3489cc5$p0X" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$p0Y" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$p0Z" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rFU" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rFV" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwh" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwi" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -41645,9 +41639,9 @@
       <node concept="3Tm6S6" id="3489cc5$p2B" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$p2C" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$p2D" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rGk" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rGl" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwj" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwk" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -41905,9 +41899,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$p4h" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rGo" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rGp" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwl" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwm" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -43754,9 +43748,9 @@
       <node concept="3Tm6S6" id="3489cc5$pcv" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$pcw" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pcx" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rGq" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rGr" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwn" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwo" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -44130,9 +44124,9 @@
       <node concept="3Tm6S6" id="3489cc5$peD" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$peE" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$peF" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rHw" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rHx" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwp" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwq" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -44684,9 +44678,9 @@
       <node concept="3Tm6S6" id="3489cc5$phM" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$phN" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$phO" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rHy" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rHz" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwr" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogws" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -45427,9 +45421,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$pm4" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rHE" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rHF" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwt" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwu" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -45593,9 +45587,9 @@
       <node concept="3Tm6S6" id="3489cc5$pn4" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$pn5" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pn6" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rHI" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rHJ" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwv" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogww" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -45768,9 +45762,9 @@
       <node concept="3Tm6S6" id="3489cc5$po9" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$poa" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pob" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rHK" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rHL" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwx" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogwy" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -46104,9 +46098,9 @@
       <node concept="3Tm6S6" id="3489cc5$pq9" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$pqa" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pqb" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rHM" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rHN" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogwz" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogw$" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -46208,9 +46202,9 @@
       <node concept="3Tm6S6" id="3489cc5$pqJ" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$pqK" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pqL" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rHQ" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rHR" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogw_" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwA" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -50376,9 +50370,9 @@
       <node concept="3Tm6S6" id="3489cc5$pNI" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$pNJ" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pNK" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rHU" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rHV" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwB" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwC" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -50498,9 +50492,9 @@
       <node concept="3Tm6S6" id="3489cc5$pOq" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$pOr" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pOs" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIq" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIr" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwD" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwE" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -50897,9 +50891,9 @@
       <node concept="3Tm6S6" id="3489cc5$pQS" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$pQT" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pQU" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIs" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIt" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwG" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -51058,9 +51052,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$pRU" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIu" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIv" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwH" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwI" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -51927,9 +51921,9 @@
       <node concept="3Tm6S6" id="3489cc5$pWF" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$pWG" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pWH" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIw" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIx" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwJ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwK" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -52230,9 +52224,9 @@
       <node concept="3Tm6S6" id="3489cc5$pYv" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$pYw" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$pYx" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rII" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIJ" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwL" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwM" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -53205,9 +53199,9 @@
       <node concept="3Tm6S6" id="3489cc5$q42" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$q43" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$q44" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIK" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIL" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwN" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwO" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -53980,9 +53974,9 @@
       <node concept="3Tm6S6" id="3489cc5$q8m" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$q8n" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$q8o" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIO" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIP" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwP" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwQ" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -54186,9 +54180,9 @@
       <node concept="3Tm6S6" id="3489cc5$q9$" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$q9_" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$q9A" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIQ" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIR" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwR" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwS" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -54316,9 +54310,9 @@
       <node concept="3Tm6S6" id="3489cc5$qak" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qal" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qam" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIS" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIT" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwT" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwU" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -55911,9 +55905,9 @@
       <node concept="3Tm6S6" id="3489cc5$qj6" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$qj7" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qj8" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rIU" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rIV" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwW" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -56607,9 +56601,9 @@
       <node concept="3Tm6S6" id="3489cc5$qmQ" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$qmR" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qmS" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rJ8" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rJ9" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwX" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgwY" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -57837,9 +57831,9 @@
       <node concept="3Tm6S6" id="3489cc5$qrm" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qrn" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qro" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rJa" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rJb" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgwZ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogx0" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -57917,9 +57911,9 @@
       <node concept="3Tm6S6" id="3489cc5$qrI" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qrJ" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qrK" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rJu" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rJv" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogx1" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogx2" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -58008,9 +58002,9 @@
       <node concept="3Tm6S6" id="3489cc5$qs8" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qs9" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qsa" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rJw" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rJx" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogx3" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogx4" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -58136,9 +58130,9 @@
       <node concept="3Tm6S6" id="3489cc5$qsP" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qsQ" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qsR" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rJy" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rJz" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogx5" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogx6" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -58190,9 +58184,9 @@
       <node concept="3Tm1VV" id="3489cc5$qt9" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$qta" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qtb" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rJ$" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rJ_" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogx7" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogx8" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -58336,9 +58330,9 @@
       <node concept="3Tm6S6" id="3489cc5$qtM" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$qtN" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qtO" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rJA" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rJB" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogx9" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogxa" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -58768,9 +58762,42 @@
       <node concept="3Tm6S6" id="3489cc5$qvJ" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$qvK" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qvL" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rJM" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rJN" role="1dT_Ay">
-            <property role="1dT_AB" value="@return next focusable component is found (not the first of the desktop/dialog)" />
+        <node concept="1PaTwC" id="M_dau6Ogxb" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogxc" role="1PaTwD">
+            <property role="3oM_SC" value="@return" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxd" role="1PaTwD">
+            <property role="3oM_SC" value="next" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxe" role="1PaTwD">
+            <property role="3oM_SC" value="focusable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxf" role="1PaTwD">
+            <property role="3oM_SC" value="component" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxg" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxh" role="1PaTwD">
+            <property role="3oM_SC" value="found" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxi" role="1PaTwD">
+            <property role="3oM_SC" value="(not" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxj" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxk" role="1PaTwD">
+            <property role="3oM_SC" value="first" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxl" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxm" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxn" role="1PaTwD">
+            <property role="3oM_SC" value="desktop/dialog)" />
           </node>
         </node>
       </node>
@@ -58907,9 +58934,42 @@
       <node concept="3Tm6S6" id="3489cc5$qwy" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$qwz" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qw$" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rK2" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rK3" role="1dT_Ay">
-            <property role="1dT_AB" value="@return previous focusable component is found (not the last of the desktop/dialog)" />
+        <node concept="1PaTwC" id="M_dau6Ogxo" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogxp" role="1PaTwD">
+            <property role="3oM_SC" value="@return" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxq" role="1PaTwD">
+            <property role="3oM_SC" value="previous" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxr" role="1PaTwD">
+            <property role="3oM_SC" value="focusable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxs" role="1PaTwD">
+            <property role="3oM_SC" value="component" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxt" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxu" role="1PaTwD">
+            <property role="3oM_SC" value="found" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxv" role="1PaTwD">
+            <property role="3oM_SC" value="(not" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxw" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxx" role="1PaTwD">
+            <property role="3oM_SC" value="last" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxy" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogxz" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogx$" role="1PaTwD">
+            <property role="3oM_SC" value="desktop/dialog)" />
           </node>
         </node>
       </node>
@@ -59337,34 +59397,223 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qzk" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rK6" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rK7" role="1dT_Ay">
-            <property role="1dT_AB" value="For the starting component search its parent direction for a focusable component, and then" />
+        <node concept="1PaTwC" id="M_dau6Ogx_" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgxA" role="1PaTwD">
+            <property role="3oM_SC" value="For" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxB" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxC" role="1PaTwD">
+            <property role="3oM_SC" value="starting" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxD" role="1PaTwD">
+            <property role="3oM_SC" value="component" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxE" role="1PaTwD">
+            <property role="3oM_SC" value="search" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxF" role="1PaTwD">
+            <property role="3oM_SC" value="its" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxG" role="1PaTwD">
+            <property role="3oM_SC" value="parent" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxH" role="1PaTwD">
+            <property role="3oM_SC" value="direction" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxI" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxJ" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxK" role="1PaTwD">
+            <property role="3oM_SC" value="focusable" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxL" role="1PaTwD">
+            <property role="3oM_SC" value="component," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxM" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxN" role="1PaTwD">
+            <property role="3oM_SC" value="then" />
           </node>
         </node>
-        <node concept="TZ5HA" id="3489cc5$rK8" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rK9" role="1dT_Ay">
-            <property role="1dT_AB" value="its next component (if not search backward from the component).&lt;br&gt;" />
+        <node concept="1PaTwC" id="M_dau6OgxO" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgxP" role="1PaTwD">
+            <property role="3oM_SC" value="its" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxQ" role="1PaTwD">
+            <property role="3oM_SC" value="next" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxR" role="1PaTwD">
+            <property role="3oM_SC" value="component" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxS" role="1PaTwD">
+            <property role="3oM_SC" value="(if" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxT" role="1PaTwD">
+            <property role="3oM_SC" value="not" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxU" role="1PaTwD">
+            <property role="3oM_SC" value="search" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxV" role="1PaTwD">
+            <property role="3oM_SC" value="backward" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxW" role="1PaTwD">
+            <property role="3oM_SC" value="from" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxX" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgxY" role="1PaTwD">
+            <property role="3oM_SC" value="component).&lt;br&gt;" />
           </node>
         </node>
-        <node concept="TZ5HA" id="3489cc5$rKa" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKb" role="1dT_Ay">
-            <property role="1dT_AB" value="For its parent components check its first component, the current one, and its parent direction" />
+        <node concept="1PaTwC" id="M_dau6OgxZ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogy0" role="1PaTwD">
+            <property role="3oM_SC" value="For" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy1" role="1PaTwD">
+            <property role="3oM_SC" value="its" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy2" role="1PaTwD">
+            <property role="3oM_SC" value="parent" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy3" role="1PaTwD">
+            <property role="3oM_SC" value="components" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy4" role="1PaTwD">
+            <property role="3oM_SC" value="check" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy5" role="1PaTwD">
+            <property role="3oM_SC" value="its" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy6" role="1PaTwD">
+            <property role="3oM_SC" value="first" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy7" role="1PaTwD">
+            <property role="3oM_SC" value="component," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy8" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy9" role="1PaTwD">
+            <property role="3oM_SC" value="current" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogya" role="1PaTwD">
+            <property role="3oM_SC" value="one," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyb" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyc" role="1PaTwD">
+            <property role="3oM_SC" value="its" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyd" role="1PaTwD">
+            <property role="3oM_SC" value="parent" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogye" role="1PaTwD">
+            <property role="3oM_SC" value="direction" />
           </node>
         </node>
-        <node concept="TZ5HA" id="3489cc5$rKc" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKd" role="1dT_Ay">
-            <property role="1dT_AB" value="(backward search), or its parent, then next component (forward direction).&lt;br&gt;" />
+        <node concept="1PaTwC" id="M_dau6Ogyf" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogyg" role="1PaTwD">
+            <property role="3oM_SC" value="(backward" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyh" role="1PaTwD">
+            <property role="3oM_SC" value="search)," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyi" role="1PaTwD">
+            <property role="3oM_SC" value="or" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyj" role="1PaTwD">
+            <property role="3oM_SC" value="its" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyk" role="1PaTwD">
+            <property role="3oM_SC" value="parent," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyl" role="1PaTwD">
+            <property role="3oM_SC" value="then" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogym" role="1PaTwD">
+            <property role="3oM_SC" value="next" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyn" role="1PaTwD">
+            <property role="3oM_SC" value="component" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyo" role="1PaTwD">
+            <property role="3oM_SC" value="(forward" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyp" role="1PaTwD">
+            <property role="3oM_SC" value="direction).&lt;br&gt;" />
           </node>
         </node>
-        <node concept="TZ5HA" id="3489cc5$rKe" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKf" role="1dT_Ay">
-            <property role="1dT_AB" value="For the rest components check the next, then the first subcomponent direction, and finally" />
+        <node concept="1PaTwC" id="M_dau6Ogyq" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogyr" role="1PaTwD">
+            <property role="3oM_SC" value="For" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogys" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyt" role="1PaTwD">
+            <property role="3oM_SC" value="rest" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyu" role="1PaTwD">
+            <property role="3oM_SC" value="components" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyv" role="1PaTwD">
+            <property role="3oM_SC" value="check" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyw" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyx" role="1PaTwD">
+            <property role="3oM_SC" value="next," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyy" role="1PaTwD">
+            <property role="3oM_SC" value="then" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogyz" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy$" role="1PaTwD">
+            <property role="3oM_SC" value="first" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogy_" role="1PaTwD">
+            <property role="3oM_SC" value="subcomponent" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyA" role="1PaTwD">
+            <property role="3oM_SC" value="direction," />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyB" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyC" role="1PaTwD">
+            <property role="3oM_SC" value="finally" />
           </node>
         </node>
-        <node concept="TZ5HA" id="3489cc5$rKg" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKh" role="1dT_Ay">
-            <property role="1dT_AB" value="check whether the component is focusable." />
+        <node concept="1PaTwC" id="M_dau6OgyD" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgyE" role="1PaTwD">
+            <property role="3oM_SC" value="check" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyF" role="1PaTwD">
+            <property role="3oM_SC" value="whether" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyG" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyH" role="1PaTwD">
+            <property role="3oM_SC" value="component" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyI" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyJ" role="1PaTwD">
+            <property role="3oM_SC" value="focusable." />
           </node>
         </node>
       </node>
@@ -59726,9 +59975,9 @@
       <node concept="3Tm6S6" id="3489cc5$q_y" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$q_z" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$q_$" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKi" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKj" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgyK" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgyL" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -59835,9 +60084,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qAe" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKm" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKn" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgyM" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgyN" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -59876,9 +60125,12 @@
         <ref role="3uigEE" to="wyt6:~String" resolve="String" />
       </node>
       <node concept="P$JXv" id="3489cc5$qAr" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKo" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKp" role="1dT_Ay">
-            <property role="1dT_AB" value="@return classname" />
+        <node concept="1PaTwC" id="M_dau6OgyO" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgyP" role="1PaTwD">
+            <property role="3oM_SC" value="@return" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6OgyQ" role="1PaTwD">
+            <property role="3oM_SC" value="classname" />
           </node>
         </node>
       </node>
@@ -59899,9 +60151,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qAy" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKq" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKr" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgyR" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgyS" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -59940,9 +60192,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qAK" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKs" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKt" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgyT" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgyU" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60257,9 +60509,9 @@
       <node concept="3Tm6S6" id="3489cc5$qCu" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$qCv" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qCw" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKu" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKv" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgyV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgyW" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60368,9 +60620,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qDe" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKA" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKB" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgyX" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgyY" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60400,9 +60652,9 @@
       <node concept="3Tm1VV" id="3489cc5$qDn" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$qDo" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qDp" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKC" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKD" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgyZ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogz0" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60447,9 +60699,9 @@
       <node concept="3Tm1VV" id="3489cc5$qDA" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$qDB" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qDC" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKE" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKF" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogz1" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogz2" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60483,9 +60735,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qDN" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKG" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKH" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogz3" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogz4" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60595,9 +60847,27 @@
       <node concept="3Tm1VV" id="3489cc5$qEv" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$qEw" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qEx" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKI" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKJ" role="1dT_Ay">
-            <property role="1dT_AB" value="@return the first selected index or -1" />
+        <node concept="1PaTwC" id="M_dau6Ogz5" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogz6" role="1PaTwD">
+            <property role="3oM_SC" value="@return" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogz7" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogz8" role="1PaTwD">
+            <property role="3oM_SC" value="first" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogz9" role="1PaTwD">
+            <property role="3oM_SC" value="selected" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogza" role="1PaTwD">
+            <property role="3oM_SC" value="index" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogzb" role="1PaTwD">
+            <property role="3oM_SC" value="or" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Ogzc" role="1PaTwD">
+            <property role="3oM_SC" value="-1" />
           </node>
         </node>
       </node>
@@ -60627,9 +60897,9 @@
       <node concept="3Tm1VV" id="3489cc5$qEE" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qEF" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qEG" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKK" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKL" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzd" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogze" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60714,9 +60984,9 @@
       <node concept="3Tm1VV" id="3489cc5$qFa" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qFb" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qFc" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKM" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKN" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzf" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzg" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60868,9 +61138,9 @@
       <node concept="3Tm6S6" id="3489cc5$qFM" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$qFN" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qFO" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKO" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKP" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzh" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzi" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60910,9 +61180,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qG2" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKQ" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKR" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzj" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzk" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -60946,9 +61216,9 @@
         </node>
       </node>
       <node concept="P$JXv" id="3489cc5$qGe" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKS" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKT" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzl" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzm" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61003,9 +61273,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qGw" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKU" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKV" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzn" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzo" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61162,9 +61432,9 @@
         </node>
       </node>
       <node concept="P$JXv" id="3489cc5$qHs" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKW" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKX" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzp" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzq" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61276,9 +61546,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qIa" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rKY" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rKZ" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzr" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzs" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61394,9 +61664,9 @@
       <node concept="3Tm6S6" id="3489cc5$qIR" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$qIS" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qIT" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rL0" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rL1" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzt" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzu" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61431,9 +61701,9 @@
       <node concept="3Tm1VV" id="3489cc5$qJ3" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qJ4" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qJ5" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rL2" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rL3" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzv" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzw" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61477,9 +61747,9 @@
       <node concept="3Tm1VV" id="3489cc5$qJi" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qJj" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qJk" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rL4" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rL5" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzx" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogzy" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61560,9 +61830,9 @@
       <node concept="3Tm1VV" id="3489cc5$qJK" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qJL" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qJM" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rL6" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rL7" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogzz" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Ogz$" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61616,9 +61886,9 @@
       <node concept="3Tm6S6" id="3489cc5$qK2" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qK3" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qK4" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rL8" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rL9" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Ogz_" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzA" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -61815,9 +62085,9 @@
       <node concept="3Tm6S6" id="3489cc5$qLh" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qLi" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qLj" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLa" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLb" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzB" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzC" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -62296,9 +62566,9 @@
       <node concept="3Tm1VV" id="3489cc5$qO2" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qO3" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qO4" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLc" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLd" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzD" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzE" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -62446,9 +62716,9 @@
       <node concept="3Tm6S6" id="3489cc5$qOO" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qOP" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qOQ" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLg" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLh" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzF" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzG" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -62840,9 +63110,9 @@
         <ref role="3uigEE" to="wyt6:~String" resolve="String" />
       </node>
       <node concept="P$JXv" id="3489cc5$qRp" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLk" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLl" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzH" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzI" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -62876,9 +63146,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qR$" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLm" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLn" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzJ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzK" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -63335,9 +63605,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qUB" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLo" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLp" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzL" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzM" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -63550,9 +63820,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qV6" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLq" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLr" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzN" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzO" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -63589,9 +63859,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$qVi" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLI" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLJ" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzP" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzQ" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -63626,9 +63896,9 @@
       <node concept="3Tmbuc" id="3489cc5$qVs" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qVt" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qVu" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLK" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLL" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzR" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzS" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -63655,9 +63925,9 @@
       <node concept="3Tmbuc" id="3489cc5$qV_" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qVA" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qVB" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLM" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLN" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzT" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzU" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -63677,9 +63947,9 @@
       <node concept="3Tmbuc" id="3489cc5$qVG" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qVH" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qVI" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLO" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLP" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzV" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzW" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -63692,9 +63962,9 @@
       <node concept="3Tmbuc" id="3489cc5$qVL" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$qVM" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$qVN" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLQ" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLR" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzX" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6OgzY" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -65992,9 +66262,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$r82" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rLS" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rLT" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6OgzZ" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$0" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -66020,9 +66290,12 @@
         <ref role="3uigEE" to="wyt6:~String" resolve="String" />
       </node>
       <node concept="P$JXv" id="3489cc5$r8b" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rMs" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rMt" role="1dT_Ay">
-            <property role="1dT_AB" value="Convert entities." />
+        <node concept="1PaTwC" id="M_dau6Og$1" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$2" role="1PaTwD">
+            <property role="3oM_SC" value="Convert" />
+          </node>
+          <node concept="3oM_SD" id="M_dau6Og$3" role="1PaTwD">
+            <property role="3oM_SC" value="entities." />
           </node>
         </node>
       </node>
@@ -66723,9 +66996,9 @@
       <node concept="3Tm6S6" id="3489cc5$rc5" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$rc6" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rc7" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rMu" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rMv" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$4" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$5" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -66813,9 +67086,9 @@
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
       <node concept="P$JXv" id="3489cc5$rct" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rMA" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rMB" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$6" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$7" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -67467,9 +67740,9 @@
       <node concept="3Tm6S6" id="3489cc5$rfS" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$rfT" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rfU" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rME" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rMF" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$8" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$9" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -67806,9 +68079,9 @@
         </node>
       </node>
       <node concept="P$JXv" id="3489cc5$ri4" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rMU" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rMV" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$a" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$b" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -67921,9 +68194,9 @@
       <node concept="3Tm1VV" id="3489cc5$riF" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$riG" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$riH" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rMW" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rMX" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$c" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$d" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68010,9 +68283,9 @@
         <ref role="3uigEE" to="wyt6:~String" resolve="String" />
       </node>
       <node concept="P$JXv" id="3489cc5$rjb" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rMY" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rMZ" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$e" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$f" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68149,9 +68422,9 @@
       <node concept="3Tm1VV" id="3489cc5$rjV" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$rjW" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rjX" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rN0" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rN1" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$g" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$h" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68247,9 +68520,9 @@
         <ref role="3uigEE" to="wyt6:~String" resolve="String" />
       </node>
       <node concept="P$JXv" id="3489cc5$rkv" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rN2" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rN3" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$i" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$j" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68363,9 +68636,9 @@
       <node concept="3Tm1VV" id="3489cc5$rl7" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$rl8" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rl9" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rN4" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rN5" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$k" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$l" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68453,9 +68726,9 @@
       <node concept="3Tm1VV" id="3489cc5$rlA" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$rlB" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rlC" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rN6" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rN7" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$m" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$n" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68573,9 +68846,9 @@
       <node concept="3Tm1VV" id="3489cc5$rmi" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$rmj" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rmk" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rN8" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rN9" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$o" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$p" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68667,9 +68940,9 @@
       <node concept="3Tm1VV" id="3489cc5$rmN" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$rmO" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rmP" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rNa" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rNb" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$q" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$r" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68769,9 +69042,9 @@
       <node concept="3Tm1VV" id="3489cc5$rnn" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$rno" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rnp" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rNc" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rNd" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$s" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$t" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -68858,9 +69131,9 @@
         <ref role="3uigEE" to="z60i:~Image" resolve="Image" />
       </node>
       <node concept="P$JXv" id="3489cc5$rnR" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rNe" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rNf" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$u" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$v" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -69001,9 +69274,9 @@
       <node concept="3Tm1VV" id="3489cc5$rop" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$roq" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$ror" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rNg" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rNh" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$w" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$x" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -69146,9 +69419,9 @@
         <ref role="3uigEE" to="t6h5:~Method" resolve="Method" />
       </node>
       <node concept="P$JXv" id="3489cc5$roQ" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rNm" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rNn" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$y" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$z" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -69810,9 +70083,9 @@
       <node concept="3Tm6S6" id="3489cc5$rsK" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$rsL" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rsM" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rNw" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rNx" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$$" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$_" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70160,9 +70433,9 @@
       <node concept="3Tm6S6" id="3489cc5$rt2" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$rt3" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rt4" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rN$" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rN_" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$A" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$B" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70240,9 +70513,9 @@
         <ref role="3uigEE" to="wyt6:~String" resolve="String" />
       </node>
       <node concept="P$JXv" id="3489cc5$rtv" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOc" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOd" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$C" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$D" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70409,9 +70682,9 @@
       <node concept="3Tm6S6" id="3489cc5$rus" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$rut" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$ruu" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOe" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOf" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$E" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$F" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70483,9 +70756,9 @@
       <node concept="3Tm6S6" id="3489cc5$ruP" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$ruQ" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$ruR" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOg" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOh" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$G" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$H" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70563,9 +70836,9 @@
         <ref role="3uigEE" to="z60i:~Image" resolve="Image" />
       </node>
       <node concept="P$JXv" id="3489cc5$rvi" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOi" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOj" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$I" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$J" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70642,9 +70915,9 @@
       <node concept="3Tm6S6" id="3489cc5$rvG" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$rvH" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rvI" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOk" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOl" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$K" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$L" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70725,9 +70998,9 @@
       <node concept="3Tm6S6" id="3489cc5$rwa" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$rwb" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rwc" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOm" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOn" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$M" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$N" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70797,9 +71070,9 @@
       <node concept="3Tm6S6" id="3489cc5$rwz" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$rw$" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rw_" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOo" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOp" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$O" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$P" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -70880,9 +71153,9 @@
       <node concept="3Tm6S6" id="3489cc5$rx1" role="1B3o_S" />
       <node concept="10Oyi0" id="3489cc5$rx2" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rx3" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOq" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOr" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$Q" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$R" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -71094,9 +71367,9 @@
       <node concept="3Tm6S6" id="3489cc5$rxT" role="1B3o_S" />
       <node concept="3cqZAl" id="3489cc5$rxU" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$rxV" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOs" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOt" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$S" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$T" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -71168,9 +71441,9 @@
         <ref role="3uigEE" to="z60i:~Rectangle" resolve="Rectangle" />
       </node>
       <node concept="P$JXv" id="3489cc5$rya" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOy" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOz" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$U" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$V" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -71204,9 +71477,9 @@
         <ref role="3uigEE" to="z60i:~Image" resolve="Image" />
       </node>
       <node concept="P$JXv" id="3489cc5$ryl" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOC" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOD" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$W" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$X" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -71728,9 +72001,9 @@
         <ref role="3uigEE" to="z60i:~Image" resolve="Image" />
       </node>
       <node concept="P$JXv" id="3489cc5$r$n" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rOE" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rOF" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og$Y" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og$Z" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
@@ -71749,9 +72022,9 @@
       <node concept="3Tm1VV" id="3489cc5$r$s" role="1B3o_S" />
       <node concept="10P_77" id="3489cc5$r$t" role="3clF45" />
       <node concept="P$JXv" id="3489cc5$r$u" role="lGtFl">
-        <node concept="TZ5HA" id="3489cc5$rP8" role="TZ5H$">
-          <node concept="1dT_AC" id="3489cc5$rP9" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
+        <node concept="1PaTwC" id="M_dau6Og_0" role="1Vez_I">
+          <node concept="3oM_SD" id="M_dau6Og_1" role="1PaTwD">
+            <property role="3oM_SC" value="" />
           </node>
         </node>
       </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index 7973d38f..0a0a33ba 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -46,6 +46,9 @@
       </concept>
       <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1224071154655" name="jetbrains.mps.baseLanguage.structure.AsExpression" flags="nn" index="0kSF2">
         <child id="1224071154657" name="classifierType" index="0kSFW" />
@@ -290,7 +293,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -3058,19 +3060,19 @@
                               <node concept="37vLTw" id="WJTIIo$wC9" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1xylXbt_JhV" resolve="typecheckRoot" />
                               </node>
-                              <node concept="2qgKlT" id="WJTIIo$wCa" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og3w" role="2OqNvi">
                                 <ref role="37wK5l" to="tpek:32Td0IabBk_" resolve="addMember" />
-                                <node concept="37vLTw" id="WJTIIo$wCb" role="37wK5m">
+                                <node concept="37vLTw" id="M_dau6Og3y" role="37wK5m">
                                   <ref role="3cqZAo" node="WJTIIo$wC2" resolve="copied" />
                                 </node>
-                                <node concept="2ShNRf" id="WJTIIo$xRX" role="37wK5m">
-                                  <node concept="Tc6Ow" id="WJTIIo$yum" role="2ShVmc">
-                                    <node concept="3bZ5Sz" id="WJTIIo$zrb" role="HW$YZ" />
-                                    <node concept="2OqwBi" id="WJTIIo$wCg" role="HW$Y0">
-                                      <node concept="37vLTw" id="WJTIIo$wCh" role="2Oq$k0">
+                                <node concept="2ShNRf" id="M_dau6Og3z" role="37wK5m">
+                                  <node concept="Tc6Ow" id="M_dau6Og3$" role="2ShVmc">
+                                    <node concept="3bZ5Sz" id="M_dau6Og3_" role="HW$YZ" />
+                                    <node concept="2OqwBi" id="M_dau6Og3A" role="HW$Y0">
+                                      <node concept="37vLTw" id="M_dau6Og3B" role="2Oq$k0">
                                         <ref role="3cqZAo" node="WJTIIo$wC2" resolve="copied" />
                                       </node>
-                                      <node concept="2yIwOk" id="WJTIIo$wCi" role="2OqNvi" />
+                                      <node concept="2yIwOk" id="M_dau6Og3C" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
@@ -7850,7 +7852,7 @@
                                   <node concept="3xONca" id="6dzPt95_uK4" role="2Oq$k0">
                                     <ref role="3xOPvv" node="6dzPt95zcdR" resolve="gCall1A" />
                                   </node>
-                                  <node concept="2qgKlT" id="6dzPt95Ataw" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og3D" role="2OqNvi">
                                     <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                                   </node>
                                 </node>
@@ -8667,7 +8669,7 @@
                                   <node concept="3xONca" id="MSv3ownOgN" role="2Oq$k0">
                                     <ref role="3xOPvv" node="MSv3ownvDe" resolve="gCall2A" />
                                   </node>
-                                  <node concept="2qgKlT" id="MSv3ownCRT" role="2OqNvi">
+                                  <node concept="3zqWPK" id="M_dau6Og3F" role="2OqNvi">
                                     <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                                   </node>
                                 </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps
index 1c60c405..ad743742 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="3" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index ad60c695..d6ec4dcf 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -52,6 +52,9 @@
       </concept>
       <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
         <child id="1219921048460" name="componentType" index="8Xvag" />
@@ -271,7 +274,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -511,7 +513,7 @@
                                         <ref role="3Tt5mk" to="tpee:fzclF7Z" resolve="body" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="4pwDyRC1qW6" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og3H" role="2OqNvi">
                                       <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
                                     </node>
                                   </node>
@@ -668,7 +670,7 @@
                                         <ref role="3Tt5mk" to="tpee:fzclF7Z" resolve="body" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="4pwDyRC4$u$" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og3J" role="2OqNvi">
                                       <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
                                     </node>
                                   </node>
@@ -812,7 +814,7 @@
                                         <ref role="3Tt5mk" to="tpee:fzclF7Z" resolve="body" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="4pwDyRC1Ro8" role="2OqNvi">
+                                    <node concept="3zqWPK" id="M_dau6Og3L" role="2OqNvi">
                                       <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
                                     </node>
                                   </node>
@@ -1203,7 +1205,7 @@
                               <node concept="37vLTw" id="rZZ6I0jyR" role="2Oq$k0">
                                 <ref role="3cqZAo" node="6E5fMGvfKVS" resolve="it" />
                               </node>
-                              <node concept="2qgKlT" id="rZZ6I0jyS" role="2OqNvi">
+                              <node concept="3zqWPK" id="M_dau6Og3N" role="2OqNvi">
                                 <ref role="37wK5l" to="tpek:2RtWPFZ12w7" resolve="getThisType" />
                               </node>
                             </node>
@@ -5288,7 +5290,7 @@
                     <node concept="3xONca" id="rZZ6HaIDi" role="2Oq$k0">
                       <ref role="3xOPvv" node="74XSvywDDOg" resolve="B" />
                     </node>
-                    <node concept="2qgKlT" id="rZZ6HaNHS" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og3P" role="2OqNvi">
                       <ref role="37wK5l" to="tpek:2RtWPFZ12w7" resolve="getThisType" />
                     </node>
                   </node>
@@ -5314,7 +5316,7 @@
                     <node concept="3xONca" id="rZZ6HcP0$" role="2Oq$k0">
                       <ref role="3xOPvv" node="74XSvywDDOb" resolve="A" />
                     </node>
-                    <node concept="2qgKlT" id="rZZ6HcNSw" role="2OqNvi">
+                    <node concept="3zqWPK" id="M_dau6Og3R" role="2OqNvi">
                       <ref role="37wK5l" to="tpek:2RtWPFZ12w7" resolve="getThisType" />
                     </node>
                   </node>
@@ -5390,7 +5392,7 @@
                       <node concept="3xONca" id="rZZ6Hi3Mm" role="2Oq$k0">
                         <ref role="3xOPvv" node="74XSvywDDQJ" resolve="Raw" />
                       </node>
-                      <node concept="2qgKlT" id="rZZ6Hi582" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og3T" role="2OqNvi">
                         <ref role="37wK5l" to="tpek:2RtWPFZ12w7" resolve="getThisType" />
                       </node>
                     </node>
@@ -5544,7 +5546,7 @@
                       <node concept="3xONca" id="rZZ6HFt$8" role="2Oq$k0">
                         <ref role="3xOPvv" node="74XSvywDDQJ" resolve="Raw" />
                       </node>
-                      <node concept="2qgKlT" id="rZZ6HFt$9" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Og3V" role="2OqNvi">
                         <ref role="37wK5l" to="tpek:2RtWPFZ12w7" resolve="getThisType" />
                       </node>
                     </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
index 11b999ba..ef054cb3 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
@@ -29,7 +29,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps
index bcd8e4e5..a91f1a38 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps
@@ -30,6 +30,9 @@
         <child id="1238853845806" name="component" index="1Lso8e" />
       </concept>
     </language>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="3235159848334022093" name="jetbrains.mps.lang.behavior.structure.Node_ConceptMethodCall" flags="nn" index="3zqWPK" />
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -147,7 +150,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
@@ -3301,7 +3303,7 @@
                       <node concept="37vLTw" id="1OIEKu3NaS1" role="2Oq$k0">
                         <ref role="3cqZAo" node="1OIEKu3NaS3" resolve="it" />
                       </node>
-                      <node concept="2qgKlT" id="1OIEKu3NaS2" role="2OqNvi">
+                      <node concept="3zqWPK" id="M_dau6Ogag" role="2OqNvi">
                         <ref role="37wK5l" to="hez:2gj5XQXIqKf" resolve="asInvariantProjection" />
                       </node>
                     </node>
@@ -3330,7 +3332,7 @@
                 <node concept="Jnkvi" id="1OIEKu3Ne4P" role="2Oq$k0">
                   <ref role="1M0zk5" node="1OIEKu3NdZJ" resolve="loop" />
                 </node>
-                <node concept="2qgKlT" id="2ZpF_RgXV43" role="2OqNvi">
+                <node concept="3zqWPK" id="M_dau6Ogai" role="2OqNvi">
                   <ref role="37wK5l" to="hez:Cy8Bus9niD" resolve="assignableState" />
                 </node>
               </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
index 41e8c432..491d4654 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
@@ -22,7 +22,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />