diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b37553450863..b2e8eba58c0a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -154,6 +154,8 @@
       <directory url="file://$PROJECT_DIR$/languages/languageDesign/script/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/languages/languageDesign/sharedConcepts/generator/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/languages/languageDesign/sharedConcepts/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/languages/languageDesign/smodel.query/generator/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/languages/languageDesign/smodel.query/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/languages/languageDesign/smodel/generator/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/languages/languageDesign/smodel/solutions/samples/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/languages/languageDesign/smodel/solutions/samples/test_gen" includeSubdirectories="true" />
@@ -195,10 +197,6 @@
       <directory url="file://$PROJECT_DIR$/plugins/console/actions/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/plugins/console/lang/base/generator/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/plugins/console/lang/base/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/plugins/console/lang/blCommand/generator/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/plugins/console/lang/blCommand/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/plugins/console/lang/blCommandRuntime/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/plugins/console/lang/blCommandRuntime/test_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/plugins/console/lang/ideCommands/generator/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/plugins/console/lang/ideCommands/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/plugins/console/lang/ideCommandsRuntime/source_gen" includeSubdirectories="true" />
@@ -416,6 +414,12 @@
       <directory url="file://$PROJECT_DIR$/samples/languagePatterns/languages/jetbrains.mps.samples.languagePatterns.Basic/sandbox/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/languagePatterns/languages/jetbrains.mps.samples.languagePatterns.Basic/sandbox/test_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/languagePatterns/languages/jetbrains.mps.samples.languagePatterns.Basic/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/generator/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/test_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/test_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/math/generator/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/math/runtimeSolution/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/math/runtimeSolution/test_gen" includeSubdirectories="true" />
@@ -445,6 +449,14 @@
       <directory url="file://$PROJECT_DIR$/samples/money/solutions/jetbrains.mps.baseLanguage.money.sandbox/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/money/solutions/jetbrains.mps.baseLanguage.money.sandbox/test_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/money/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/MultiTarget/generator/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/MultiTarget/sandbox/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/MultiTarget/sandbox/test_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/MultiTarget/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/jetbrains.mps.samples.TargetBL/generator/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/jetbrains.mps.samples.TargetBL/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/jetbrains.mps.samples.TargetXML/generator/source_gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/jetbrains.mps.samples.TargetXML/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/multipleProjections/languages/org.jetbrains.mps.requestTracking/generator/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/multipleProjections/languages/org.jetbrains.mps.requestTracking/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/samples/multipleProjections/languages/org.jetbrains.mps.stateMachine.tabular/generator/source_gen" includeSubdirectories="true" />
@@ -638,20 +650,6 @@
       <directory url="file://$PROJECT_DIR$/testbench/testsolutions/traceInfo.testWeaving/test_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/testbench/testsolutions/traceable.operations.test/source_gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/testbench/testsolutions/traceable.operations.test/test_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/generator/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/test_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/test_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/MultiTarget/generator/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/MultiTarget/sandbox/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/MultiTarget/sandbox/test_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/MultiTarget/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/jetbrains.mps.samples.TargetBL/generator/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/jetbrains.mps.samples.TargetBL/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/jetbrains.mps.samples.TargetXML/generator/source_gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/samples/multiTarget/languages/jetbrains.mps.samples.TargetXML/source_gen" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
@@ -677,4 +675,5 @@
     <option name="DEPRECATION" value="false" />
     <option name="MAXIMUM_HEAP_SIZE" value="1024" />
   </component>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fbe343500966..17eff1ab0cca 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -73,6 +73,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/samples/samples.iml" filepath="$PROJECT_DIR$/plugins/samples/samples.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/core/scripts-runtime/scripts-runtime.iml" filepath="$PROJECT_DIR$/core/scripts-runtime/scripts-runtime.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/smodel/smodel.iml" filepath="$PROJECT_DIR$/core/smodel/smodel.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml" filepath="$PROJECT_DIR$/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml" group="languages" />
       <module fileurl="file://$PROJECT_DIR$/startup/startup.iml" filepath="$PROJECT_DIR$/startup/startup.iml" />
       <module fileurl="file://$PROJECT_DIR$/testbench/testbench.iml" filepath="$PROJECT_DIR$/testbench/testbench.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/textgen/textgen.iml" filepath="$PROJECT_DIR$/core/textgen/textgen.iml" group="core" />
diff --git a/.mps/modules.xml b/.mps/modules.xml
index ca214466c357..0854b0cacf9a 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -127,6 +127,7 @@
       <modulePath path="$PROJECT_DIR$/languages/languageDesign/scopes/runtime/jetbrains.mps.lang.scopes.runtime.msd" folder="core.aspects.constraints" />
       <modulePath path="$PROJECT_DIR$/languages/languageDesign/script/jetbrains.mps.lang.script.mpl" folder="core.aspects.script" />
       <modulePath path="$PROJECT_DIR$/languages/languageDesign/sharedConcepts/jetbrains.mps.lang.sharedConcepts.mpl" folder="core.languages" />
+      <modulePath path="$PROJECT_DIR$/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl" folder="core.languages.smodel.query" />
       <modulePath path="$PROJECT_DIR$/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl" folder="core.languages.smodel" />
       <modulePath path="$PROJECT_DIR$/languages/languageDesign/smodel/solutions/samples/jetbrains.mps.samples.smodelLanguage-samples.msd" folder="samples" />
       <modulePath path="$PROJECT_DIR$/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl" folder="core.aspects.structure" />
@@ -150,8 +151,6 @@
       <modulePath path="$PROJECT_DIR$/plugins/console/jetbrains.mps.console.actions.msd" folder="platform.console" />
       <modulePath path="$PROJECT_DIR$/plugins/console/jetbrains.mps.console.msd" folder="platform.console" />
       <modulePath path="$PROJECT_DIR$/plugins/console/lang/base/jetbrains.mps.console.base.mpl" folder="platform.console" />
-      <modulePath path="$PROJECT_DIR$/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl" folder="platform.console" />
-      <modulePath path="$PROJECT_DIR$/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd" folder="platform.console" />
       <modulePath path="$PROJECT_DIR$/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl" folder="platform.console" />
       <modulePath path="$PROJECT_DIR$/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" folder="platform.console" />
       <modulePath path="$PROJECT_DIR$/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl" folder="platform.console" />
diff --git a/build/mpsCore.xml b/build/mpsCore.xml
index aa46818b4fe5..b56b5f5e3499 100644
--- a/build/mpsCore.xml
+++ b/build/mpsCore.xml
@@ -166,6 +166,54 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-mps-core-languages-core.properties-languageAccessories" prefix="module/languageAccessories" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-mps-core-languages-core.properties-languageModels" prefix="module/languageModels" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.query.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.query.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.smodel.query.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.smodel.query" type="language" uuid="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
+          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="jetbrains.mps.lang.smodel.query-src.jar" descriptor="jetbrains.mps.lang.smodel.query.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query" />
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.query.jar" />
+    </jar>
+    <jar destfile="${build.layout}/mps-core/languages/util/jetbrains.mps.lang.smodel.query-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query#5336086527852811409" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-languageDesign-smodel.query-generator-template">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-languageDesign-smodel.query-languageModels">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/mps-core/languages/util/jetbrains.mps.lang.smodel.query-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <zipfileset file="${mps_home}/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-languageDesign-smodel.query-generator-template" prefix="module/generator/template" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-languageDesign-smodel.query-languageModels" prefix="module/languageModels" />
+    </jar>
     <echo file="${build.layout}/build.properties">mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
   </target>
   
@@ -182,7 +230,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.lang.editor.table, java.compile.jetbrains.mps.lang.editor.table#4677325677876405344, java.compile.jetbrains.mps.lang.editor.table.runtime, java.compile.jetbrains.mps.core.properties" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.lang.editor.table, java.compile.jetbrains.mps.lang.editor.table#4677325677876405344, java.compile.jetbrains.mps.lang.editor.table.runtime, java.compile.jetbrains.mps.core.properties, java.compile.jetbrains.mps.lang.smodel.query, java.compile.jetbrains.mps.lang.smodel.query#5336086527852811409" />
   
   <target name="processResources" />
   
@@ -265,6 +313,7 @@
         <module file="${mps_home}/plugins/mps-core/languages/core.properties/jetbrains.mps.core.properties.mpl" />
         <module file="${mps_home}/plugins/mps-core/languages/languageDesign/table/jetbrains.mps.lang.editor.table.mpl" />
         <module file="${mps_home}/plugins/mps-core/languages/languageDesign/table/runtime/jetbrains.mps.lang.editor.table.runtime.msd" />
+        <module file="${mps_home}/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl" />
       </chunk>
       <chunk />
       <jvmargs>
@@ -477,10 +526,109 @@
     </copy>
   </target>
   
+  <target name="java.compile.jetbrains.mps.lang.smodel.query" depends="fetchDependencies">
+    <mkdir dir="${mps_home}/languages/languageDesign/smodel.query/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps_home}/languages/languageDesign/smodel.query/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
+        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
+        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
+        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
+        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
+        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <path refid="path.jdk.classpath" />
+      </classpath>
+    </javac2>
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    </copy>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.lang.smodel.query#5336086527852811409" depends="java.compile.jetbrains.mps.lang.smodel.query, fetchDependencies">
+    <mkdir dir="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query#5336086527852811409" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query#5336086527852811409" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query" />
+        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
+        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
+        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
+        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
+        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
+        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <path refid="path.jdk.classpath" />
+      </classpath>
+    </javac2>
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query#5336086527852811409">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    </copy>
+  </target>
+  
   <target name="cleanSources">
     <delete dir="${mps_home}/plugins/mps-core/languages/core.properties/source_gen" />
     <delete dir="${mps_home}/plugins/mps-core/languages/languageDesign/table/source_gen" />
     <delete dir="${mps_home}/plugins/mps-core/languages/languageDesign/table/runtime/source_gen" />
+    <delete dir="${mps_home}/languages/languageDesign/smodel.query/source_gen" />
     <delete dir="${mps_home}/plugins/mps-core/languages/languageDesign/table/generator/source_gen" />
+    <delete dir="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/build/mpsPlugins.xml b/build/mpsPlugins.xml
index 36d10d019df3..b8d567bd9e71 100644
--- a/build/mpsPlugins.xml
+++ b/build/mpsPlugins.xml
@@ -153,10 +153,10 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-base-languageAccessories" prefix="module/languageAccessories" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-base-languageModels" prefix="module/languageModels" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.blCommand.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.blCommand.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.blCommand.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.blCommand" type="language" uuid="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a">
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.console.scripts.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.console.scripts" type="language" uuid="f26691d2-0def-4c06-aec6-2cb90c4af0a4">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
@@ -170,36 +170,112 @@
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
-        <sources jar="jetbrains.mps.console.blCommand-src.jar" descriptor="jetbrains.mps.console.blCommand.mpl" />
+        <sources jar="jetbrains.mps.console.scripts-src.jar" descriptor="jetbrains.mps.console.scripts.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.blCommand.jar" />
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
+      <fileset dir="${mps_home}/plugins/console/lang/scripts" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar" />
     </jar>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand-generator.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand#5336086527852811409" />
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommand-generator-template">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-generator-template">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommand-languageModels">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-languageModels">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/generator/source_gen">
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
       </fileset>
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/source_gen">
+      <zipfileset file="${mps_home}/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-generator-template" prefix="module/generator/template" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-languageModels" prefix="module/languageModels" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.console.scripts.runtime" type="solution" uuid="ebc06ad9-00ca-47ed-b5c6-bde710ea8f4d">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="jetbrains.mps.console.scripts.runtime-src.jar" descriptor="jetbrains.mps.console.scripts.runtime.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.runtime.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" />
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scriptsRuntime-models">
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.runtime-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <zipfileset file="${mps_home}/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scriptsRuntime-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.actions.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.actions.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.console.actions.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.console.actions" type="solution" uuid="95b39faf-7eaf-4ae3-bd92-fbd3cc28bfab">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" />
+          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)" />
+          <module ref="c7567052-205c-4a15-80b0-7a32b32a9656(jetbrains.mps.console.ideCommands.runtime)" />
+          <module ref="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="jetbrains.mps.console.actions-src.jar" descriptor="jetbrains.mps.console.actions.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.actions.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.actions" />
+      <fileset dir="${mps_home}/plugins/console" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/plugins/console/actions/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.console.actions.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-actions-models">
+      <fileset dir="${mps_home}/plugins/console/actions/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.actions-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/plugins/console/actions/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
       </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommand-generator-template" prefix="module/generator/template" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommand-languageModels" prefix="module/languageModels" />
+      <zipfileset file="${mps_home}/plugins/console/jetbrains.mps.console.actions.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-actions-models" prefix="module/actions/models" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.jar/META-INF" />
@@ -255,6 +331,41 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommands-languageAccessories" prefix="module/languageAccessories" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommands-languageModels" prefix="module/languageModels" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.console.ideCommands.runtime" type="solution" uuid="c7567052-205c-4a15-80b0-7a32b32a9656">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="jetbrains.mps.console.ideCommands.runtime-src.jar" descriptor="jetbrains.mps.console.ideCommands.runtime.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.ideCommands.runtime.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommandsRuntime-models">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.ideCommands.runtime-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <zipfileset file="${mps_home}/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommandsRuntime-models" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.internalCommands.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.internalCommands.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.console.internalCommands.jar/META-INF/module.xml">
@@ -303,90 +414,6 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-internalCommands-generator-template" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-internalCommands-languageModels" prefix="module/languageModels" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.scripts.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.scripts" type="language" uuid="f26691d2-0def-4c06-aec6-2cb90c4af0a4">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.scripts-src.jar" descriptor="jetbrains.mps.console.scripts.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
-      <fileset dir="${mps_home}/plugins/console/lang/scripts" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar" />
-    </jar>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts-generator.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-generator-template">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-languageModels">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-generator-template" prefix="module/generator/template" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-languageModels" prefix="module/languageModels" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.blCommand.runtime.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.blCommand.runtime.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.blCommand.runtime.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.blCommand.runtime" type="solution" uuid="7726760c-95f5-4242-b36a-e069417e9d94">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.blCommand.runtime-src.jar" descriptor="jetbrains.mps.console.blCommand.runtime.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand.runtime.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.blCommand.runtime.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommandRuntime-models">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand.runtime-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommandRuntime-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.internalCommands.runtime.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.internalCommands.runtime.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.console.internalCommands.runtime.jar/META-INF/module.xml">
@@ -422,117 +449,6 @@
       <zipfileset file="${mps_home}/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-internalCommandsRuntime-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.ideCommands.runtime" type="solution" uuid="c7567052-205c-4a15-80b0-7a32b32a9656">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.ideCommands.runtime-src.jar" descriptor="jetbrains.mps.console.ideCommands.runtime.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.ideCommands.runtime.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommandsRuntime-models">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.ideCommands.runtime-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommandsRuntime-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.scripts.runtime" type="solution" uuid="ebc06ad9-00ca-47ed-b5c6-bde710ea8f4d">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.scripts.runtime-src.jar" descriptor="jetbrains.mps.console.scripts.runtime.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.runtime.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" />
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scriptsRuntime-models">
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.runtime-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scriptsRuntime-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.actions.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.actions.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.actions.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.actions" type="solution" uuid="95b39faf-7eaf-4ae3-bd92-fbd3cc28bfab">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" />
-          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)" />
-          <module ref="7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime)" />
-          <module ref="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.actions-src.jar" descriptor="jetbrains.mps.console.actions.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.actions.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.actions" />
-      <fileset dir="${mps_home}/plugins/console" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/actions/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.actions.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-actions-models">
-      <fileset dir="${mps_home}/plugins/console/actions/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.actions-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/actions/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/jetbrains.mps.console.actions.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-actions-models" prefix="module/actions/models" />
-    </jar>
     <jar destfile="${build.layout}/migrationAssistant.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/migrationAssistant" />
       <zipfileset file="${mps_home}/plugins/migrationAssistant/META-INF/plugin.xml" prefix="META-INF" />
@@ -583,7 +499,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.ideaIntegration, java.compile.migrationAssistant, java.compile.modelchecker, java.compile.mps-java, java.compile.consoleTool, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.console.blCommand.runtime, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.base#5336086527852717844, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.blCommand#5336086527852811409, java.compile.jetbrains.mps.console.ideCommands.runtime, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands#7935955022005272663, java.compile.jetbrains.mps.console.internalCommands.runtime, java.compile.jetbrains.mps.console.internalCommands, java.compile.jetbrains.mps.console.internalCommands#8483375838963160298, java.compile.jetbrains.mps.console.scripts.runtime, java.compile.jetbrains.mps.console.scripts, java.compile.jetbrains.mps.console.scripts#1734392475490224704, java.compile.jetbrains.mps.console.actions, java.compile.samples, java.compile.mpsmigration" />
+  <target name="compileJava" depends="java.compile.ideaIntegration, java.compile.migrationAssistant, java.compile.modelchecker, java.compile.mps-java, java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.base#5336086527852717844, java.compile.jetbrains.mps.console.scripts.runtime, java.compile.jetbrains.mps.console.scripts, java.compile.jetbrains.mps.console.scripts#1734392475490224704, java.compile.jetbrains.mps.console.actions, java.compile.jetbrains.mps.console.ideCommands.runtime, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands#7935955022005272663, java.compile.jetbrains.mps.console.internalCommands.runtime, java.compile.jetbrains.mps.console.internalCommands, java.compile.jetbrains.mps.console.internalCommands#8483375838963160298, java.compile.samples, java.compile.mpsmigration" />
   
   <target name="processResources" />
   
@@ -662,6 +578,8 @@
       <library file="${artifacts.mpsBootstrapCore}/lib/mps-test.jar" />
       <library file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
       <library file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
+      <library file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query-generator.jar" />
+      <library file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
       <library file="${artifacts.mpsJava}/lib/mps-java-common.jar" />
       <library file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
       <library file="${artifacts.mpsWorkbench}/languages/workbench/jetbrains.mps.lang.plugin.standalone.jar" />
@@ -669,17 +587,13 @@
       <chunk>
         <module file="${mps_home}/plugins/console/jetbrains.mps.console.msd" />
         <module file="${mps_home}/plugins/console/lang/base/jetbrains.mps.console.base.mpl" />
-        <module file="${mps_home}/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" />
-        <module file="${mps_home}/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd" />
-        <module file="${mps_home}/plugins/mpsjava/workbench/jetbrains.mps.ide.java.msd" />
-      </chunk>
-      <chunk>
-        <module file="${mps_home}/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl" />
-        <module file="${mps_home}/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd" />
         <module file="${mps_home}/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl" />
+        <module file="${mps_home}/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" />
         <module file="${mps_home}/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl" />
+        <module file="${mps_home}/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd" />
         <module file="${mps_home}/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl" />
         <module file="${mps_home}/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd" />
+        <module file="${mps_home}/plugins/mpsjava/workbench/jetbrains.mps.ide.java.msd" />
       </chunk>
       <chunk>
         <module file="${mps_home}/plugins/console/jetbrains.mps.console.actions.msd" />
@@ -932,119 +846,6 @@
     </copy>
   </target>
   
-  <target name="java.compile.java.modules.cycle.1" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.1" />
-    <javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" memorymaximumsize="1024m" nowarn="true" includeantruntime="false">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" />
-        <path location="${mps_home}/plugins/console/lang/blCommand/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
-        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
-        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
-        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.console.blCommand.runtime" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.java.modules.cycle.1, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" />
-      </src>
-      <classpath>
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
-        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
-        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
-        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
-        <path refid="path.jdk.classpath" />
-      </classpath>
-    </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
-    </copy>
-  </target>
-  
   <target name="java.compile.jetbrains.mps.console.base" depends="java.compile.consoleTool, fetchDependencies">
     <mkdir dir="${mps_home}/plugins/console/lang/base/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.base" />
@@ -1083,80 +884,29 @@
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.base">
-      <fileset dir="${mps_home}/plugins/console/lang/base/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.console.base#5336086527852717844" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/base/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps_home}/plugins/console/lang/base/generator/source_gen" />
-      </src>
-      <classpath>
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
-        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
-        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
-        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <path refid="path.jdk.classpath" />
-      </classpath>
-    </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844">
-      <fileset dir="${mps_home}/plugins/console/lang/base/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.base">
+      <fileset dir="${mps_home}/plugins/console/lang/base/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.blCommand" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.java.modules.cycle.1, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/blCommand/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.blCommand" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.base#5336086527852717844" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/base/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/blCommand/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/base/generator/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1186,36 +936,33 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query-generator.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.blCommand">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844">
+      <fileset dir="${mps_home}/plugins/console/lang/base/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.blCommand#5336086527852811409" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.blCommand.runtime, java.compile.jetbrains.mps.console.ideCommands.runtime, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/blCommand/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand#5336086527852811409" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.blCommand#5336086527852811409" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.scripts.runtime" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.scripts, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/blCommand/generator/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1233,11 +980,7 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
-        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1250,37 +993,35 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.blCommand#5336086527852811409">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime">
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.ideCommands.runtime" depends="fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.scripts" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/scripts/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/scripts/source_gen" />
       </src>
       <classpath>
+        <pathelement path="${build.tmp}/java/out/consoleTool" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
@@ -1289,9 +1030,12 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1301,37 +1045,35 @@
         <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
         <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
+        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.ideCommands" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.scripts#1734392475490224704" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.scripts, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1349,9 +1091,7 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1364,35 +1104,32 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.ideCommands#7935955022005272663" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.blCommand.runtime, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.actions" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/actions/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.actions" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.actions" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
+        <path location="${mps_home}/plugins/console/actions/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1410,8 +1147,6 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
         <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
@@ -1435,56 +1170,26 @@
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.console.internalCommands.runtime" depends="fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
-        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
-        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
-        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <path refid="path.jdk.classpath" />
-      </classpath>
-    </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime">
-      <fileset dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.actions">
+      <fileset dir="${mps_home}/plugins/console/actions/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.internalCommands" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.ideCommands.runtime" depends="fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
       </src>
       <classpath>
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
@@ -1493,14 +1198,9 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1510,15 +1210,18 @@
         <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
         <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
@@ -1526,18 +1229,18 @@
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands">
-      <fileset dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.internalCommands#8483375838963160298" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.internalCommands, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.ideCommands" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1555,9 +1258,8 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
+        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1570,31 +1272,36 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298">
-      <fileset dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.scripts.runtime" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.scripts, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.ideCommands#7935955022005272663" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1612,8 +1319,9 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
+        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1626,49 +1334,43 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime">
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.scripts" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/scripts/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.internalCommands.runtime" depends="fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/scripts/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
       </src>
       <classpath>
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1677,35 +1379,21 @@
         <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
         <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime">
+      <fileset dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.scripts#1734392475490224704" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.scripts, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.internalCommands" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1723,8 +1411,7 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1745,23 +1432,24 @@
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands">
+      <fileset dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.actions" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.blCommand.runtime, java.compile.jetbrains.mps.console.ideCommands, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/actions/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.actions" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.actions" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.internalCommands#8483375838963160298" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.internalCommands, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/actions/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1779,10 +1467,8 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
-        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1803,13 +1489,14 @@
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.actions">
-      <fileset dir="${mps_home}/plugins/console/actions/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298">
+      <fileset dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
@@ -1895,20 +1582,17 @@
   <target name="cleanSources">
     <delete dir="${mps_home}/plugins/console/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/base/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/base/generator/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
-    <delete dir="${mps_home}/plugins/mpsjava/workbench/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/blCommand/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
+    <delete dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
+    <delete dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/scripts/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
+    <delete dir="${mps_home}/plugins/mpsjava/workbench/source_gen" />
     <delete dir="${mps_home}/plugins/console/actions/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/blCommand/generator/source_gen" />
+    <delete dir="${mps_home}/plugins/console/lang/base/generator/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/core/kernel/kernel.iml b/core/kernel/kernel.iml
index 81b702eb47ad..068bcc3adc02 100644
--- a/core/kernel/kernel.iml
+++ b/core/kernel/kernel.iml
@@ -39,5 +39,6 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="project" exported="" />
     <orderEntry type="module" module-name="components" exported="" />
+    <orderEntry type="module" module-name="findUsages-runtime" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/kernel/kernelSolution/jetbrains.mps.kernel.msd b/core/kernel/kernelSolution/jetbrains.mps.kernel.msd
index 830bd76e7f5f..ac36a89c3212 100644
--- a/core/kernel/kernelSolution/jetbrains.mps.kernel.msd
+++ b/core/kernel/kernelSolution/jetbrains.mps.kernel.msd
@@ -24,6 +24,7 @@
     <dependency reexport="false">9ef82768-a1b1-451e-b136-5a86b2b5fdbb(jetbrains.mps.persistence)</dependency>
     <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
     <dependency reexport="false">f159adf4-3c93-40f9-9c5a-1f245a8697af(jetbrains.mps.lang.customAspect)</dependency>
+    <dependency reexport="false">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -36,7 +37,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="dcb5a83a-19a8-44ff-a4cb-fc7d324ecc63" fqName="jetbrains.mps.core.xml.sax" version="0" />
diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/core/kernel/kernelSolution/jetbrains/mps/smodel/query.mps
similarity index 66%
rename from plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps
rename to core/kernel/kernelSolution/jetbrains/mps/smodel/query.mps
index 678e2c65bba4..6d4d799bb1de 100644
--- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps
+++ b/core/kernel/kernelSolution/jetbrains/mps/smodel/query.mps
@@ -1,70 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)">
+<model ref="r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)">
   <persistence version="9" />
   <languages>
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <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="0" />
-    <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="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base" version="0" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
+    <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="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
-    <import index="b2d5" ref="r:1a2b3027-99d2-4946-917b-f185130ac75d(jetbrains.mps.ide.findusages.findalgorithm.finders)" />
-    <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module()" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util()" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model()" />
-    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util()" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project()" />
-    <import index="9erk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model()" />
-    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project()" />
-    <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project()" />
-    <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components()" />
-    <import index="yctd" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.findUsages()" />
-    <import index="ngmm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.view()" />
-    <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress()" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language()" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang()" />
-    <import index="ngmn" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.findusages.view()" />
-    <import index="tpem" ref="r:00000000-0000-4000-0000-011c895902c2(jetbrains.mps.baseLanguage.dataFlow)" />
-    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations()" />
-    <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
-    <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io()" />
-    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui()" />
-    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide()" />
-    <import index="kt01" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.datatransfer()" />
-    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing()" />
-    <import index="oh9p" ref="r:ab572aa6-6e4f-43f3-8bc9-ad4a8ae29372(jetbrains.mps.console.actions)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
-    <import index="mte5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes()" />
-    <import index="tp4s" ref="r:00000000-0000-4000-0000-011c89590360(jetbrains.mps.lang.plugin.behavior)" />
-    <import index="tp4k" ref="r:00000000-0000-4000-0000-011c89590368(jetbrains.mps.lang.plugin.structure)" />
-    <import index="zyb2" ref="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)" />
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem()" />
-    <import index="7bx7" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.workbench.action()" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application()" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel()" />
+    <import index="yctd" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.findUsages(MPS.Core/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)" />
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="g4jo" ref="r:d98d04fb-4a60-4106-81cf-6cb40b67de4d(jetbrains.mps.ide.findusages.model)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="mte5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <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" />
-      </concept>
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
       <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" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
@@ -81,17 +40,9 @@
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
-      <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
-        <child id="1164879758292" name="body" index="SfCbr" />
-        <child id="1164903496223" name="catchClause" index="TEbGg" />
-      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
-        <child id="1164903359218" name="catchBody" index="TDEfX" />
-        <child id="1164903359217" name="throwable" index="TDEfY" />
-      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -104,7 +55,6 @@
         <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
@@ -119,8 +69,6 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -131,13 +79,15 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
+        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
+      </concept>
       <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
       </concept>
@@ -147,10 +97,6 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -158,7 +104,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -186,23 +131,18 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
         <child id="1163668914799" name="condition" index="3K4Cdx" />
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
-        <reference id="1116615189566" name="classifier" index="3VsUkX" />
-      </concept>
     </language>
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
-        <child id="1235746996653" name="function" index="2SgG2M" />
-      </concept>
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
       </concept>
@@ -211,21 +151,7 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
-        <property id="1167228628751" name="hasException" index="34fQS0" />
-        <property id="1167245565795" name="severity" index="35gtTG" />
-        <child id="1167227463056" name="logExpression" index="34bqiv" />
-        <child id="1167227561449" name="exception" index="34bMjA" />
-      </concept>
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <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="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
-        <child id="1138662048170" name="value" index="tz02z" />
-      </concept>
       <concept id="8758390115029295477" name="jetbrains.mps.lang.smodel.structure.SReferenceType" flags="in" index="2z4iKi" />
       <concept id="8758390115028452779" name="jetbrains.mps.lang.smodel.structure.Node_GetReferencesOperation" flags="nn" index="2z74zc" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
@@ -233,18 +159,7 @@
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7" />
-      <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
-        <child id="1180636770616" name="createdType" index="3zrR0E" />
-      </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -271,9 +186,21 @@
       </concept>
     </language>
   </registry>
+  <node concept="3HP615" id="1ycrhFMLI_B">
+    <property role="TrG5h" value="QueryExecutionContext" />
+    <node concept="3clFb_" id="3lidccNHjWv" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="getDefaultSearchScope" />
+      <node concept="3uibUv" id="3lidccNI3yb" role="3clF45">
+        <ref role="3uigEE" to="lui2:~SearchScope" resolve="SearchScope" />
+      </node>
+      <node concept="3Tm1VV" id="3lidccNHjWy" role="1B3o_S" />
+      <node concept="3clFbS" id="3lidccNHjWz" role="3clF47" />
+    </node>
+    <node concept="3Tm1VV" id="1ycrhFMLI_C" role="1B3o_S" />
+  </node>
   <node concept="312cEu" id="hpHLh7Fj1$">
     <property role="TrG5h" value="CommandUtil" />
-    <node concept="2tJIrI" id="3k3Ji7Iobfo" role="jymVt" />
     <node concept="2YIFZL" id="hpHLh7Fj2X" role="jymVt">
       <property role="DiZV1" value="false" />
       <property role="TrG5h" value="nodes" />
@@ -533,274 +460,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3J6h25QQc6K" role="jymVt" />
-    <node concept="2YIFZL" id="YwfKjlX8gC" role="jymVt">
-      <property role="TrG5h" value="show" />
-      <property role="DiZV1" value="false" />
-      <node concept="3cqZAl" id="YwfKjlWH82" role="3clF45" />
-      <node concept="37vLTG" id="YwfKjlWH9m" role="3clF46">
-        <property role="TrG5h" value="p" />
-        <node concept="3uibUv" id="YwfKjlWH9l" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="YwfKjlWH9y" role="3clF46">
-        <property role="TrG5h" value="results" />
-        <node concept="1ajhzC" id="1oFmEVz5uJq" role="1tU5fm">
-          <node concept="3uibUv" id="1oFmEVz5vnA" role="1ajl9A">
-            <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="YwfKjlWH8e" role="3clF47">
-        <node concept="SfApY" id="6M9lfhDHQRu" role="3cqZAp">
-          <node concept="3clFbS" id="6M9lfhDHQRw" role="SfCbr">
-            <node concept="3clFbF" id="YwfKjlWHaA" role="3cqZAp">
-              <node concept="2OqwBi" id="6M9lfhDGIIu" role="3clFbG">
-                <node concept="2EnYce" id="7wtp0S5i5vV" role="2Oq$k0">
-                  <node concept="2YIFZM" id="YwfKjlWHEt" role="2Oq$k0">
-                    <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project):com.intellij.openapi.project.Project" resolve="toIdeaProject" />
-                    <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                    <node concept="37vLTw" id="YwfKjlWHEN" role="37wK5m">
-                      <ref role="3cqZAo" node="YwfKjlWH9m" resolve="p" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="YwfKjlWKKQ" role="2OqNvi">
-                    <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
-                    <node concept="3VsKOn" id="YwfKjlWLmT" role="37wK5m">
-                      <ref role="3VsUkX" to="ngmn:~UsagesViewTool" resolve="UsagesViewTool" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="YwfKjlX7TS" role="2OqNvi">
-                  <ref role="37wK5l" to="ngmn:~UsagesViewTool.show(jetbrains.mps.ide.findusages.model.SearchResults,java.lang.String):void" resolve="show" />
-                  <node concept="2Sg_IR" id="1oFmEVz5w9u" role="37wK5m">
-                    <node concept="37vLTw" id="1oFmEVz5w9v" role="2SgG2M">
-                      <ref role="3cqZAo" node="YwfKjlWH9y" resolve="results" />
-                    </node>
-                  </node>
-                  <node concept="Xl_RD" id="6M9lfhDGpMO" role="37wK5m">
-                    <property role="Xl_RC" value="No results to show" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="TDmWw" id="6M9lfhDHQRx" role="TEbGg">
-            <node concept="3cpWsn" id="6M9lfhDHQRz" role="TDEfY">
-              <property role="TrG5h" value="e" />
-              <node concept="3uibUv" id="6M9lfhDHRy6" role="1tU5fm">
-                <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-              </node>
-            </node>
-            <node concept="3clFbS" id="6M9lfhDHQRB" role="TDEfX">
-              <node concept="34ab3g" id="6M9lfhDHRXD" role="3cqZAp">
-                <property role="35gtTG" value="warn" />
-                <property role="34fQS0" value="true" />
-                <node concept="Xl_RD" id="6M9lfhDHRXF" role="34bqiv">
-                  <property role="Xl_RC" value="Exception in showing custom console result" />
-                </node>
-                <node concept="37vLTw" id="6M9lfhDHSTh" role="34bMjA">
-                  <ref role="3cqZAo" node="6M9lfhDHQRz" resolve="e" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="YwfKjlWH6V" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="6_TW7xVH9Oh" role="jymVt" />
-    <node concept="2YIFZL" id="6_TW7xVHbRP" role="jymVt">
-      <property role="TrG5h" value="printClosure" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <node concept="3clFbS" id="6_TW7xVHbRS" role="3clF47">
-        <node concept="3cpWs8" id="6_TW7xVvsk4" role="3cqZAp">
-          <node concept="3cpWsn" id="6_TW7xVvsk5" role="3cpWs9">
-            <property role="TrG5h" value="nodeWithClosure" />
-            <node concept="3Tqbb2" id="6_TW7xVvsk6" role="1tU5fm">
-              <ref role="ehGHo" to="eynw:XHjpmeKJb6" resolve="NodeWithClosure" />
-            </node>
-            <node concept="2ShNRf" id="6_TW7xVvsk7" role="33vP2m">
-              <node concept="3zrR0B" id="6_TW7xVvsk8" role="2ShVmc">
-                <node concept="3Tqbb2" id="6_TW7xVvsk9" role="3zrR0E">
-                  <ref role="ehGHo" to="eynw:XHjpmeKJb6" resolve="NodeWithClosure" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6_TW7xVvska" role="3cqZAp">
-          <node concept="37vLTI" id="6_TW7xVvskb" role="3clFbG">
-            <node concept="2OqwBi" id="6_TW7xVvskc" role="37vLTJ">
-              <node concept="37vLTw" id="6_TW7xVvskd" role="2Oq$k0">
-                <ref role="3cqZAo" node="6_TW7xVvsk5" resolve="nodeWithClosure" />
-              </node>
-              <node concept="3TrcHB" id="6_TW7xVvske" role="2OqNvi">
-                <ref role="3TsBF5" to="eynw:3ob4OZ0hWSE" resolve="text" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="6_TW7xVHrmy" role="37vLTx">
-              <ref role="3cqZAo" node="6_TW7xVHprM" resolve="text" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6_TW7xVvskl" role="3cqZAp">
-          <node concept="2OqwBi" id="6_TW7xVvskm" role="3clFbG">
-            <node concept="2YIFZM" id="6_TW7xVvskn" role="2Oq$k0">
-              <ref role="1Pybhc" to="oh9p:2ONldth5Ft3" resolve="ClosureHoldingNodeUtil" />
-              <ref role="37wK5l" to="oh9p:2ONldth5FtA" resolve="getInstance" />
-            </node>
-            <node concept="liA8E" id="6_TW7xVvsko" role="2OqNvi">
-              <ref role="37wK5l" to="oh9p:2ONldth5FtR" resolve="register" />
-              <node concept="37vLTw" id="6_TW7xVvskp" role="37wK5m">
-                <ref role="3cqZAo" node="6_TW7xVvsk5" resolve="nodeWithClosure" />
-              </node>
-              <node concept="37vLTw" id="igjXyurl_9" role="37wK5m">
-                <ref role="3cqZAo" node="6_TW7xVHjmt" resolve="closure" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6_TW7xVvwFd" role="3cqZAp">
-          <node concept="2OqwBi" id="6_TW7xVvrTs" role="3clFbG">
-            <node concept="37vLTw" id="6_TW7xVHrRD" role="2Oq$k0">
-              <ref role="3cqZAo" node="6_TW7xVHhd5" resolve="console" />
-            </node>
-            <node concept="liA8E" id="6_TW7xVvrTF" role="2OqNvi">
-              <ref role="37wK5l" to="qgo0:7Jzw3XJWFQB" resolve="addNode" />
-              <node concept="37vLTw" id="6_TW7xVvxSh" role="37wK5m">
-                <ref role="3cqZAo" node="6_TW7xVvsk5" resolve="nodeWithClosure" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6_TW7xVHawb" role="1B3o_S" />
-      <node concept="3cqZAl" id="6_TW7xVHbA9" role="3clF45" />
-      <node concept="37vLTG" id="6_TW7xVHhd5" role="3clF46">
-        <property role="TrG5h" value="console" />
-        <node concept="3uibUv" id="6_TW7xVHhxi" role="1tU5fm">
-          <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6_TW7xVHjmt" role="3clF46">
-        <property role="TrG5h" value="closure" />
-        <node concept="1ajhzC" id="igjXyurl8w" role="1tU5fm">
-          <node concept="3cqZAl" id="igjXyurlrQ" role="1ajl9A" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6_TW7xVHprM" role="3clF46">
-        <property role="TrG5h" value="text" />
-        <node concept="17QB3L" id="6_TW7xVHpPs" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="32notsQa_C_" role="jymVt" />
-    <node concept="2YIFZL" id="7OcVEq$r3o_" role="jymVt">
-      <property role="TrG5h" value="printSequence" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <node concept="3clFbS" id="7OcVEq$r3oC" role="3clF47">
-        <node concept="3clFbJ" id="7uW68YxsGKv" role="3cqZAp">
-          <node concept="3clFbS" id="7uW68YxsGKy" role="3clFbx">
-            <node concept="3clFbF" id="7uW68YxsIBY" role="3cqZAp">
-              <node concept="2OqwBi" id="7uW68YxsIDc" role="3clFbG">
-                <node concept="37vLTw" id="7uW68YxsIBX" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7OcVEq$sjIV" resolve="console" />
-                </node>
-                <node concept="liA8E" id="7uW68YxsIOi" role="2OqNvi">
-                  <ref role="37wK5l" to="qgo0:5WpmwkrQPWC" resolve="addText" />
-                  <node concept="Xl_RD" id="7uW68YxsIPy" role="37wK5m">
-                    <property role="Xl_RC" value="empty sequence" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="7uW68YxsIa$" role="3clFbw">
-            <node concept="3cmrfG" id="7uW68YxsI_D" role="3uHU7w">
-              <property role="3cmrfH" value="0" />
-            </node>
-            <node concept="37vLTw" id="7uW68YxsHcp" role="3uHU7B">
-              <ref role="3cqZAo" node="7OcVEq$ssJv" resolve="resultsCount" />
-            </node>
-          </node>
-          <node concept="9aQIb" id="7uW68YxsJ1w" role="9aQIa">
-            <node concept="3clFbS" id="7uW68YxsJ1x" role="9aQI4">
-              <node concept="3clFbF" id="7uW68YxsJF4" role="3cqZAp">
-                <node concept="2YIFZM" id="6_TW7xVHEl6" role="3clFbG">
-                  <ref role="1Pybhc" node="hpHLh7Fj1$" resolve="CommandUtil" />
-                  <ref role="37wK5l" node="6_TW7xVHbRP" resolve="printClosure" />
-                  <node concept="37vLTw" id="7OcVEq$skpu" role="37wK5m">
-                    <ref role="3cqZAo" node="7OcVEq$sjIV" resolve="console" />
-                  </node>
-                  <node concept="1bVj0M" id="igjXyur9Iz" role="37wK5m">
-                    <node concept="3clFbS" id="igjXyur9I_" role="1bW5cS">
-                      <node concept="3clFbF" id="6_TW7xVIkl9" role="3cqZAp">
-                        <node concept="2YIFZM" id="6_TW7xVHMGx" role="3clFbG">
-                          <ref role="37wK5l" node="YwfKjlX8gC" resolve="show" />
-                          <ref role="1Pybhc" node="hpHLh7Fj1$" resolve="CommandUtil" />
-                          <node concept="37vLTw" id="7OcVEq$spOW" role="37wK5m">
-                            <ref role="3cqZAo" node="7OcVEq$so7u" resolve="project" />
-                          </node>
-                          <node concept="37vLTw" id="32notsQ90CP" role="37wK5m">
-                            <ref role="3cqZAo" node="7OcVEq$sqLw" resolve="results" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs3" id="6_TW7xVKW7p" role="37wK5m">
-                    <node concept="3cpWs3" id="6_TW7xVHOQ_" role="3uHU7B">
-                      <node concept="Xl_RD" id="6_TW7xVKYUn" role="3uHU7w">
-                        <property role="Xl_RC" value=" " />
-                      </node>
-                      <node concept="37vLTw" id="7OcVEq$stnI" role="3uHU7B">
-                        <ref role="3cqZAo" node="7OcVEq$ssJv" resolve="resultsCount" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="7OcVEq$swV5" role="3uHU7w">
-                      <ref role="3cqZAo" node="7OcVEq$sv8h" resolve="resultDescription" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7OcVEq$r2Wm" role="1B3o_S" />
-      <node concept="3cqZAl" id="7OcVEq$r3ov" role="3clF45" />
-      <node concept="37vLTG" id="7OcVEq$sjIV" role="3clF46">
-        <property role="TrG5h" value="console" />
-        <node concept="3uibUv" id="7OcVEq$sjIU" role="1tU5fm">
-          <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7OcVEq$so7u" role="3clF46">
-        <property role="TrG5h" value="project" />
-        <node concept="3uibUv" id="7OcVEq$upcg" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7OcVEq$sqLw" role="3clF46">
-        <property role="TrG5h" value="results" />
-        <node concept="1ajhzC" id="32notsQ8ZpQ" role="1tU5fm">
-          <node concept="3uibUv" id="32notsQ903A" role="1ajl9A">
-            <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7OcVEq$ssJv" role="3clF46">
-        <property role="TrG5h" value="resultsCount" />
-        <node concept="10Oyi0" id="7OcVEq$st9G" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7OcVEq$sv8h" role="3clF46">
-        <property role="TrG5h" value="resultDescription" />
-        <node concept="17QB3L" id="7OcVEq$swc4" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="YwfKjlXcm7" role="jymVt" />
     <node concept="2YIFZL" id="YwfKjlXcuc" role="jymVt">
       <property role="TrG5h" value="nodesToResults" />
       <property role="od$2w" value="false" />
@@ -813,12 +472,12 @@
                 <node concept="3cpWsn" id="YwfKjlXfxx" role="3cpWs9">
                   <property role="TrG5h" value="res" />
                   <node concept="3uibUv" id="YwfKjlXfxo" role="1tU5fm">
-                    <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+                    <ref role="3uigEE" to="g4jo:J2bOg02HbG" resolve="SearchResults" />
                     <node concept="3Tqbb2" id="YwfKjlXfxr" role="11_B2D" />
                   </node>
                   <node concept="2ShNRf" id="YwfKjlXfxy" role="33vP2m">
                     <node concept="1pGfFk" id="YwfKjlXfxz" role="2ShVmc">
-                      <ref role="37wK5l" to="9erk:~SearchResults.&lt;init&gt;()" resolve="SearchResults" />
+                      <ref role="37wK5l" to="g4jo:J2bOg02HbW" resolve="SearchResults" />
                       <node concept="3Tqbb2" id="YwfKjlXfx$" role="1pMfVU" />
                     </node>
                   </node>
@@ -867,14 +526,14 @@
                                 <ref role="3cqZAo" node="YwfKjlXfxx" resolve="res" />
                               </node>
                               <node concept="liA8E" id="YwfKjlXiwi" role="2OqNvi">
-                                <ref role="37wK5l" to="9erk:~SearchResults.getSearchResults():java.util.List" resolve="getSearchResults" />
+                                <ref role="37wK5l" to="g4jo:J2bOg02Hc_" resolve="getSearchResults" />
                               </node>
                             </node>
                             <node concept="liA8E" id="YwfKjlXqSs" role="2OqNvi">
                               <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
                               <node concept="2ShNRf" id="YwfKjlXr5f" role="37wK5m">
                                 <node concept="1pGfFk" id="YwfKjlXzb3" role="2ShVmc">
-                                  <ref role="37wK5l" to="9erk:~SearchResult.&lt;init&gt;(java.lang.Object,java.lang.String)" resolve="SearchResult" />
+                                  <ref role="37wK5l" to="g4jo:J2bOg02GIy" resolve="SearchResult" />
                                   <node concept="3Tqbb2" id="YwfKjlXzzg" role="1pMfVU" />
                                   <node concept="2EnYce" id="7k8t3EBnfcj" role="37wK5m">
                                     <node concept="37vLTw" id="1oFmEVz7G7e" role="2Oq$k0">
@@ -930,7 +589,7 @@
       </node>
       <node concept="1ajhzC" id="1oFmEVz7I3N" role="3clF45">
         <node concept="3uibUv" id="1oFmEVz7I3O" role="1ajl9A">
-          <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+          <ref role="3uigEE" to="g4jo:J2bOg02HbG" resolve="SearchResults" />
         </node>
       </node>
     </node>
@@ -947,12 +606,12 @@
                 <node concept="3cpWsn" id="YwfKjlX_cz" role="3cpWs9">
                   <property role="TrG5h" value="res" />
                   <node concept="3uibUv" id="YwfKjlX_c$" role="1tU5fm">
-                    <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+                    <ref role="3uigEE" to="g4jo:J2bOg02HbG" resolve="SearchResults" />
                     <node concept="H_c77" id="YwfKjlX_On" role="11_B2D" />
                   </node>
                   <node concept="2ShNRf" id="YwfKjlX_cA" role="33vP2m">
                     <node concept="1pGfFk" id="YwfKjlX_cB" role="2ShVmc">
-                      <ref role="37wK5l" to="9erk:~SearchResults.&lt;init&gt;()" resolve="SearchResults" />
+                      <ref role="37wK5l" to="g4jo:J2bOg02HbW" resolve="SearchResults" />
                       <node concept="H_c77" id="YwfKjlX_Os" role="1pMfVU" />
                     </node>
                   </node>
@@ -1001,14 +660,14 @@
                                 <ref role="3cqZAo" node="YwfKjlX_cz" resolve="res" />
                               </node>
                               <node concept="liA8E" id="YwfKjlX_cN" role="2OqNvi">
-                                <ref role="37wK5l" to="9erk:~SearchResults.getSearchResults():java.util.List" resolve="getSearchResults" />
+                                <ref role="37wK5l" to="g4jo:J2bOg02Hc_" resolve="getSearchResults" />
                               </node>
                             </node>
                             <node concept="liA8E" id="YwfKjlX_cO" role="2OqNvi">
                               <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
                               <node concept="2ShNRf" id="YwfKjlX_cP" role="37wK5m">
                                 <node concept="1pGfFk" id="YwfKjlX_cQ" role="2ShVmc">
-                                  <ref role="37wK5l" to="9erk:~SearchResult.&lt;init&gt;(java.lang.Object,java.lang.String)" resolve="SearchResult" />
+                                  <ref role="37wK5l" to="g4jo:J2bOg02GIy" resolve="SearchResult" />
                                   <node concept="H_c77" id="YwfKjlX_Ox" role="1pMfVU" />
                                   <node concept="2EnYce" id="7k8t3EBnfvA" role="37wK5m">
                                     <node concept="37vLTw" id="YwfKjlX_P2" role="2Oq$k0">
@@ -1064,7 +723,7 @@
       </node>
       <node concept="1ajhzC" id="1oFmEVz7bQt" role="3clF45">
         <node concept="3uibUv" id="1oFmEVz7bQu" role="1ajl9A">
-          <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+          <ref role="3uigEE" to="g4jo:J2bOg02HbG" resolve="SearchResults" />
         </node>
       </node>
     </node>
@@ -1081,14 +740,14 @@
                 <node concept="3cpWsn" id="YwfKjlX_eJ" role="3cpWs9">
                   <property role="TrG5h" value="res" />
                   <node concept="3uibUv" id="YwfKjlX_eK" role="1tU5fm">
-                    <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+                    <ref role="3uigEE" to="g4jo:J2bOg02HbG" resolve="SearchResults" />
                     <node concept="3uibUv" id="YwfKjlXAR4" role="11_B2D">
                       <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
                     </node>
                   </node>
                   <node concept="2ShNRf" id="YwfKjlX_eM" role="33vP2m">
                     <node concept="1pGfFk" id="YwfKjlX_eN" role="2ShVmc">
-                      <ref role="37wK5l" to="9erk:~SearchResults.&lt;init&gt;()" resolve="SearchResults" />
+                      <ref role="37wK5l" to="g4jo:J2bOg02HbW" resolve="SearchResults" />
                       <node concept="3uibUv" id="YwfKjlXAvs" role="1pMfVU">
                         <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
                       </node>
@@ -1139,14 +798,14 @@
                                 <ref role="3cqZAo" node="YwfKjlX_eJ" resolve="res" />
                               </node>
                               <node concept="liA8E" id="YwfKjlX_eZ" role="2OqNvi">
-                                <ref role="37wK5l" to="9erk:~SearchResults.getSearchResults():java.util.List" resolve="getSearchResults" />
+                                <ref role="37wK5l" to="g4jo:J2bOg02Hc_" resolve="getSearchResults" />
                               </node>
                             </node>
                             <node concept="liA8E" id="YwfKjlX_f0" role="2OqNvi">
                               <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
                               <node concept="2ShNRf" id="YwfKjlX_f1" role="37wK5m">
                                 <node concept="1pGfFk" id="YwfKjlX_f2" role="2ShVmc">
-                                  <ref role="37wK5l" to="9erk:~SearchResult.&lt;init&gt;(java.lang.Object,java.lang.String)" resolve="SearchResult" />
+                                  <ref role="37wK5l" to="g4jo:J2bOg02GIy" resolve="SearchResult" />
                                   <node concept="2EnYce" id="7k8t3EBnfMN" role="37wK5m">
                                     <node concept="37vLTw" id="YwfKjlXAvn" role="2Oq$k0">
                                       <ref role="3cqZAo" node="YwfKjlX_f6" resolve="it" />
@@ -1205,7 +864,7 @@
       </node>
       <node concept="1ajhzC" id="1oFmEVz7dRK" role="3clF45">
         <node concept="3uibUv" id="1oFmEVz7dRL" role="1ajl9A">
-          <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+          <ref role="3uigEE" to="g4jo:J2bOg02HbG" resolve="SearchResults" />
         </node>
       </node>
     </node>
@@ -1326,209 +985,6 @@
       <node concept="3Tm1VV" id="32notsQs8uH" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="22lVekVIiKw" role="jymVt" />
-    <node concept="2YIFZL" id="22lVekVIkdS" role="jymVt">
-      <property role="TrG5h" value="addNodeReference" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <node concept="3clFbS" id="22lVekVIkdV" role="3clF47">
-        <node concept="3cpWs8" id="22lVekVIvjf" role="3cqZAp">
-          <node concept="3cpWsn" id="22lVekVIvji" role="3cpWs9">
-            <property role="TrG5h" value="node" />
-            <node concept="3Tqbb2" id="22lVekVIvjd" role="1tU5fm">
-              <ref role="ehGHo" to="eynw:22lVekVIQ0c" resolve="NodeReferencePresentation" />
-            </node>
-            <node concept="2ShNRf" id="22lVekVLjuG" role="33vP2m">
-              <node concept="3zrR0B" id="22lVekVLjuE" role="2ShVmc">
-                <node concept="3Tqbb2" id="22lVekVLjuF" role="3zrR0E">
-                  <ref role="ehGHo" to="eynw:22lVekVIQ0c" resolve="NodeReferencePresentation" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="22lVekVLjBa" role="3cqZAp">
-          <node concept="2OqwBi" id="22lVekVLnyD" role="3clFbG">
-            <node concept="2OqwBi" id="22lVekVLjSd" role="2Oq$k0">
-              <node concept="37vLTw" id="22lVekVLjB9" role="2Oq$k0">
-                <ref role="3cqZAo" node="22lVekVIvji" resolve="node" />
-              </node>
-              <node concept="3TrEf2" id="igjXyuTl5A" role="2OqNvi">
-                <ref role="3Tt5mk" to="eynw:igjXyutfLJ" />
-              </node>
-            </node>
-            <node concept="2oxUTD" id="22lVekVLonG" role="2OqNvi">
-              <node concept="37vLTw" id="22lVekVLoqr" role="2oxUTC">
-                <ref role="3cqZAo" node="22lVekVIk_Z" resolve="target" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="22lVekVIpBB" role="3cqZAp">
-          <node concept="2OqwBi" id="22lVekVIpGb" role="3clFbG">
-            <node concept="37vLTw" id="22lVekVIpBA" role="2Oq$k0">
-              <ref role="3cqZAo" node="22lVekVIpqm" resolve="console" />
-            </node>
-            <node concept="liA8E" id="22lVekVIqnI" role="2OqNvi">
-              <ref role="37wK5l" to="qgo0:7Jzw3XJWFQB" resolve="addNode" />
-              <node concept="37vLTw" id="22lVekVLjz2" role="37wK5m">
-                <ref role="3cqZAo" node="22lVekVIvji" resolve="node" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="22lVekVIj9d" role="1B3o_S" />
-      <node concept="3cqZAl" id="22lVekVIkw1" role="3clF45" />
-      <node concept="37vLTG" id="22lVekVIpqm" role="3clF46">
-        <property role="TrG5h" value="console" />
-        <node concept="3uibUv" id="22lVekVIpys" role="1tU5fm">
-          <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="22lVekVIk_Z" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="22lVekVIk_Y" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4waomXVZt_0" role="jymVt" />
-    <node concept="2YIFZL" id="2lR2lzqETRX" role="jymVt">
-      <property role="TrG5h" value="registerAnalyzeStacktraceDialogClosure" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <node concept="3clFbS" id="2lR2lzqETS0" role="3clF47">
-        <node concept="3cpWs8" id="5G2W3aW$Ty1" role="3cqZAp">
-          <node concept="3cpWsn" id="5G2W3aW$Ty2" role="3cpWs9">
-            <property role="TrG5h" value="writer" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="5G2W3aW$Ty3" role="1tU5fm">
-              <ref role="3uigEE" to="guwi:~StringWriter" resolve="StringWriter" />
-            </node>
-            <node concept="2ShNRf" id="5G2W3aW$Ty4" role="33vP2m">
-              <node concept="1pGfFk" id="5G2W3aW$Ty5" role="2ShVmc">
-                <ref role="37wK5l" to="guwi:~StringWriter.&lt;init&gt;()" resolve="StringWriter" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5G2W3aW$Ty6" role="3cqZAp">
-          <node concept="2OqwBi" id="5G2W3aW$Ty7" role="3clFbG">
-            <node concept="37vLTw" id="5G2W3aW$Ty8" role="2Oq$k0">
-              <ref role="3cqZAo" node="2lR2lzqF7aT" resolve="exception" />
-            </node>
-            <node concept="liA8E" id="5G2W3aW$Ty9" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace(java.io.PrintWriter):void" resolve="printStackTrace" />
-              <node concept="2ShNRf" id="5G2W3aW$Tya" role="37wK5m">
-                <node concept="1pGfFk" id="5G2W3aW$Tyb" role="2ShVmc">
-                  <ref role="37wK5l" to="guwi:~PrintWriter.&lt;init&gt;(java.io.Writer)" resolve="PrintWriter" />
-                  <node concept="37vLTw" id="5G2W3aW$Tyc" role="37wK5m">
-                    <ref role="3cqZAo" node="5G2W3aW$Ty2" resolve="writer" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="5G2W3aW$T7$" role="3cqZAp" />
-        <node concept="3cpWs8" id="5G2W3aWBxdh" role="3cqZAp">
-          <node concept="3cpWsn" id="5G2W3aWBxdk" role="3cpWs9">
-            <property role="TrG5h" value="exceptionHolder" />
-            <node concept="3Tqbb2" id="5G2W3aWBxdf" role="1tU5fm">
-              <ref role="ehGHo" to="3xdn:5G2W3aW$Vsk" resolve="ExceptionHolder" />
-            </node>
-            <node concept="2ShNRf" id="5G2W3aWBxCa" role="33vP2m">
-              <node concept="3zrR0B" id="5G2W3aWBxC8" role="2ShVmc">
-                <node concept="3Tqbb2" id="5G2W3aWBxC9" role="3zrR0E">
-                  <ref role="ehGHo" to="3xdn:5G2W3aW$Vsk" resolve="ExceptionHolder" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5G2W3aWBxZ7" role="3cqZAp">
-          <node concept="2OqwBi" id="5G2W3aWBAqu" role="3clFbG">
-            <node concept="2OqwBi" id="5G2W3aWByri" role="2Oq$k0">
-              <node concept="37vLTw" id="5G2W3aWBxZ6" role="2Oq$k0">
-                <ref role="3cqZAo" node="5G2W3aWBxdk" resolve="exceptionHolder" />
-              </node>
-              <node concept="3TrcHB" id="5G2W3aWB$ZB" role="2OqNvi">
-                <ref role="3TsBF5" to="3xdn:5G2W3aWBbyD" resolve="stackTrace" />
-              </node>
-            </node>
-            <node concept="tyxLq" id="5G2W3aWBCmH" role="2OqNvi">
-              <node concept="2OqwBi" id="5G2W3aWBCz_" role="tz02z">
-                <node concept="37vLTw" id="5G2W3aWBCo5" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5G2W3aW$Ty2" resolve="writer" />
-                </node>
-                <node concept="liA8E" id="5G2W3aWBE$r" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~StringWriter.toString():java.lang.String" resolve="toString" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5G2W3aWCkuq" role="3cqZAp">
-          <node concept="2OqwBi" id="5G2W3aWCoZS" role="3clFbG">
-            <node concept="2OqwBi" id="5G2W3aWCkXL" role="2Oq$k0">
-              <node concept="37vLTw" id="5G2W3aWCkup" role="2Oq$k0">
-                <ref role="3cqZAo" node="5G2W3aWBxdk" resolve="exceptionHolder" />
-              </node>
-              <node concept="3TrcHB" id="5G2W3aWCn_1" role="2OqNvi">
-                <ref role="3TsBF5" to="eynw:3ob4OZ0hWSE" resolve="text" />
-              </node>
-            </node>
-            <node concept="tyxLq" id="5G2W3aWCqZ1" role="2OqNvi">
-              <node concept="2OqwBi" id="5G2W3aWCt2J" role="tz02z">
-                <node concept="2OqwBi" id="5G2W3aWCr82" role="2Oq$k0">
-                  <node concept="37vLTw" id="5G2W3aWCr0s" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2lR2lzqF7aT" resolve="exception" />
-                  </node>
-                  <node concept="liA8E" id="5G2W3aWCsoP" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="5G2W3aWCyWv" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Class.getName():java.lang.String" resolve="getName" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5G2W3aWBECf" role="3cqZAp">
-          <node concept="2OqwBi" id="5G2W3aWBF2Y" role="3clFbG">
-            <node concept="37vLTw" id="5G2W3aWBECe" role="2Oq$k0">
-              <ref role="3cqZAo" node="2lR2lzqF4z1" resolve="console" />
-            </node>
-            <node concept="liA8E" id="5G2W3aWBG2_" role="2OqNvi">
-              <ref role="37wK5l" to="qgo0:7Jzw3XJWFQB" resolve="addNode" />
-              <node concept="37vLTw" id="5G2W3aWBGTA" role="37wK5m">
-                <ref role="3cqZAo" node="5G2W3aWBxdk" resolve="exceptionHolder" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2lR2lzqETFH" role="1B3o_S" />
-      <node concept="3cqZAl" id="2lR2lzqETRR" role="3clF45" />
-      <node concept="37vLTG" id="2lR2lzqF31L" role="3clF46">
-        <property role="TrG5h" value="context" />
-        <node concept="3uibUv" id="2lR2lzqF31K" role="1tU5fm">
-          <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2lR2lzqF4z1" role="3clF46">
-        <property role="TrG5h" value="console" />
-        <node concept="3uibUv" id="2lR2lzqF4VT" role="1tU5fm">
-          <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2lR2lzqF7aT" role="3clF46">
-        <property role="TrG5h" value="exception" />
-        <node concept="3uibUv" id="47G6Tek7_Im" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3J6h25QHCOt" role="jymVt" />
     <node concept="2YIFZL" id="3J6h25QHNxY" role="jymVt">
       <property role="TrG5h" value="createConsoleScope" />
       <property role="IEkAT" value="false" />
@@ -1543,11 +999,11 @@
             </node>
             <node concept="3K4zz7" id="3J6h25QKZn9" role="33vP2m">
               <node concept="2OqwBi" id="3lidccNIo1X" role="3K4E3e">
-                <node concept="37vLTw" id="3lidccNIlf2" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3J6h25QLs6x" resolve="context" />
+                <node concept="37vLTw" id="1ycrhFMLLdg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1ycrhFMLKR_" resolve="context" />
                 </node>
                 <node concept="liA8E" id="3lidccNIocU" role="2OqNvi">
-                  <ref role="37wK5l" to="qgo0:3lidccNHjWv" resolve="getDefaultSearchscope" />
+                  <ref role="37wK5l" node="3lidccNHjWv" resolve="getDefaultSearchScope" />
                 </node>
               </node>
               <node concept="37vLTw" id="3J6h25QMGug" role="3K4GZi">
@@ -1596,11 +1052,10 @@
         <property role="3TUv4t" value="true" />
         <node concept="10P_77" id="3J6h25QPqmQ" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="3J6h25QLs6x" role="3clF46">
+      <node concept="37vLTG" id="1ycrhFMLKR_" role="3clF46">
         <property role="TrG5h" value="context" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="3J6h25QLsiX" role="1tU5fm">
-          <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+        <node concept="3uibUv" id="1ycrhFMLKTx" role="1tU5fm">
+          <ref role="3uigEE" node="1ycrhFMLI_B" resolve="QueryExecutionContext" />
         </node>
       </node>
       <node concept="3uibUv" id="4CUSouB_4b5" role="3clF45">
diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies b/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/dependencies
similarity index 65%
rename from plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies
rename to core/kernel/source_gen.caches/jetbrains/mps/smodel/query/dependencies
index d02b12bae554..01859a11471c 100644
--- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies
+++ b/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/dependencies
@@ -1,46 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.runtime.util.CommandUtil" file="CommandUtil.java">
-    <classNode dependClassName="com.intellij.openapi.project.Project" />
-    <classNode dependClassName="java.io.PrintWriter" />
-    <classNode dependClassName="java.io.StringWriter" />
-    <classNode dependClassName="java.lang.Exception" />
+  <dependency className="jetbrains.mps.smodel.query.CommandUtil" file="CommandUtil.java">
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.Object" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="java.lang.Throwable" />
     <classNode dependClassName="java.util.Collection" />
     <classNode dependClassName="java.util.Collections" />
     <classNode dependClassName="java.util.Iterator" />
     <classNode dependClassName="java.util.Set" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes" />
-    <classNode dependClassName="jetbrains.mps.console.actions.ClosureHoldingNodeUtil" />
-    <classNode dependClassName="jetbrains.mps.console.tool.ConsoleContext" />
-    <classNode dependClassName="jetbrains.mps.console.tool.ConsoleStream" />
     <classNode dependClassName="jetbrains.mps.findUsages.FindUsagesManager" />
     <classNode dependClassName="jetbrains.mps.ide.findusages.model.SearchResult" />
     <classNode dependClassName="jetbrains.mps.ide.findusages.model.SearchResults" />
     <classNode dependClassName="jetbrains.mps.ide.findusages.model.scopes.ModelsScope" />
     <classNode dependClassName="jetbrains.mps.ide.findusages.model.scopes.ModulesScope" />
     <classNode dependClassName="jetbrains.mps.ide.findusages.model.scopes.ProjectScope" />
-    <classNode dependClassName="jetbrains.mps.ide.findusages.view.UsagesViewTool" />
-    <classNode dependClassName="jetbrains.mps.ide.project.ProjectHelper" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ITranslator2" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.IVisitor" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.IWhereFilter" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SModelOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
     <classNode dependClassName="jetbrains.mps.progress.EmptyProgressMonitor" />
     <classNode dependClassName="jetbrains.mps.project.EditableFilteringScope" />
     <classNode dependClassName="jetbrains.mps.project.Project" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.apache.log4j.Level" />
-    <classNode dependClassName="org.apache.log4j.LogManager" />
-    <classNode dependClassName="org.apache.log4j.Logger" />
+    <classNode dependClassName="jetbrains.mps.smodel.query.QueryExecutionContext" />
     <classNode dependClassName="org.jetbrains.annotations.Nullable" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SModel" />
@@ -53,5 +36,8 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.module.SRepository" />
     <classNode dependClassName="org.jetbrains.mps.openapi.module.SearchScope" />
   </dependency>
+  <dependency className="jetbrains.mps.smodel.query.QueryExecutionContext" file="QueryExecutionContext.java">
+    <classNode dependClassName="org.jetbrains.mps.openapi.module.SearchScope" />
+  </dependency>
 </dependenciesRoot>
 
diff --git a/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/generated b/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/generated
new file mode 100644
index 000000000000..70489b14ae8c
--- /dev/null
+++ b/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="y62revoc9cnclkxdy707deavzq9eqj" />
+
diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java b/core/kernel/source_gen/jetbrains/mps/smodel/query/CommandUtil.java
similarity index 59%
rename from plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java
rename to core/kernel/source_gen/jetbrains/mps/smodel/query/CommandUtil.java
index ef755b8d52a1..d41726b5acca 100644
--- a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java
+++ b/core/kernel/source_gen/jetbrains/mps/smodel/query/CommandUtil.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.runtime.util;
+package jetbrains.mps.smodel.query;
 
 /*Generated by MPS */
 
@@ -17,16 +17,8 @@
 import java.util.Collections;
 import jetbrains.mps.progress.EmptyProgressMonitor;
 import org.jetbrains.mps.openapi.language.SAbstractConcept;
-import jetbrains.mps.project.Project;
 import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes;
 import jetbrains.mps.ide.findusages.model.SearchResults;
-import jetbrains.mps.ide.project.ProjectHelper;
-import org.apache.log4j.Level;
-import jetbrains.mps.console.tool.ConsoleStream;
-import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations;
-import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
-import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
-import jetbrains.mps.console.actions.ClosureHoldingNodeUtil;
 import org.jetbrains.mps.openapi.model.SNodeReference;
 import org.jetbrains.mps.openapi.module.SRepository;
 import jetbrains.mps.internal.collections.runtime.IWhereFilter;
@@ -34,22 +26,15 @@
 import jetbrains.mps.ide.findusages.model.SearchResult;
 import org.jetbrains.mps.openapi.model.SModelReference;
 import org.jetbrains.mps.openapi.module.SModuleReference;
-import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
-import jetbrains.mps.console.tool.ConsoleContext;
-import java.io.StringWriter;
-import java.io.PrintWriter;
 import org.jetbrains.annotations.Nullable;
 import jetbrains.mps.project.EditableFilteringScope;
 import jetbrains.mps.ide.findusages.model.scopes.ModelsScope;
 import jetbrains.mps.ide.findusages.model.scopes.ModulesScope;
 import java.util.Iterator;
+import jetbrains.mps.project.Project;
 import jetbrains.mps.ide.findusages.model.scopes.ProjectScope;
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
-import jetbrains.mps.ide.findusages.view.UsagesViewTool;
 
 public class CommandUtil {
-
   public static Iterable<SNode> nodes(SearchScope scope) {
     return Sequence.fromIterable(models(scope)).translate(new ITranslator2<SModel, SNode>() {
       public Iterable<SNode> translate(SModel it) {
@@ -82,46 +67,17 @@ public static Collection<SNode> instances(SearchScope scope, SAbstractConcept co
     return FindUsagesManager.getInstance().findInstances(scope, Collections.singleton(concept), false, new EmptyProgressMonitor());
   }
 
-  public static void show(Project p, _FunctionTypes._return_P0_E0<? extends SearchResults> results) {
-    try {
-      check_1pinza_a0a0a0n(ProjectHelper.toIdeaProject(p)).show(results.invoke(), "No results to show");
-    } catch (Exception e) {
-      if (LOG.isEnabledFor(Level.WARN)) {
-        LOG.warn("Exception in showing custom console result", e);
-      }
-    }
-  }
-
-  public static void printClosure(ConsoleStream console, _FunctionTypes._void_P0_E0 closure, String text) {
-    SNode nodeWithClosure = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xf6d4d958ec2f2c6L, "jetbrains.mps.console.base.structure.NodeWithClosure")));
-    SPropertyOperations.set(nodeWithClosure, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L, 0x360b134fc047ce2aL, "text"), text);
-    ClosureHoldingNodeUtil.getInstance().register(nodeWithClosure, closure);
-    console.addNode(nodeWithClosure);
-  }
-
-  public static void printSequence(ConsoleStream console, final Project project, final _FunctionTypes._return_P0_E0<? extends SearchResults> results, int resultsCount, String resultDescription) {
-    if (resultsCount == 0) {
-      console.addText("empty sequence");
-    } else {
-      CommandUtil.printClosure(console, new _FunctionTypes._void_P0_E0() {
-        public void invoke() {
-          CommandUtil.show(project, results);
-        }
-      }, resultsCount + " " + resultDescription);
-    }
-  }
-
   public static _FunctionTypes._return_P0_E0<? extends SearchResults> nodesToResults(final Iterable<SNodeReference> nodes, final SRepository repository) {
     return new _FunctionTypes._return_P0_E0<SearchResults<SNode>>() {
       public SearchResults<SNode> invoke() {
         final SearchResults<SNode> res = new SearchResults<SNode>();
         Sequence.fromIterable(nodes).where(new IWhereFilter<SNodeReference>() {
           public boolean accept(SNodeReference it) {
-            return check_1pinza_a0a0a0a0b0a0a91(it, repository) != null;
+            return check_1pinza_a0a0a0a0b0a0a21(it, repository) != null;
           }
         }).visitAll(new IVisitor<SNodeReference>() {
           public void visit(SNodeReference it) {
-            res.getSearchResults().add(new SearchResult<SNode>(check_1pinza_a0a0a0a0a0b0a0a91(it, repository), "usage"));
+            res.getSearchResults().add(new SearchResult<SNode>(check_1pinza_a0a0a0a0a0b0a0a21(it, repository), "usage"));
           }
         });
         return res;
@@ -135,11 +91,11 @@ public SearchResults<SModel> invoke() {
         final SearchResults<SModel> res = new SearchResults<SModel>();
         Sequence.fromIterable(models).where(new IWhereFilter<SModelReference>() {
           public boolean accept(SModelReference it) {
-            return check_1pinza_a0a0a0a0b0a0a12(it, repository) != null;
+            return check_1pinza_a0a0a0a0b0a0a41(it, repository) != null;
           }
         }).visitAll(new IVisitor<SModelReference>() {
           public void visit(SModelReference it) {
-            res.getSearchResults().add(new SearchResult<SModel>(check_1pinza_a0a0a0a0a0b0a0a12(it, repository), "usage"));
+            res.getSearchResults().add(new SearchResult<SModel>(check_1pinza_a0a0a0a0a0b0a0a41(it, repository), "usage"));
           }
         });
         return res;
@@ -153,11 +109,11 @@ public SearchResults<SModule> invoke() {
         final SearchResults<SModule> res = new SearchResults<SModule>();
         Sequence.fromIterable(modules).where(new IWhereFilter<SModuleReference>() {
           public boolean accept(SModuleReference it) {
-            return check_1pinza_a0a0a0a0b0a0a32(it, repository) != null;
+            return check_1pinza_a0a0a0a0b0a0a61(it, repository) != null;
           }
         }).visitAll(new IVisitor<SModuleReference>() {
           public void visit(SModuleReference it) {
-            res.getSearchResults().add(new SearchResult<SModule>(check_1pinza_a0a0a0a0a0b0a0a32(it, repository), "usage"));
+            res.getSearchResults().add(new SearchResult<SModule>(check_1pinza_a0a0a0a0a0b0a0a61(it, repository), "usage"));
           }
         });
         return res;
@@ -167,36 +123,20 @@ public void visit(SModuleReference it) {
   }
 
   public static SNodeReference getNodeReference(SNode aNode) {
-    return check_1pinza_a0a52(aNode);
+    return check_1pinza_a0a81(aNode);
   }
   public static SNodeReference getReferenceReference(SReference aReference) {
-    return check_1pinza_a0a62(check_1pinza_a0a0ab(aReference));
+    return check_1pinza_a0a91(check_1pinza_a0a0t(aReference));
   }
   public static SModelReference getModelReference(SModel aModel) {
-    return check_1pinza_a0a72(aModel);
+    return check_1pinza_a0a02(aModel);
   }
   public static SModuleReference getModuleReference(SModule aModule) {
-    return check_1pinza_a0a82(aModule);
-  }
-
-  public static void addNodeReference(ConsoleStream console, SNode target) {
-    SNode node = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bbb600cL, "jetbrains.mps.console.base.structure.NodeReferencePresentation")));
-    SLinkOperations.setTarget(node, MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x36ac6f29ae8c1fb5L, 0x4904fd89e74fc6fL, "target"), target);
-    console.addNode(node);
-  }
-
-  public static void registerAnalyzeStacktraceDialogClosure(ConsoleContext context, ConsoleStream console, Throwable exception) {
-    StringWriter writer = new StringWriter();
-    exception.printStackTrace(new PrintWriter(writer));
-
-    SNode exceptionHolder = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L, "jetbrains.mps.console.blCommand.structure.ExceptionHolder")));
-    SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace"), writer.toString());
-    SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L, 0x360b134fc047ce2aL, "text"), exception.getClass().getName());
-    console.addNode(exceptionHolder);
+    return check_1pinza_a0a12(aModule);
   }
 
-  public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, final ConsoleContext context) {
-    SearchScope scope = (baseScope == null ? context.getDefaultSearchscope() : baseScope);
+  public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, QueryExecutionContext context) {
+    SearchScope scope = (baseScope == null ? context.getDefaultSearchScope() : baseScope);
     return (includeReadOnly ? scope : new EditableFilteringScope(scope));
   }
 
@@ -217,74 +157,67 @@ public static SearchScope createScope(Project project) {
     return new ProjectScope(project);
   }
 
-  protected static Logger LOG = LogManager.getLogger(CommandUtil.class);
-  private static UsagesViewTool check_1pinza_a0a0a0n(com.intellij.openapi.project.Project checkedDotOperand) {
-    if (null != checkedDotOperand) {
-      return checkedDotOperand.getComponent(UsagesViewTool.class);
-    }
-    return null;
-  }
-  private static SNode check_1pinza_a0a0a0a0b0a0a91(SNodeReference checkedDotOperand, SRepository repository) {
+  private static SNode check_1pinza_a0a0a0a0b0a0a21(SNodeReference checkedDotOperand, SRepository repository) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.resolve(repository);
     }
     return null;
   }
-  private static SNode check_1pinza_a0a0a0a0a0b0a0a91(SNodeReference checkedDotOperand, SRepository repository) {
+  private static SNode check_1pinza_a0a0a0a0a0b0a0a21(SNodeReference checkedDotOperand, SRepository repository) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.resolve(repository);
     }
     return null;
   }
-  private static SModel check_1pinza_a0a0a0a0b0a0a12(SModelReference checkedDotOperand, SRepository repository) {
+  private static SModel check_1pinza_a0a0a0a0b0a0a41(SModelReference checkedDotOperand, SRepository repository) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.resolve(repository);
     }
     return null;
   }
-  private static SModel check_1pinza_a0a0a0a0a0b0a0a12(SModelReference checkedDotOperand, SRepository repository) {
+  private static SModel check_1pinza_a0a0a0a0a0b0a0a41(SModelReference checkedDotOperand, SRepository repository) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.resolve(repository);
     }
     return null;
   }
-  private static SModule check_1pinza_a0a0a0a0b0a0a32(SModuleReference checkedDotOperand, SRepository repository) {
+  private static SModule check_1pinza_a0a0a0a0b0a0a61(SModuleReference checkedDotOperand, SRepository repository) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.resolve(repository);
     }
     return null;
   }
-  private static SModule check_1pinza_a0a0a0a0a0b0a0a32(SModuleReference checkedDotOperand, SRepository repository) {
+  private static SModule check_1pinza_a0a0a0a0a0b0a0a61(SModuleReference checkedDotOperand, SRepository repository) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.resolve(repository);
     }
     return null;
   }
-  private static SNodeReference check_1pinza_a0a52(SNode checkedDotOperand) {
+  private static SNodeReference check_1pinza_a0a81(SNode checkedDotOperand) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.getReference();
     }
     return null;
   }
-  private static SNodeReference check_1pinza_a0a62(SNode checkedDotOperand) {
+  private static SNodeReference check_1pinza_a0a91(SNode checkedDotOperand) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.getReference();
     }
     return null;
   }
-  private static SNode check_1pinza_a0a0ab(SReference checkedDotOperand) {
+  private static SNode check_1pinza_a0a0t(SReference checkedDotOperand) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.getSourceNode();
     }
     return null;
   }
-  private static SModelReference check_1pinza_a0a72(SModel checkedDotOperand) {
+  private static SModelReference check_1pinza_a0a02(SModel checkedDotOperand) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.getReference();
     }
     return null;
   }
-  private static SModuleReference check_1pinza_a0a82(SModule checkedDotOperand) {
+  private static SModuleReference check_1pinza_a0a12(SModule checkedDotOperand) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.getModuleReference();
     }
diff --git a/core/kernel/source_gen/jetbrains/mps/smodel/query/QueryExecutionContext.java b/core/kernel/source_gen/jetbrains/mps/smodel/query/QueryExecutionContext.java
new file mode 100644
index 000000000000..b7122dbf11a0
--- /dev/null
+++ b/core/kernel/source_gen/jetbrains/mps/smodel/query/QueryExecutionContext.java
@@ -0,0 +1,9 @@
+package jetbrains.mps.smodel.query;
+
+/*Generated by MPS */
+
+import org.jetbrains.mps.openapi.module.SearchScope;
+
+public interface QueryExecutionContext {
+  public SearchScope getDefaultSearchScope();
+}
diff --git a/core/kernel/source_gen/jetbrains/mps/smodel/query/trace.info b/core/kernel/source_gen/jetbrains/mps/smodel/query/trace.info
new file mode 100644
index 000000000000..a91aedc976fc
--- /dev/null
+++ b/core/kernel/source_gen/jetbrains/mps/smodel/query/trace.info
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<debug-info>
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.Statement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
+  <root nodeRef="r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)/1768908716159461735">
+    <file name="QueryExecutionContext.java">
+      <node id="3842191445091237663" at="8,0,9,0" concept="2" trace="getDefaultSearchScope#()Lorg/jetbrains/mps/openapi/module/SearchScope;" />
+      <scope id="3842191445091237663" at="8,0,9,0" />
+      <unit id="1768908716159461735" at="7,0,10,0" name="jetbrains.mps.smodel.query.QueryExecutionContext" />
+    </file>
+  </root>
+  <root nodeRef="r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)/313482946808721508">
+    <file name="CommandUtil.java">
+      <node id="6322385757206087378" at="40,51,41,48" concept="4" />
+      <node id="1915462833256354217" at="48,55,49,49" concept="4" />
+      <node id="5348835480204269736" at="54,60,55,48" concept="4" />
+      <node id="5348835480204262779" at="58,62,59,30" concept="4" />
+      <node id="5348835480204364716" at="62,78,63,143" concept="4" />
+      <node id="7738379549910165782" at="66,90,67,131" concept="4" />
+      <node id="1125969196844644448" at="72,44,73,68" concept="3" />
+      <node id="8433118097516180044" at="75,52,76,72" concept="4" />
+      <node id="1125969196844650213" at="79,48,80,121" concept="0" />
+      <node id="1125969196844632110" at="82,11,83,19" concept="4" />
+      <node id="1125969196844733218" at="90,45,91,70" concept="3" />
+      <node id="8433118097516120579" at="93,53,94,72" concept="4" />
+      <node id="1125969196844733231" at="97,49,98,122" concept="0" />
+      <node id="1125969196844733244" at="100,11,101,19" concept="4" />
+      <node id="1125969196844733358" at="108,46,109,72" concept="3" />
+      <node id="8433118097516189970" at="111,54,112,72" concept="4" />
+      <node id="1125969196844733371" at="115,50,116,123" concept="0" />
+      <node id="1125969196844733384" at="118,11,119,19" concept="4" />
+      <node id="1597470200014094243" at="121,6,122,0" concept="5" />
+      <node id="3501374812263049616" at="125,62,126,37" concept="4" />
+      <node id="3501374812264201946" at="128,77,129,62" concept="4" />
+      <node id="3501374812263054977" at="131,66,132,38" concept="4" />
+      <node id="3501374812263057320" at="134,70,135,39" concept="4" />
+      <node id="5348835480204234277" at="138,149,139,90" concept="3" />
+      <node id="5348835480204239188" at="139,90,140,73" concept="4" />
+      <node id="1964420931776163294" at="143,55,144,34" concept="4" />
+      <node id="1964420931776193452" at="146,57,147,36" concept="4" />
+      <node id="1964420931776287150" at="149,68,150,54" concept="3" />
+      <node id="1964420931776266791" at="151,26,152,31" concept="4" />
+      <node id="1964420931776300221" at="153,5,154,115" concept="4" />
+      <node id="1964420931776202325" at="156,58,157,37" concept="4" />
+      <node id="8433118097516181695" at="161,36,162,51" concept="4" />
+      <node id="8433118097516181695" at="163,5,164,16" concept="4" />
+      <node id="8433118097516065555" at="167,36,168,51" concept="4" />
+      <node id="8433118097516065555" at="169,5,170,16" concept="4" />
+      <node id="8433118097516122705" at="173,36,174,51" concept="4" />
+      <node id="8433118097516122705" at="175,5,176,16" concept="4" />
+      <node id="8433118097516066790" at="179,36,180,51" concept="4" />
+      <node id="8433118097516066790" at="181,5,182,16" concept="4" />
+      <node id="8433118097516192532" at="185,36,186,51" concept="4" />
+      <node id="8433118097516192532" at="187,5,188,16" concept="4" />
+      <node id="8433118097516068019" at="191,36,192,51" concept="4" />
+      <node id="8433118097516068019" at="193,5,194,16" concept="4" />
+      <node id="8433118097516021348" at="197,36,198,46" concept="4" />
+      <node id="8433118097516021348" at="199,5,200,16" concept="4" />
+      <node id="8433118097516021591" at="203,36,204,46" concept="4" />
+      <node id="8433118097516021591" at="205,5,206,16" concept="4" />
+      <node id="8433118097516021444" at="209,36,210,47" concept="4" />
+      <node id="8433118097516021444" at="211,5,212,16" concept="4" />
+      <node id="8433118097516021734" at="215,36,216,46" concept="4" />
+      <node id="8433118097516021734" at="217,5,218,16" concept="4" />
+      <node id="8433118097516022984" at="221,36,222,52" concept="4" />
+      <node id="8433118097516022984" at="223,5,224,16" concept="4" />
+      <node id="6322385757206087376" at="40,0,43,0" concept="2" trace="translate#(Lorg/jetbrains/mps/openapi/model/SModel;)Ljava/lang/Iterable;" />
+      <node id="1915462833256353669" at="48,0,51,0" concept="2" trace="translate#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/Iterable;" />
+      <node id="752693057586560909" at="54,0,57,0" concept="6" trace="models#(Lorg/jetbrains/mps/openapi/module/SearchScope;)Ljava/lang/Iterable;" />
+      <node id="752693057586786176" at="58,0,61,0" concept="6" trace="modules#(Lorg/jetbrains/mps/openapi/module/SearchScope;)Ljava/lang/Iterable;" />
+      <node id="7738379549905453304" at="62,0,65,0" concept="6" trace="usages#(Lorg/jetbrains/mps/openapi/module/SearchScope;Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/util/Collection;" />
+      <node id="7738379549910165780" at="66,0,69,0" concept="6" trace="instances#(Lorg/jetbrains/mps/openapi/module/SearchScope;Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/util/Collection;" />
+      <node id="8433118097516179211" at="75,0,78,0" concept="2" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNodeReference;)Z" />
+      <node id="1125969196844649929" at="79,0,82,0" concept="2" trace="visit#(Lorg/jetbrains/mps/openapi/model/SNodeReference;)V" />
+      <node id="8433118097516119746" at="93,0,96,0" concept="2" trace="accept#(Lorg/jetbrains/mps/openapi/model/SModelReference;)Z" />
+      <node id="1125969196844733229" at="97,0,100,0" concept="2" trace="visit#(Lorg/jetbrains/mps/openapi/model/SModelReference;)V" />
+      <node id="8433118097516189137" at="111,0,114,0" concept="2" trace="accept#(Lorg/jetbrains/mps/openapi/module/SModuleReference;)Z" />
+      <node id="1125969196844733369" at="115,0,118,0" concept="2" trace="visit#(Lorg/jetbrains/mps/openapi/module/SModuleReference;)V" />
+      <node id="3501374812263258755" at="125,0,128,0" concept="6" trace="getNodeReference#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNodeReference;" />
+      <node id="3501374812263262593" at="128,0,131,0" concept="6" trace="getReferenceReference#(Lorg/jetbrains/mps/openapi/model/SReference;)Lorg/jetbrains/mps/openapi/model/SNodeReference;" />
+      <node id="3501374812263265578" at="131,0,134,0" concept="6" trace="getModelReference#(Lorg/jetbrains/mps/openapi/model/SModel;)Lorg/jetbrains/mps/openapi/model/SModelReference;" />
+      <node id="3501374812263268620" at="134,0,137,0" concept="6" trace="getModuleReference#(Lorg/jetbrains/mps/openapi/module/SModule;)Lorg/jetbrains/mps/openapi/module/SModuleReference;" />
+      <node id="1964420931776160132" at="143,0,146,0" concept="6" trace="createScope#(Lorg/jetbrains/mps/openapi/model/SModel;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
+      <node id="1964420931776193450" at="146,0,149,0" concept="6" trace="createScope#(Lorg/jetbrains/mps/openapi/module/SModule;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
+      <node id="1964420931776263498" at="150,54,153,5" concept="1" />
+      <node id="1964420931776202323" at="156,0,159,0" concept="6" trace="createScope#(Ljetbrains/mps/project/Project;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
+      <node id="8433118097516181695" at="160,111,163,5" concept="1" />
+      <node id="8433118097516065555" at="166,113,169,5" concept="1" />
+      <node id="8433118097516122705" at="172,113,175,5" concept="1" />
+      <node id="8433118097516066790" at="178,115,181,5" concept="1" />
+      <node id="8433118097516192532" at="184,115,187,5" concept="1" />
+      <node id="8433118097516068019" at="190,117,193,5" concept="1" />
+      <node id="8433118097516021348" at="196,77,199,5" concept="1" />
+      <node id="8433118097516021591" at="202,77,205,5" concept="1" />
+      <node id="8433118097516021444" at="208,73,211,5" concept="1" />
+      <node id="8433118097516021734" at="214,79,217,5" concept="1" />
+      <node id="8433118097516022984" at="220,81,223,5" concept="1" />
+      <node id="4307205004142786686" at="138,0,142,0" concept="6" trace="createConsoleScope#(Lorg/jetbrains/mps/openapi/module/SearchScope;ZLjetbrains/mps/smodel/query/QueryExecutionContext;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
+      <node id="3820104862372919953" at="38,58,43,7" concept="4" />
+      <node id="6864030874026229328" at="46,68,51,7" concept="4" />
+      <node id="8433118097516181695" at="160,0,166,0" concept="6" trace="check_1pinza_a0a0a0a0b0a0a21#(Lorg/jetbrains/mps/openapi/model/SNodeReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="8433118097516065555" at="166,0,172,0" concept="6" trace="check_1pinza_a0a0a0a0a0b0a0a21#(Lorg/jetbrains/mps/openapi/model/SNodeReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="8433118097516122705" at="172,0,178,0" concept="6" trace="check_1pinza_a0a0a0a0b0a0a41#(Lorg/jetbrains/mps/openapi/model/SModelReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SModel;" />
+      <node id="8433118097516066790" at="178,0,184,0" concept="6" trace="check_1pinza_a0a0a0a0a0b0a0a41#(Lorg/jetbrains/mps/openapi/model/SModelReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SModel;" />
+      <node id="8433118097516192532" at="184,0,190,0" concept="6" trace="check_1pinza_a0a0a0a0b0a0a61#(Lorg/jetbrains/mps/openapi/module/SModuleReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/module/SModule;" />
+      <node id="8433118097516068019" at="190,0,196,0" concept="6" trace="check_1pinza_a0a0a0a0a0b0a0a61#(Lorg/jetbrains/mps/openapi/module/SModuleReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/module/SModule;" />
+      <node id="8433118097516021348" at="196,0,202,0" concept="6" trace="check_1pinza_a0a81#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNodeReference;" />
+      <node id="8433118097516021591" at="202,0,208,0" concept="6" trace="check_1pinza_a0a91#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNodeReference;" />
+      <node id="8433118097516021444" at="208,0,214,0" concept="6" trace="check_1pinza_a0a0t#(Lorg/jetbrains/mps/openapi/model/SReference;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="8433118097516021734" at="214,0,220,0" concept="6" trace="check_1pinza_a0a02#(Lorg/jetbrains/mps/openapi/model/SModel;)Lorg/jetbrains/mps/openapi/model/SModelReference;" />
+      <node id="8433118097516022984" at="220,0,226,0" concept="6" trace="check_1pinza_a0a12#(Lorg/jetbrains/mps/openapi/module/SModule;)Lorg/jetbrains/mps/openapi/module/SModuleReference;" />
+      <node id="313482946808721597" at="38,0,45,0" concept="6" trace="nodes#(Lorg/jetbrains/mps/openapi/module/SearchScope;)Ljava/lang/Iterable;" />
+      <node id="1915462833256325237" at="46,0,53,0" concept="6" trace="references#(Lorg/jetbrains/mps/openapi/module/SearchScope;)Ljava/lang/Iterable;" />
+      <node id="1964420931776186920" at="149,0,156,0" concept="6" trace="createScope#(Ljava/lang/Iterable;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
+      <node id="1125969196844645054" at="73,68,82,11" concept="0" />
+      <node id="1125969196844733225" at="91,70,100,11" concept="0" />
+      <node id="1125969196844733365" at="109,72,118,11" concept="0" />
+      <node id="1597470200014229947" at="72,0,85,0" concept="2" trace="invoke#()Ljetbrains/mps/ide/findusages/model/SearchResults;" />
+      <node id="1597470200014090902" at="90,0,103,0" concept="2" trace="invoke#()Ljetbrains/mps/ide/findusages/model/SearchResults;" />
+      <node id="1597470200014094812" at="108,0,121,0" concept="2" trace="invoke#()Ljetbrains/mps/ide/findusages/model/SearchResults;" />
+      <node id="1597470200014229951" at="70,154,85,6" concept="4" />
+      <node id="1597470200014090906" at="88,157,103,6" concept="4" />
+      <node id="1597470200014094811" at="106,160,121,6" concept="4" />
+      <node id="1125969196844631948" at="70,0,87,0" concept="6" trace="nodesToResults#(Ljava/lang/Iterable;Lorg/jetbrains/mps/openapi/module/SRepository;)Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;" />
+      <node id="1125969196844632137" at="88,0,105,0" concept="6" trace="modelsToResults#(Ljava/lang/Iterable;Lorg/jetbrains/mps/openapi/module/SRepository;)Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;" />
+      <node id="1125969196844632254" at="106,0,124,0" concept="6" trace="modulesToResults#(Ljava/lang/Iterable;Lorg/jetbrains/mps/openapi/module/SRepository;)Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;" />
+      <scope id="6322385757206087377" at="40,51,41,48" />
+      <scope id="1915462833256353670" at="48,55,49,49" />
+      <scope id="752693057586560912" at="54,60,55,48" />
+      <scope id="752693057586786179" at="58,62,59,30" />
+      <scope id="7738379549905453307" at="62,78,63,143" />
+      <scope id="7738379549910165781" at="66,90,67,131" />
+      <scope id="8433118097516179212" at="75,52,76,72" />
+      <scope id="1125969196844649930" at="79,48,80,121" />
+      <scope id="8433118097516119747" at="93,53,94,72" />
+      <scope id="1125969196844733230" at="97,49,98,122" />
+      <scope id="8433118097516189138" at="111,54,112,72" />
+      <scope id="1125969196844733370" at="115,50,116,123" />
+      <scope id="3501374812263049615" at="125,62,126,37" />
+      <scope id="3501374812263040859" at="128,77,129,62" />
+      <scope id="3501374812263054976" at="131,66,132,38" />
+      <scope id="3501374812263057319" at="134,70,135,39" />
+      <scope id="1964420931776160133" at="143,55,144,34" />
+      <scope id="1964420931776193451" at="146,57,147,36" />
+      <scope id="1964420931776263500" at="151,26,152,31" />
+      <scope id="1964420931776202324" at="156,58,157,37" />
+      <scope id="8433118097516181695" at="161,36,162,51" />
+      <scope id="8433118097516065555" at="167,36,168,51" />
+      <scope id="8433118097516122705" at="173,36,174,51" />
+      <scope id="8433118097516066790" at="179,36,180,51" />
+      <scope id="8433118097516192532" at="185,36,186,51" />
+      <scope id="8433118097516068019" at="191,36,192,51" />
+      <scope id="8433118097516021348" at="197,36,198,46" />
+      <scope id="8433118097516021591" at="203,36,204,46" />
+      <scope id="8433118097516021444" at="209,36,210,47" />
+      <scope id="8433118097516021734" at="215,36,216,46" />
+      <scope id="8433118097516022984" at="221,36,222,52" />
+      <scope id="4307205004142746594" at="138,149,140,73">
+        <var name="scope" id="5348835480204234278" />
+      </scope>
+      <scope id="6322385757206087376" at="40,0,43,0">
+        <var name="it" id="6322385757206087376" />
+      </scope>
+      <scope id="1915462833256353669" at="48,0,51,0">
+        <var name="it" id="1915462833256353669" />
+      </scope>
+      <scope id="752693057586560909" at="54,0,57,0">
+        <var name="scope" id="8030615961116887658" />
+      </scope>
+      <scope id="752693057586786176" at="58,0,61,0">
+        <var name="scope" id="752693057586789742" />
+      </scope>
+      <scope id="7738379549905453304" at="62,0,65,0">
+        <var name="node" id="7738379549905453607" />
+        <var name="scope" id="7738379549905453557" />
+      </scope>
+      <scope id="7738379549910165780" at="66,0,69,0">
+        <var name="concept" id="7738379549910165797" />
+        <var name="scope" id="7738379549910165795" />
+      </scope>
+      <scope id="8433118097516179211" at="75,0,78,0">
+        <var name="it" id="8433118097516179211" />
+      </scope>
+      <scope id="1125969196844649929" at="79,0,82,0">
+        <var name="it" id="1125969196844649929" />
+      </scope>
+      <scope id="8433118097516119746" at="93,0,96,0">
+        <var name="it" id="8433118097516119746" />
+      </scope>
+      <scope id="1125969196844733229" at="97,0,100,0">
+        <var name="it" id="1125969196844733229" />
+      </scope>
+      <scope id="8433118097516189137" at="111,0,114,0">
+        <var name="it" id="8433118097516189137" />
+      </scope>
+      <scope id="1125969196844733369" at="115,0,118,0">
+        <var name="it" id="1125969196844733369" />
+      </scope>
+      <scope id="3501374812263258755" at="125,0,128,0">
+        <var name="aNode" id="3501374812263049623" />
+      </scope>
+      <scope id="3501374812263262593" at="128,0,131,0">
+        <var name="aReference" id="3501374812263043791" />
+      </scope>
+      <scope id="3501374812263265578" at="131,0,134,0">
+        <var name="aModel" id="3501374812263054984" />
+      </scope>
+      <scope id="3501374812263268620" at="134,0,137,0">
+        <var name="aModule" id="3501374812263057327" />
+      </scope>
+      <scope id="1964420931776160132" at="143,0,146,0">
+        <var name="model" id="1964420931776162620" />
+      </scope>
+      <scope id="1964420931776193450" at="146,0,149,0">
+        <var name="module" id="1964420931776193458" />
+      </scope>
+      <scope id="1964420931776202323" at="156,0,159,0">
+        <var name="project" id="1964420931776202331" />
+      </scope>
+      <scope id="4307205004142786686" at="138,0,142,0">
+        <var name="baseScope" id="4307205004142749181" />
+        <var name="context" id="1768908716159471077" />
+        <var name="includeReadOnly" id="4307205004142749928" />
+      </scope>
+      <scope id="8433118097516181695" at="160,111,164,16" />
+      <scope id="8433118097516065555" at="166,113,170,16" />
+      <scope id="8433118097516122705" at="172,113,176,16" />
+      <scope id="8433118097516066790" at="178,115,182,16" />
+      <scope id="8433118097516192532" at="184,115,188,16" />
+      <scope id="8433118097516068019" at="190,117,194,16" />
+      <scope id="8433118097516021348" at="196,77,200,16" />
+      <scope id="8433118097516021591" at="202,77,206,16" />
+      <scope id="8433118097516021444" at="208,73,212,16" />
+      <scope id="8433118097516021734" at="214,79,218,16" />
+      <scope id="8433118097516022984" at="220,81,224,16" />
+      <scope id="313482946808721586" at="38,58,43,7" />
+      <scope id="1915462833256325240" at="46,68,51,7" />
+      <scope id="1964420931776186921" at="149,68,154,115">
+        <var name="it" id="1964420931776287151" />
+      </scope>
+      <scope id="8433118097516181695" at="160,0,166,0">
+        <var name="checkedDotOperand" id="8433118097516181695" />
+        <var name="repository" id="8433118097516181695" />
+      </scope>
+      <scope id="8433118097516065555" at="166,0,172,0">
+        <var name="checkedDotOperand" id="8433118097516065555" />
+        <var name="repository" id="8433118097516065555" />
+      </scope>
+      <scope id="8433118097516122705" at="172,0,178,0">
+        <var name="checkedDotOperand" id="8433118097516122705" />
+        <var name="repository" id="8433118097516122705" />
+      </scope>
+      <scope id="8433118097516066790" at="178,0,184,0">
+        <var name="checkedDotOperand" id="8433118097516066790" />
+        <var name="repository" id="8433118097516066790" />
+      </scope>
+      <scope id="8433118097516192532" at="184,0,190,0">
+        <var name="checkedDotOperand" id="8433118097516192532" />
+        <var name="repository" id="8433118097516192532" />
+      </scope>
+      <scope id="8433118097516068019" at="190,0,196,0">
+        <var name="checkedDotOperand" id="8433118097516068019" />
+        <var name="repository" id="8433118097516068019" />
+      </scope>
+      <scope id="8433118097516021348" at="196,0,202,0">
+        <var name="checkedDotOperand" id="8433118097516021348" />
+      </scope>
+      <scope id="8433118097516021591" at="202,0,208,0">
+        <var name="checkedDotOperand" id="8433118097516021591" />
+      </scope>
+      <scope id="8433118097516021444" at="208,0,214,0">
+        <var name="checkedDotOperand" id="8433118097516021444" />
+      </scope>
+      <scope id="8433118097516021734" at="214,0,220,0">
+        <var name="checkedDotOperand" id="8433118097516021734" />
+      </scope>
+      <scope id="8433118097516022984" at="220,0,226,0">
+        <var name="checkedDotOperand" id="8433118097516022984" />
+      </scope>
+      <scope id="313482946808721597" at="38,0,45,0">
+        <var name="scope" id="8030615961116951985" />
+      </scope>
+      <scope id="1915462833256325237" at="46,0,53,0">
+        <var name="scope" id="8030615961116973438" />
+      </scope>
+      <scope id="1964420931776186920" at="149,0,156,0">
+        <var name="modelsAndModules" id="1964420931776186928" />
+      </scope>
+      <scope id="1597470200014229949" at="72,44,83,19">
+        <var name="res" id="1125969196844644449" />
+      </scope>
+      <scope id="1597470200014090904" at="90,45,101,19">
+        <var name="res" id="1125969196844733219" />
+      </scope>
+      <scope id="1597470200014094813" at="108,46,119,19">
+        <var name="res" id="1125969196844733359" />
+      </scope>
+      <scope id="1597470200014229947" at="72,0,85,0" />
+      <scope id="1597470200014090902" at="90,0,103,0" />
+      <scope id="1597470200014094812" at="108,0,121,0" />
+      <scope id="1125969196844631951" at="70,154,85,6" />
+      <scope id="1125969196844632138" at="88,157,103,6" />
+      <scope id="1125969196844632255" at="106,160,122,0" />
+      <scope id="1125969196844631948" at="70,0,87,0">
+        <var name="nodes" id="1125969196844632046" />
+        <var name="repository" id="3501374812260708327" />
+      </scope>
+      <scope id="1125969196844632137" at="88,0,105,0">
+        <var name="models" id="1125969196844632143" />
+        <var name="repository" id="3501374812260691176" />
+      </scope>
+      <scope id="1125969196844632254" at="106,0,124,0">
+        <var name="modules" id="1125969196844632260" />
+        <var name="repository" id="3501374812260697537" />
+      </scope>
+      <unit id="6322385757206087376" at="39,62,43,5" name="jetbrains.mps.smodel.query.CommandUtil$1" />
+      <unit id="1915462833256353669" at="47,61,51,5" name="jetbrains.mps.smodel.query.CommandUtil$2" />
+      <unit id="8433118097516179211" at="74,47,78,9" name="jetbrains.mps.smodel.query.CommandUtil$4" />
+      <unit id="1125969196844649929" at="78,24,82,9" name="jetbrains.mps.smodel.query.CommandUtil$4" />
+      <unit id="8433118097516119746" at="92,48,96,9" name="jetbrains.mps.smodel.query.CommandUtil$5" />
+      <unit id="1125969196844733229" at="96,24,100,9" name="jetbrains.mps.smodel.query.CommandUtil$5" />
+      <unit id="8433118097516189137" at="110,49,114,9" name="jetbrains.mps.smodel.query.CommandUtil$6" />
+      <unit id="1125969196844733369" at="114,24,118,9" name="jetbrains.mps.smodel.query.CommandUtil$6" />
+      <unit id="1597470200014229947" at="71,15,85,5" name="jetbrains.mps.smodel.query.CommandUtil$3" />
+      <unit id="1597470200014090902" at="89,15,103,5" name="jetbrains.mps.smodel.query.CommandUtil$4" />
+      <unit id="1597470200014094812" at="107,15,121,5" name="jetbrains.mps.smodel.query.CommandUtil$5" />
+      <unit id="313482946808721508" at="37,0,227,0" name="jetbrains.mps.smodel.query.CommandUtil" />
+    </file>
+  </root>
+</debug-info>
+
diff --git a/core/mps-core/mps-core.iml b/core/mps-core/mps-core.iml
index 29fedafd66f5..86e98663346e 100644
--- a/core/mps-core/mps-core.iml
+++ b/core/mps-core/mps-core.iml
@@ -21,5 +21,11 @@
     <orderEntry type="module" module-name="kernel" />
     <orderEntry type="module" module-name="components" />
     <orderEntry type="library" name="Annotations" level="project" />
+    <orderEntry type="module" module-name="mps-ui" />
+    <orderEntry type="module" module-name="project" />
+    <orderEntry type="library" name="Idea-plaform" level="project" />
+    <orderEntry type="module" module-name="collections-runtime" />
+    <orderEntry type="module" module-name="Closures-runtime" />
+    <orderEntry type="module" module-name="mps-platform" />
   </component>
 </module>
\ No newline at end of file
diff --git a/languages/baseLanguage/baseLanguage/jetbrains.mps.baseLanguage.mpl b/languages/baseLanguage/baseLanguage/jetbrains.mps.baseLanguage.mpl
index 3b2510e3d03c..62ff0f4e4acf 100644
--- a/languages/baseLanguage/baseLanguage/jetbrains.mps.baseLanguage.mpl
+++ b/languages/baseLanguage/baseLanguage/jetbrains.mps.baseLanguage.mpl
@@ -96,7 +96,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" fqName="jetbrains.mps.baseLanguage.regexp" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/languages/baseLanguage/baseLanguage/languageModels/migration.mps b/languages/baseLanguage/baseLanguage/languageModels/migration.mps
index d8f037c42387..e03c5565aeae 100644
--- a/languages/baseLanguage/baseLanguage/languageModels/migration.mps
+++ b/languages/baseLanguage/baseLanguage/languageModels/migration.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -85,9 +85,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -142,9 +139,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="AddNecessaryParenthsToNotExpressions" />
     <node concept="3Tm1VV" id="49IRVjgsW2q" role="1B3o_S" />
-    <node concept="30mAcN" id="49IRVjgsW2r" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="49IRVjgsW6W" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated b/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated
index 448cc377bb54..df555fc3cb7e 100644
--- a/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated
+++ b/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-3rbas2eb2g8v6obvdtwiraph2juag28" />
+<dependencies version="2" modelHash="t6zu40ivgs2trxov31mp1u9yedjsxm" />
 
diff --git a/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/migration/generated b/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/migration/generated
index 42276fc8670a..7dbae015cb08 100644
--- a/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/migration/generated
+++ b/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-c5q1w3ojitzr7vskjobraxmrez2x3xr" />
+<dependencies version="2" modelHash="aa76spg5pm9iy869pqnyznj9r0x101x" />
 
diff --git a/languages/baseLanguage/collections/jetbrains.mps.baseLanguage.collections.mpl b/languages/baseLanguage/collections/jetbrains.mps.baseLanguage.collections.mpl
index 253b0f363b89..01199a9a2d8a 100644
--- a/languages/baseLanguage/collections/jetbrains.mps.baseLanguage.collections.mpl
+++ b/languages/baseLanguage/collections/jetbrains.mps.baseLanguage.collections.mpl
@@ -116,7 +116,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/baseLanguage/collections/languages/trove/jetbrains.mps.baseLanguage.collections.trove.mpl b/languages/baseLanguage/collections/languages/trove/jetbrains.mps.baseLanguage.collections.trove.mpl
index 3f1b90dc91ae..4b88133c06ad 100644
--- a/languages/baseLanguage/collections/languages/trove/jetbrains.mps.baseLanguage.collections.trove.mpl
+++ b/languages/baseLanguage/collections/languages/trove/jetbrains.mps.baseLanguage.collections.trove.mpl
@@ -54,7 +54,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
diff --git a/languages/baseLanguage/collections/languages/trove/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/generated b/languages/baseLanguage/collections/languages/trove/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/generated
index d58a1823d416..102605f367f1 100644
--- a/languages/baseLanguage/collections/languages/trove/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/generated
+++ b/languages/baseLanguage/collections/languages/trove/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-2z0s62gqgg9nfp1p45a31ynlawkohyk" />
+<dependencies version="2" modelHash="-9l4q7ylo9z2op94xmg3xh40zexqjulk" />
 
diff --git a/languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated b/languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated
index 7b38498ad938..3d40faf37b63 100644
--- a/languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated
+++ b/languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-4c0xlnqpq2nplwyjzivzpfflayoyrl" />
+<dependencies version="2" modelHash="dmzqk5ywd160vbtx7oypq6k95c7dvc6" />
 
diff --git a/languages/baseLanguage/javadoc/jetbrains.mps.baseLanguage.javadoc.mpl b/languages/baseLanguage/javadoc/jetbrains.mps.baseLanguage.javadoc.mpl
index b0b7dd7a71d6..6f6473685600 100644
--- a/languages/baseLanguage/javadoc/jetbrains.mps.baseLanguage.javadoc.mpl
+++ b/languages/baseLanguage/javadoc/jetbrains.mps.baseLanguage.javadoc.mpl
@@ -25,7 +25,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/baseLanguage/javadoc/languageModels/migration.mps b/languages/baseLanguage/javadoc/languageModels/migration.mps
index dbd5307d4553..3d7650c7ab13 100644
--- a/languages/baseLanguage/javadoc/languageModels/migration.mps
+++ b/languages/baseLanguage/javadoc/languageModels/migration.mps
@@ -3,10 +3,10 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="-1" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="-1" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -121,9 +121,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -162,9 +159,6 @@
       </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">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -205,9 +199,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="UpdateDeprecatedBlockDocTags" />
     <node concept="3Tm1VV" id="49IRVjgsYg$" role="1B3o_S" />
-    <node concept="30mAcN" id="49IRVjgsYg_" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="49IRVjgsYgA" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
@@ -300,9 +291,6 @@
     <property role="qMTe8" value="1" />
     <property role="TrG5h" value="MoveDocTagsIntoTagsChildCollection" />
     <node concept="3Tm1VV" id="1FHjNS954Rh" role="1B3o_S" />
-    <node concept="30mAcN" id="1FHjNS954Ri" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="1FHjNS954Rj" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/generated b/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/generated
index 2e129292e5a0..11fa81c9efca 100644
--- a/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/generated
+++ b/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-cuon3u9wcsfmneh8kijmk2ic78uq9li" />
+<dependencies version="2" modelHash="-7zef7ys8eb7oqtuus028fw2yb8px2fc" />
 
diff --git a/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/migration/generated b/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/migration/generated
index 6408f2f292ba..c0b5f64764f7 100644
--- a/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/migration/generated
+++ b/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-1qmvntsr1e0kry4uilcm02jxyz9n954" />
+<dependencies version="2" modelHash="3bnzpzmgkw85ya2umw0ba8madinmlpd" />
 
diff --git a/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl b/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl
index 465777f0dbc8..776f8acbc52a 100644
--- a/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl
+++ b/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.baseLanguage.lightweightdsl" uuid="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" version="0">
+<language namespace="jetbrains.mps.baseLanguage.lightweightdsl" uuid="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" version="1">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
@@ -77,7 +77,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
@@ -90,9 +90,13 @@
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="0" />
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
+    <language id="90746344-04fd-4286-97d5-b46ae6a81709" fqName="jetbrains.mps.lang.migration" version="0" />
+    <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" fqName="jetbrains.mps.lang.pattern" version="0" />
+    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" fqName="jetbrains.mps.lang.plugin" version="0" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
+    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" fqName="jetbrains.mps.lang.smodel.query" version="0" />
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
diff --git a/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/behavior.mps b/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/behavior.mps
index 400db024feb9..acf424bcbefe 100644
--- a/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/behavior.mps
+++ b/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/behavior.mps
@@ -4,10 +4,10 @@
   <languages>
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="0" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/typesystem.mps b/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/typesystem.mps
index 94459f3c578b..56e42b9caac1 100644
--- a/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/typesystem.mps
+++ b/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/typesystem.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/baseLanguage/lightweightdsl/languageModels/migration.mps b/languages/baseLanguage/lightweightdsl/languageModels/migration.mps
new file mode 100644
index 000000000000..daf4701d3992
--- /dev/null
+++ b/languages/baseLanguage/lightweightdsl/languageModels/migration.mps
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:51201f6d-c0dc-4de5-9cf9-ac8c72aa0eb8(jetbrains.mps.baseLanguage.lightweightdsl.migration)">
+  <persistence version="9" />
+  <languages>
+    <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
+    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
+    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
+    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="oubp" ref="r:7cc2086d-c7d0-49c7-811c-ebbaf40d9195(jetbrains.mps.baseLanguage.lightweightdsl.structure)" />
+    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" implicit="true" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <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="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
+      <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
+        <reference id="8880393040217294897" name="decl" index="ffrpq" />
+      </concept>
+      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
+        <reference id="3751132065236767084" name="decl" index="q3mfh" />
+        <reference id="9097849371505568270" name="point" index="1QQUv3" />
+      </concept>
+      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
+        <reference id="19209059688387895" name="decl" index="2VtyIY" />
+      </concept>
+      <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
+        <reference id="8585153554445465961" name="decl" index="25KYV2" />
+      </concept>
+      <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
+        <property id="6478870542308703667" name="caption" index="3tTeZt" />
+        <reference id="6478870542308703669" name="decl" index="3tTeZr" />
+      </concept>
+      <concept id="6478870542308871428" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.StringPropertyInstance" flags="ig" index="3tYpXE">
+        <property id="6478870542308871429" name="value" index="3tYpXF" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <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="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
+        <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
+      </concept>
+      <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
+        <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
+      </concept>
+      <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
+      <concept id="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
+        <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
+      </concept>
+    </language>
+    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query">
+      <concept id="7738379549910147341" name="jetbrains.mps.lang.smodel.query.structure.InstancesExpression" flags="ng" index="qVDSY">
+        <child id="7738379549910147342" name="conceptArg" index="qVDSX" />
+      </concept>
+      <concept id="4234138103881610891" name="jetbrains.mps.lang.smodel.query.structure.WithStatement" flags="ng" index="L3pyB">
+        <child id="4234138103881610935" name="scope" index="L3pyr" />
+        <child id="4234138103881610892" name="stmts" index="L3pyw" />
+      </concept>
+      <concept id="4307205004131544317" name="jetbrains.mps.lang.smodel.query.structure.QueryExpression" flags="ng" index="1dNuzs">
+        <child id="4307205004132279624" name="parameter" index="1dOa5D" />
+      </concept>
+      <concept id="4307205004132277753" name="jetbrains.mps.lang.smodel.query.structure.QueryParameterList" flags="ng" index="1dO9Bo" />
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+    </language>
+  </registry>
+  <node concept="3SyAh_" id="2bGkMJy0Vk9">
+    <property role="qMTe8" value="0" />
+    <property role="TrG5h" value="RemoveOddAnnotations" />
+    <node concept="3Tm1VV" id="2bGkMJy0Vka" role="1B3o_S" />
+    <node concept="3tTeZs" id="2bGkMJy0Vkb" role="jymVt">
+      <property role="3tTeZt" value="&lt;no execute after&gt;" />
+      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
+    </node>
+    <node concept="3tTeZs" id="2bGkMJy0Vkc" role="jymVt">
+      <property role="3tTeZt" value="&lt;no required data&gt;" />
+      <ref role="3tTeZr" to="slm6:3A3gNhf1WPI" resolve="requires data" />
+    </node>
+    <node concept="3tTeZs" id="2bGkMJy0Vkd" role="jymVt">
+      <property role="3tTeZt" value="&lt;no produced data&gt;" />
+      <ref role="3tTeZr" to="slm6:536fTXa4WHO" resolve="produces data" />
+    </node>
+    <node concept="2tJIrI" id="2bGkMJy0Vke" role="jymVt" />
+    <node concept="3tYpXE" id="2bGkMJy0Vnd" role="jymVt">
+      <property role="TrG5h" value="description" />
+      <property role="3tYpXF" value="Remove @dslclass annotations from instances of AutoInitDSLClass" />
+      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
+      <node concept="3Tm1VV" id="2bGkMJy0Vnf" role="1B3o_S" />
+      <node concept="17QB3L" id="2bGkMJy0Vng" role="1tU5fm" />
+    </node>
+    <node concept="q3mfD" id="2bGkMJy0Vkg" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
+      <node concept="3Tm1VV" id="2bGkMJy0Vki" role="1B3o_S" />
+      <node concept="3clFbS" id="2bGkMJy0Vkk" role="3clF47">
+        <node concept="3cpWs8" id="2bGkMJy10UT" role="3cqZAp">
+          <node concept="3cpWsn" id="2bGkMJy10UU" role="3cpWs9">
+            <property role="TrG5h" value="finalM" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="2bGkMJy10UV" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+            </node>
+            <node concept="37vLTw" id="2bGkMJy10YV" role="33vP2m">
+              <ref role="3cqZAo" node="2bGkMJy0Vkm" resolve="m" />
+            </node>
+          </node>
+        </node>
+        <node concept="L3pyB" id="2bGkMJy0V$n" role="3cqZAp">
+          <node concept="3clFbS" id="2bGkMJy0V$p" role="L3pyw">
+            <node concept="3clFbF" id="2bGkMJy0VIR" role="3cqZAp">
+              <node concept="2OqwBi" id="2bGkMJy0VS2" role="3clFbG">
+                <node concept="2OqwBi" id="2bGkMJy0XpE" role="2Oq$k0">
+                  <node concept="2OqwBi" id="2bGkMJy0W$E" role="2Oq$k0">
+                    <node concept="qVDSY" id="2bGkMJy0VIO" role="2Oq$k0">
+                      <node concept="chp4Y" id="2bGkMJy0VJp" role="qVDSX">
+                        <ref role="cht4Q" to="oubp:UBgfI9exfH" resolve="AutoInitDSLClass" />
+                      </node>
+                      <node concept="1dO9Bo" id="2bGkMJy0VIQ" role="1dOa5D" />
+                    </node>
+                    <node concept="v3k3i" id="2bGkMJy0X3f" role="2OqNvi">
+                      <node concept="chp4Y" id="2bGkMJy0X5h" role="v3oSu">
+                        <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3zZkjj" id="2bGkMJy0Y15" role="2OqNvi">
+                    <node concept="1bVj0M" id="2bGkMJy0Y17" role="23t8la">
+                      <node concept="3clFbS" id="2bGkMJy0Y18" role="1bW5cS">
+                        <node concept="3clFbF" id="2bGkMJy0Y8b" role="3cqZAp">
+                          <node concept="2OqwBi" id="2bGkMJy0YjE" role="3clFbG">
+                            <node concept="2OqwBi" id="2bGkMJy0Y8d" role="2Oq$k0">
+                              <node concept="37vLTw" id="2bGkMJy0Y8e" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2bGkMJy0Y19" resolve="it" />
+                              </node>
+                              <node concept="3CFZ6_" id="2bGkMJy0Y8f" role="2OqNvi">
+                                <node concept="3CFYIy" id="2bGkMJy0Y8g" role="3CFYIz">
+                                  <ref role="3CFYIx" to="oubp:36gOZBLMF3a" resolve="DSLAnnotation" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3x8VRR" id="2bGkMJy0YFC" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="2bGkMJy0Y19" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="2bGkMJy0Y1a" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2es0OD" id="2bGkMJy0W7r" role="2OqNvi">
+                  <node concept="1bVj0M" id="2bGkMJy0W7t" role="23t8la">
+                    <node concept="3clFbS" id="2bGkMJy0W7u" role="1bW5cS">
+                      <node concept="3clFbF" id="2bGkMJy0WbZ" role="3cqZAp">
+                        <node concept="2OqwBi" id="2bGkMJy0YOD" role="3clFbG">
+                          <node concept="2OqwBi" id="2bGkMJy0Wff" role="2Oq$k0">
+                            <node concept="37vLTw" id="2bGkMJy0WbY" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2bGkMJy0W7v" resolve="it" />
+                            </node>
+                            <node concept="3CFZ6_" id="2bGkMJy0WmO" role="2OqNvi">
+                              <node concept="3CFYIy" id="2bGkMJy0XaX" role="3CFYIz">
+                                <ref role="3CFYIx" to="oubp:36gOZBLMF3a" resolve="DSLAnnotation" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1PgB_6" id="2bGkMJy0Zcq" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="2bGkMJy0W7v" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="2bGkMJy0W7w" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="2bGkMJy1149" role="L3pyr">
+            <ref role="3cqZAo" node="2bGkMJy10UU" resolve="finalM" />
+          </node>
+        </node>
+      </node>
+      <node concept="ffn8J" id="2bGkMJy0Vkm" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
+        <node concept="3uibUv" id="2bGkMJy0Vkl" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="q3mfm" id="2bGkMJy0Vkn" role="3clF45">
+        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
+        <ref role="1QQUv3" node="2bGkMJy0Vkg" resolve="execute" />
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/behavior/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/behavior/generated
index 24188eb66960..f8424e0f8a0e 100644
--- a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/behavior/generated
+++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/behavior/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-1mkfxfu18wso9bghbmgz7tb9f5vcuac" />
+<dependencies version="2" modelHash="bpt7gbyhdhlpoyn4u0fmxkdaiqjmf64" />
 
diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated
index e178452a693f..03fd4240cf6f 100644
--- a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated
+++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-9i725v9dm7r6smbxz6hlibzpjjzzykh" />
+<dependencies version="2" modelHash="e94l68ylff91crirud42bh8z0p3imgq" />
 
diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/dependencies b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/dependencies
new file mode 100644
index 000000000000..f5d5167f1e3c
--- /dev/null
+++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/dependencies
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependenciesRoot>
+  <dependency className="jetbrains.mps.baseLanguage.lightweightdsl.migration.MigrationDescriptorImpl" file="MigrationDescriptorImpl.java">
+    <classNode dependClassName="java.lang.Integer" />
+    <classNode dependClassName="java.util.HashMap" />
+    <classNode dependClassName="java.util.Map" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.lightweightdsl.migration.RemoveOddAnnotations" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.MapSequence" />
+    <classNode dependClassName="jetbrains.mps.lang.migration.runtime.base.MigrationScript" />
+    <classNode extendsClassName="jetbrains.mps.lang.migration.runtime.base.MigrationDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.baseLanguage.lightweightdsl.migration.RemoveOddAnnotations" file="RemoveOddAnnotations.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.IVisitor" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.IWhereFilter" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
+    <classNode dependClassName="jetbrains.mps.lang.migration.runtime.base.MigrationScriptReference" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.AttributeOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.IAttributeDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.query.CommandUtil" />
+    <classNode dependClassName="jetbrains.mps.smodel.query.QueryExecutionContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.module.SModule" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.module.SearchScope" />
+    <classNode extendsClassName="jetbrains.mps.lang.migration.runtime.base.MigrationScriptBase" />
+  </dependency>
+</dependenciesRoot>
+
diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated
new file mode 100644
index 000000000000..aa5afa903215
--- /dev/null
+++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="-6ru244ny0x7ov2wy8lt94eyiioaokqb" />
+
diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/typesystem/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/typesystem/generated
index ea3b46d59456..071e87ce80e6 100644
--- a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/typesystem/generated
+++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/typesystem/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-9h71m3coheqx6t9jyeven4e1hyypnaj" />
+<dependencies version="2" modelHash="bjj45r2u69vwo9oiqqz5qvd05hk2nuo" />
 
diff --git a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/Language.java b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/Language.java
index ca396a9bb27f..d2e36aaefe20 100644
--- a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/Language.java
+++ b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/Language.java
@@ -34,7 +34,7 @@ public String getNamespace() {
 
   @Override
   public int getVersion() {
-    return 0;
+    return 1;
   }
 
   public SLanguageId getId() {
diff --git a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/MigrationDescriptorImpl.java b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/MigrationDescriptorImpl.java
new file mode 100644
index 000000000000..411f42503824
--- /dev/null
+++ b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/MigrationDescriptorImpl.java
@@ -0,0 +1,16 @@
+package jetbrains.mps.baseLanguage.lightweightdsl.migration;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.migration.runtime.base.MigrationDescriptor;
+import java.util.Map;
+import jetbrains.mps.lang.migration.runtime.base.MigrationScript;
+import jetbrains.mps.internal.collections.runtime.MapSequence;
+import java.util.HashMap;
+
+public class MigrationDescriptorImpl implements MigrationDescriptor {
+  private Map<Integer, MigrationScript> myScripts = MapSequence.<Integer, MigrationScript>fromMapAndKeysArray(new HashMap<Integer, MigrationScript>(), 0).withValues(new RemoveOddAnnotations());
+  public MigrationScript getScript(int fromVersion) {
+    return MapSequence.fromMap(myScripts).get(fromVersion);
+  }
+}
diff --git a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/RemoveOddAnnotations.java b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/RemoveOddAnnotations.java
new file mode 100644
index 000000000000..24b1309e215a
--- /dev/null
+++ b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/RemoveOddAnnotations.java
@@ -0,0 +1,48 @@
+package jetbrains.mps.baseLanguage.lightweightdsl.migration;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.migration.runtime.base.MigrationScriptBase;
+import org.jetbrains.mps.openapi.model.SNode;
+import org.jetbrains.mps.openapi.module.SModule;
+import jetbrains.mps.smodel.query.QueryExecutionContext;
+import org.jetbrains.mps.openapi.module.SearchScope;
+import jetbrains.mps.smodel.query.CommandUtil;
+import jetbrains.mps.internal.collections.runtime.Sequence;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.internal.collections.runtime.IWhereFilter;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.AttributeOperations;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.IAttributeDescriptor;
+import jetbrains.mps.internal.collections.runtime.IVisitor;
+import jetbrains.mps.lang.migration.runtime.base.MigrationScriptReference;
+
+public class RemoveOddAnnotations extends MigrationScriptBase {
+  public String getCaption() {
+    return "Remove @dslclass annotations from instances of AutoInitDSLClass";
+  }
+  public SNode execute(SModule m) {
+    final SModule finalM = m;
+    {
+      QueryExecutionContext context = new QueryExecutionContext() {
+        public SearchScope getDefaultSearchScope() {
+          return CommandUtil.createScope(finalM);
+        }
+      };
+      Sequence.fromIterable(SNodeOperations.ofConcept(CommandUtil.instances(CommandUtil.createConsoleScope(null, false, context), MetaAdapterFactory.getInterfaceConcept(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, 0xea740fb893a13edL, "jetbrains.mps.baseLanguage.lightweightdsl.structure.AutoInitDSLClass")), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c108ca66L, "jetbrains.mps.baseLanguage.structure.ClassConcept"))).where(new IWhereFilter<SNode>() {
+        public boolean accept(SNode it) {
+          return (AttributeOperations.getAttribute(it, new IAttributeDescriptor.NodeAttribute(MetaAdapterFactory.getConcept(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, 0x3190d3f9f1cab0caL, "jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation"))) != null);
+        }
+      }).visitAll(new IVisitor<SNode>() {
+        public void visit(SNode it) {
+          SNodeOperations.deleteNode(AttributeOperations.getAttribute(it, new IAttributeDescriptor.NodeAttribute(MetaAdapterFactory.getConcept(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, 0x3190d3f9f1cab0caL, "jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation"))));
+        }
+      });
+    }
+    return null;
+  }
+  public MigrationScriptReference getDescriptor() {
+    return new MigrationScriptReference(MetaAdapterFactory.getLanguage(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, "jetbrains.mps.baseLanguage.lightweightdsl"), 0);
+  }
+
+}
diff --git a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/trace.info b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/trace.info
new file mode 100644
index 000000000000..fe900a348eef
--- /dev/null
+++ b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/trace.info
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<debug-info>
+  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
+  <root>
+    <file name="MigrationDescriptorImpl.java">
+      <unit at="11,0,17,0" name="jetbrains.mps.baseLanguage.lightweightdsl.migration.MigrationDescriptorImpl" />
+    </file>
+  </root>
+  <root nodeRef="r:51201f6d-c0dc-4de5-9cf9-ac8c72aa0eb8(jetbrains.mps.baseLanguage.lightweightdsl.migration)/2516477739733857545">
+    <file name="RemoveOddAnnotations.java">
+      <node id="2516477739733857545" at="21,30,22,77" concept="4" />
+      <node id="2516477739733880505" at="24,35,25,29" concept="3" />
+      <node id="2516477739733858583" at="28,52,29,49" concept="4" />
+      <node id="2516477739733869067" at="33,41,34,267" concept="4" />
+      <node id="2516477739733861119" at="37,37,38,278" concept="1" />
+      <node id="2516477739733857545" at="41,5,42,16" concept="4" />
+      <node id="2516477739733857545" at="44,51,45,162" concept="4" />
+      <node id="2516477739733857545" at="21,0,24,0" concept="2" trace="getCaption#()Ljava/lang/String;" />
+      <node id="2516477739733858583" at="28,0,31,0" concept="2" trace="getDefaultSearchScope#()Lorg/jetbrains/mps/openapi/module/SearchScope;" />
+      <node id="2516477739733868615" at="33,0,36,0" concept="2" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
+      <node id="2516477739733860829" at="37,0,40,0" concept="2" trace="visit#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="2516477739733857545" at="44,0,47,0" concept="2" trace="getDescriptor#()Ljetbrains/mps/lang/migration/runtime/base/MigrationScriptReference;" />
+      <node id="2516477739733858583" at="26,5,31,8" concept="3" />
+      <node id="2516477739733859255" at="31,8,40,9" concept="1" />
+      <node id="2516477739733858583" at="25,29,41,5" concept="0" />
+      <node id="2516477739733857545" at="24,0,44,0" concept="2" trace="execute#(Lorg/jetbrains/mps/openapi/module/SModule;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="2516477739733857545" at="21,30,22,77" />
+      <scope id="2516477739733858583" at="28,52,29,49" />
+      <scope id="2516477739733868616" at="33,41,34,267" />
+      <scope id="2516477739733860830" at="37,37,38,278" />
+      <scope id="2516477739733857545" at="44,51,45,162" />
+      <scope id="2516477739733857545" at="21,0,24,0" />
+      <scope id="2516477739733858583" at="28,0,31,0" />
+      <scope id="2516477739733868615" at="33,0,36,0">
+        <var name="it" id="2516477739733868615" />
+      </scope>
+      <scope id="2516477739733860829" at="37,0,40,0">
+        <var name="it" id="2516477739733860829" />
+      </scope>
+      <scope id="2516477739733857545" at="44,0,47,0" />
+      <scope id="2516477739733858583" at="26,5,40,9">
+        <var name="context" id="2516477739733858583" />
+      </scope>
+      <scope id="2516477739733857545" at="24,35,42,16">
+        <var name="finalM" id="2516477739733880506" />
+      </scope>
+      <scope id="2516477739733857545" at="24,0,44,0">
+        <var name="m" id="2516477739733857545" />
+      </scope>
+      <unit id="2516477739733858583" at="27,42,31,7" name="jetbrains.mps.baseLanguage.lightweightdsl.migration.RemoveOddAnnotations$1" />
+      <unit id="2516477739733868615" at="32,457,36,7" name="jetbrains.mps.baseLanguage.lightweightdsl.migration.RemoveOddAnnotations$2" />
+      <unit id="2516477739733860829" at="36,22,40,7" name="jetbrains.mps.baseLanguage.lightweightdsl.migration.RemoveOddAnnotations$3" />
+      <unit id="2516477739733857545" at="20,0,49,0" name="jetbrains.mps.baseLanguage.lightweightdsl.migration.RemoveOddAnnotations" />
+    </file>
+  </root>
+</debug-info>
+
diff --git a/languages/core/core/jetbrains.mps.lang.core.mpl b/languages/core/core/jetbrains.mps.lang.core.mpl
index f0852dff54fa..e3dffa5fd571 100644
--- a/languages/core/core/jetbrains.mps.lang.core.mpl
+++ b/languages/core/core/jetbrains.mps.lang.core.mpl
@@ -33,7 +33,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/core/core/languageModels/migration.mps b/languages/core/core/languageModels/migration.mps
index 71734b0040f5..100f9b58878b 100644
--- a/languages/core/core/languageModels/migration.mps
+++ b/languages/core/core/languageModels/migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -91,9 +91,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -126,9 +123,6 @@
       </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">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -154,9 +148,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="PropertyAttributeId" />
     <node concept="3Tm1VV" id="7_qPA17IYpQ" role="1B3o_S" />
-    <node concept="30mAcN" id="7_qPA17IYzS" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="7_qPA17IYDi" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/generated b/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/generated
index 4720e36ed908..07a54f756bd4 100644
--- a/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/generated
+++ b/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="1hs0wjxcc7ztfn8aven2ra48qxu3ju7" />
+<dependencies version="2" modelHash="266v3ffxscu9cinth8pqpda1r1nlxeq" />
 
diff --git a/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/migration/generated b/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/migration/generated
index 6ef08378ce34..3c9d5912609c 100644
--- a/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/migration/generated
+++ b/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="4fbi0l9or87gin5y3r7kch6mborcyrl" />
+<dependencies version="2" modelHash="dxw9skc6ckfc0oe014fpt2zp2slucr0" />
 
diff --git a/languages/languageDesign/customAspect/generator/source_gen.caches/jetbrains/mps/lang/customAspect/generator/template/main/generated b/languages/languageDesign/customAspect/generator/source_gen.caches/jetbrains/mps/lang/customAspect/generator/template/main/generated
index 7bf2d375f70b..1fc2eb1a92df 100644
--- a/languages/languageDesign/customAspect/generator/source_gen.caches/jetbrains/mps/lang/customAspect/generator/template/main/generated
+++ b/languages/languageDesign/customAspect/generator/source_gen.caches/jetbrains/mps/lang/customAspect/generator/template/main/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="dj1r7az99fxc8tiobgd246cg7boip7r" />
+<dependencies version="2" modelHash="-cfvwcd1swxcjas8uusebf2b4d2802f3" />
 
diff --git a/languages/languageDesign/customAspect/generator/template/main@generator.mps b/languages/languageDesign/customAspect/generator/template/main@generator.mps
index fe7d4a98d0ca..f5db761b87db 100644
--- a/languages/languageDesign/customAspect/generator/template/main@generator.mps
+++ b/languages/languageDesign/customAspect/generator/template/main@generator.mps
@@ -7,7 +7,7 @@
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.customAspect" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -233,9 +233,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
         <property id="6478870542308703667" name="caption" index="3tTeZt" />
         <reference id="6478870542308703669" name="decl" index="3tTeZr" />
@@ -931,9 +928,6 @@
       <ref role="n9lRv" to="hfbu:2Y$EcRKMr1Q" resolve="SimpleLanguageAspectDescriptor" />
     </node>
     <node concept="3Tm1VV" id="2Y$EcRKO3dL" role="1B3o_S" />
-    <node concept="30mAcN" id="2Y$EcRKO3dM" role="lGtFl">
-      <ref role="30mx6e" to="9n97:ghIDlF6CZM" resolve="LanguageAspect" />
-    </node>
     <node concept="q3mfD" id="2Y$EcRKO3dN" role="jymVt">
       <property role="TrG5h" value="getPresentableAspectName" />
       <ref role="2VtyIY" to="9n97:2Y$EcRKLScp" resolve="getPresentableAspectName" />
diff --git a/languages/languageDesign/customAspect/jetbrains.mps.lang.customAspect.mpl b/languages/languageDesign/customAspect/jetbrains.mps.lang.customAspect.mpl
index 9685d71f9032..fbaf93a6e413 100644
--- a/languages/languageDesign/customAspect/jetbrains.mps.lang.customAspect.mpl
+++ b/languages/languageDesign/customAspect/jetbrains.mps.lang.customAspect.mpl
@@ -43,7 +43,7 @@
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
         <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+        <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
         <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
@@ -94,7 +94,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/languageDesign/customAspect/languageAccessories/jetbrains/mps/lang/customAspect/methods.mps b/languages/languageDesign/customAspect/languageAccessories/jetbrains/mps/lang/customAspect/methods.mps
index 797ffa4f441e..fc842de7b7d6 100644
--- a/languages/languageDesign/customAspect/languageAccessories/jetbrains/mps/lang/customAspect/methods.mps
+++ b/languages/languageDesign/customAspect/languageAccessories/jetbrains/mps/lang/customAspect/methods.mps
@@ -2,7 +2,7 @@
 <model ref="r:10b498c7-d1bd-4b96-8a49-bb59f0e63af3(jetbrains.mps.lang.customAspect.methods)">
   <persistence version="9" />
   <languages>
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/generated b/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/generated
index 3c553652c177..fa84a64731d4 100644
--- a/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/generated
+++ b/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-dwbfj1itwct2vhml3r0u295v7e6g9i6" />
+<dependencies version="2" modelHash="ao0qaq8inf7w97dahjoqasdu9fvvmp6" />
 
diff --git a/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/methods/generated b/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/methods/generated
index a07318213881..52d64a7f2215 100644
--- a/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/methods/generated
+++ b/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/methods/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="64an4jhehzke6zi4701yb9o82gq8vwo" />
+<dependencies version="2" modelHash="-4ahb3fe23pmtva0p3rz7b185kcacqn0" />
 
diff --git a/languages/languageDesign/extension/jetbrains.mps.lang.extension.mpl b/languages/languageDesign/extension/jetbrains.mps.lang.extension.mpl
index 62859dd74fca..6008a39083f5 100644
--- a/languages/languageDesign/extension/jetbrains.mps.lang.extension.mpl
+++ b/languages/languageDesign/extension/jetbrains.mps.lang.extension.mpl
@@ -55,7 +55,7 @@
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
         <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+        <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
         <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
@@ -108,7 +108,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/languageDesign/extension/languageAccessories/jetbrains/mps/lang/extension/methods.mps b/languages/languageDesign/extension/languageAccessories/jetbrains/mps/lang/extension/methods.mps
index 1519b6b6a884..cc3fde13ee60 100644
--- a/languages/languageDesign/extension/languageAccessories/jetbrains/mps/lang/extension/methods.mps
+++ b/languages/languageDesign/extension/languageAccessories/jetbrains/mps/lang/extension/methods.mps
@@ -2,7 +2,7 @@
 <model ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)">
   <persistence version="9" />
   <languages>
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/generated b/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/generated
index 36e3853fb3e0..777090e311da 100644
--- a/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/generated
+++ b/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-e257h8kt0oynvip51sr0xtzb6d0rd5r" />
+<dependencies version="2" modelHash="-4vbbf39b8emlvgjdpln8m3u7fihnxwk" />
 
diff --git a/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/methods/generated b/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/methods/generated
index 0686e7108215..d2d9b41284fc 100644
--- a/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/methods/generated
+++ b/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/methods/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="1fqtyqbrd3b27hqxz47znew9q2bwd78" />
+<dependencies version="2" modelHash="epeoyui7xihw3eo1k7xp3vc5alrhw7p" />
 
diff --git a/languages/languageDesign/generator/languages/descriptor/jetbrains.mps.lang.descriptor.mpl b/languages/languageDesign/generator/languages/descriptor/jetbrains.mps.lang.descriptor.mpl
index 4a5e0c28db5d..f1679898de67 100644
--- a/languages/languageDesign/generator/languages/descriptor/jetbrains.mps.lang.descriptor.mpl
+++ b/languages/languageDesign/generator/languages/descriptor/jetbrains.mps.lang.descriptor.mpl
@@ -36,7 +36,7 @@
         <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
         <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+        <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
         <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
diff --git a/languages/languageDesign/generator/languages/descriptor/source_gen.caches/jetbrains/mps/lang/descriptor/generated b/languages/languageDesign/generator/languages/descriptor/source_gen.caches/jetbrains/mps/lang/descriptor/generated
index 9adb786d6491..f09f2884f2a6 100644
--- a/languages/languageDesign/generator/languages/descriptor/source_gen.caches/jetbrains/mps/lang/descriptor/generated
+++ b/languages/languageDesign/generator/languages/descriptor/source_gen.caches/jetbrains/mps/lang/descriptor/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="bbnrhgwiacav42pf4vbhlulvq84n6qw" />
+<dependencies version="2" modelHash="327t7pon7x10vmh3yvyuha2sx52mk4f" />
 
diff --git a/languages/languageDesign/migration/jetbrains.mps.lang.migration.mpl b/languages/languageDesign/migration/jetbrains.mps.lang.migration.mpl
index 2a366b2df353..a74131f90bd4 100644
--- a/languages/languageDesign/migration/jetbrains.mps.lang.migration.mpl
+++ b/languages/languageDesign/migration/jetbrains.mps.lang.migration.mpl
@@ -176,7 +176,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/languageDesign/migration/languageAccessories/jetbrains/mps/lang/migration/methods.mps b/languages/languageDesign/migration/languageAccessories/jetbrains/mps/lang/migration/methods.mps
index 887cf1288e6f..e80058a403dc 100644
--- a/languages/languageDesign/migration/languageAccessories/jetbrains/mps/lang/migration/methods.mps
+++ b/languages/languageDesign/migration/languageAccessories/jetbrains/mps/lang/migration/methods.mps
@@ -3,10 +3,10 @@
   <persistence version="9" />
   <languages>
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/languageDesign/migration/solutions/actions/jetbrains.mps.lang.migration.actions.msd b/languages/languageDesign/migration/solutions/actions/jetbrains.mps.lang.migration.actions.msd
index 6ffb7c1f12e8..6ab5ae6d3e2e 100644
--- a/languages/languageDesign/migration/solutions/actions/jetbrains.mps.lang.migration.actions.msd
+++ b/languages/languageDesign/migration/solutions/actions/jetbrains.mps.lang.migration.actions.msd
@@ -21,7 +21,7 @@
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
diff --git a/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/generated b/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/generated
index 65ccb9014b3a..fb28cdebca10 100644
--- a/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/generated
+++ b/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="eaefrdac9u6wy2n1xx6obcy76quem2m" />
+<dependencies version="2" modelHash="ekryg2eiutempsuk8un44g9tq2ojfog" />
 
diff --git a/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/methods/generated b/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/methods/generated
index 1e5d6720aad3..d0f19350aacd 100644
--- a/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/methods/generated
+++ b/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/methods/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-5r8lpv4gpz063evkdf0xuig5nvqjijb" />
+<dependencies version="2" modelHash="-98wafkspw4uwmi5yhz5ylufelwc84jh" />
 
diff --git a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies
similarity index 63%
rename from plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies
rename to languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies
index 9c8e80954784..c97df7c86551 100644
--- a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies
+++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.generator.template.main.QueriesGenerated" file="QueriesGenerated.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.generator.template.main.QueriesGenerated" file="QueriesGenerated.java">
     <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Object" />
-    <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.generator.runtime.Generated" />
-    <classNode dependClassName="jetbrains.mps.generator.template.BaseMappingRuleContext" />
-    <classNode dependClassName="jetbrains.mps.generator.template.PropertyMacroContext" />
-    <classNode dependClassName="jetbrains.mps.generator.template.ReferenceMacroContext" />
     <classNode dependClassName="jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext" />
     <classNode dependClassName="jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ISelector" />
@@ -16,13 +11,8 @@
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.HUtil" />
     <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeChecker" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNodeAccessUtil" />
     <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated
new file mode 100644
index 000000000000..e00b702d2b83
--- /dev/null
+++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="8kuxvu0dfg2ppqh3hov2n6ebgvpdzh7" />
+
diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java
new file mode 100644
index 000000000000..9f88e056abae
--- /dev/null
+++ b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java
@@ -0,0 +1,101 @@
+package jetbrains.mps.lang.smodel.query.generator.template.main;
+
+/*Generated by MPS */
+
+import jetbrains.mps.generator.runtime.Generated;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.internal.collections.runtime.ListSequence;
+import jetbrains.mps.internal.collections.runtime.IWhereFilter;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import jetbrains.mps.internal.collections.runtime.ISelector;
+import jetbrains.mps.internal.collections.runtime.Sequence;
+import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext;
+import org.jetbrains.mps.openapi.persistence.PersistenceFacade;
+import jetbrains.mps.smodel.SModelUtil_new;
+import org.jetbrains.mps.openapi.model.SNodeAccessUtil;
+
+@Generated
+public class QueriesGenerated {
+  public static SNode sourceNodeQuery_4307205004144966846(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
+  }
+  public static SNode sourceNodeQuery_7738379549905474169(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node"));
+  }
+  public static SNode sourceNodeQuery_4307205004144963070(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
+  }
+  public static SNode sourceNodeQuery_5582028874771414574(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"));
+  }
+  public static SNode sourceNodeQuery_4307205004143195962(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
+  }
+  public static SNode sourceNodeQuery_4307205004144964264(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
+  }
+  public static SNode sourceNodeQuery_4307205004144961927(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
+  }
+  public static SNode sourceNodeQuery_4307205004144960989(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
+  }
+  public static SNode sourceNodeQuery_4307205004142795439(final SourceSubstituteMacroNodeContext _context) {
+    Iterable<SNode> results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter<SNode>() {
+      public boolean accept(SNode it) {
+        return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"));
+      }
+    }).select(new ISelector<SNode, SNode>() {
+      public SNode select(SNode it) {
+        return SNodeOperations.cast(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"));
+      }
+    });
+    return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0i() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")));
+  }
+  public static SNode sourceNodeQuery_4307205004142895894(final SourceSubstituteMacroNodeContext _context) {
+    Iterable<SNode> results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter<SNode>() {
+      public boolean accept(SNode it) {
+        return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly"));
+      }
+    });
+    return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0j_0() : _quotation_createNode_x583g4_a0b0j());
+  }
+  public static SNode sourceNodeQuery_3492877759612269969(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope"));
+  }
+  public static SNode sourceNodeQuery_1964420931776208395(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"));
+  }
+  public static Iterable<SNode> sourceNodesQuery_6134217374019191580(final SourceSubstituteMacroNodesContext _context) {
+    return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model"));
+  }
+  public static Iterable<SNode> sourceNodesQuery_3492877759611137837(final SourceSubstituteMacroNodesContext _context) {
+    return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module"));
+  }
+  public static Iterable<SNode> sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) {
+    return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"));
+  }
+  private static SNode _quotation_createNode_x583g4_a0b0i() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf940cd6167L, "jetbrains.mps.baseLanguage.structure.NullLiteral"), null, null, false);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_a0b0j() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false);
+    SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true");
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_a0b0j_0() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false);
+    SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "false");
+    return quotedNode_1;
+  }
+}
diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info
new file mode 100644
index 000000000000..9a352624eefd
--- /dev/null
+++ b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<debug-info>
+  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
+  <root>
+    <file name="QueriesGenerated.java">
+      <unit at="20,0,102,0" name="jetbrains.mps.lang.smodel.query.generator.template.main.QueriesGenerated" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/1964420931776040423">
+    <file name="QueriesGenerated.java">
+      <node id="1964420931776208582" at="69,108,70,189" concept="4" />
+      <node id="1964420931776046087" at="78,120,79,342" concept="4" />
+      <scope id="1964420931776208396" at="69,108,70,189" />
+      <scope id="1964420931776045746" at="78,120,79,342" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/3492877759609304450">
+    <file name="QueriesGenerated.java">
+      <node id="3492877759611137844" at="75,120,76,192" concept="4" />
+      <scope id="3492877759611137838" at="75,120,76,192" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/3492877759611336981">
+    <file name="QueriesGenerated.java">
+      <node id="6134217374019191582" at="72,120,73,191" concept="4" />
+      <scope id="6134217374019191581" at="72,120,73,191" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/3492877759612264689">
+    <file name="QueriesGenerated.java">
+      <node id="3492877759612269976" at="66,108,67,189" concept="4" />
+      <scope id="3492877759612269970" at="66,108,67,189" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/4307205004142531356">
+    <file name="QueriesGenerated.java">
+      <node id="4307205004142855137" at="48,39,49,207" concept="4" />
+      <node id="4307205004144279701" at="52,37,53,199" concept="4" />
+      <node id="4307205004143278171" at="55,7,56,293" concept="4" />
+      <node id="4307205004142957609" at="60,39,61,217" concept="4" />
+      <node id="4307205004143326237" at="63,7,64,134" concept="4" />
+      <node id="4307205004143305196" at="81,61,82,63" concept="3" />
+      <node id="4307205004143305196" at="82,63,83,30" concept="3" />
+      <node id="4307205004143305196" at="83,30,84,223" concept="0" />
+      <node id="4307205004143305196" at="83,30,84,223" concept="0" />
+      <node id="4307205004143305196" at="83,30,84,223" concept="1" />
+      <node id="4307205004143305196" at="84,223,85,24" concept="4" />
+      <node id="4307205004144391666" at="87,61,88,63" concept="3" />
+      <node id="4307205004144391666" at="88,63,89,30" concept="3" />
+      <node id="4307205004144391666" at="89,30,90,227" concept="1" />
+      <node id="4307205004144391666" at="90,227,91,167" concept="1" />
+      <node id="4307205004144391666" at="91,167,92,24" concept="4" />
+      <node id="4307205004144354416" at="94,63,95,63" concept="3" />
+      <node id="4307205004144354416" at="95,63,96,30" concept="3" />
+      <node id="4307205004144354416" at="96,30,97,227" concept="1" />
+      <node id="4307205004144354416" at="97,227,98,168" concept="1" />
+      <node id="4307205004144354416" at="98,168,99,24" concept="4" />
+      <node id="4307205004144391666" at="89,30,91,167" concept="0" />
+      <node id="4307205004144391666" at="89,30,91,167" concept="0" />
+      <node id="4307205004144354416" at="96,30,98,168" concept="0" />
+      <node id="4307205004144354416" at="96,30,98,168" concept="0" />
+      <node id="4307205004142853476" at="48,0,51,0" concept="2" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
+      <node id="4307205004144277359" at="52,0,55,0" concept="2" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="4307205004142955948" at="60,0,63,0" concept="2" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
+      <node id="4307205004143326219" at="58,108,63,7" concept="3" />
+      <node id="4307205004143305196" at="81,0,87,0" concept="5" trace="_quotation_createNode_x583g4_a0b0i#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="4307205004144391666" at="87,0,94,0" concept="5" trace="_quotation_createNode_x583g4_a0b0j#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="4307205004144354416" at="94,0,101,0" concept="5" trace="_quotation_createNode_x583g4_a0b0j_0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="4307205004143274175" at="46,108,55,7" concept="3" />
+      <scope id="4307205004142853477" at="48,39,49,207" />
+      <scope id="4307205004144277360" at="52,37,53,199" />
+      <scope id="4307205004142955949" at="60,39,61,217" />
+      <scope id="4307205004143305196" at="83,30,84,223" />
+      <scope id="4307205004144391666" at="89,30,91,167" />
+      <scope id="4307205004144354416" at="96,30,98,168" />
+      <scope id="4307205004142853476" at="48,0,51,0">
+        <var name="it" id="4307205004142853476" />
+      </scope>
+      <scope id="4307205004144277359" at="52,0,55,0">
+        <var name="it" id="4307205004144277359" />
+      </scope>
+      <scope id="4307205004142955948" at="60,0,63,0">
+        <var name="it" id="4307205004142955948" />
+      </scope>
+      <scope id="4307205004143305196" at="81,61,85,24">
+        <var name="facade" id="4307205004143305196" />
+        <var name="quotedNode_1" id="4307205004143305196" />
+      </scope>
+      <scope id="4307205004144391666" at="87,61,92,24">
+        <var name="facade" id="4307205004144391666" />
+        <var name="quotedNode_1" id="4307205004144391666" />
+      </scope>
+      <scope id="4307205004144354416" at="94,63,99,24">
+        <var name="facade" id="4307205004144354416" />
+        <var name="quotedNode_1" id="4307205004144354416" />
+      </scope>
+      <scope id="4307205004142895896" at="58,108,64,134">
+        <var name="results" id="4307205004143326220" />
+      </scope>
+      <scope id="4307205004143305196" at="81,0,87,0" />
+      <scope id="4307205004144391666" at="87,0,94,0" />
+      <scope id="4307205004144354416" at="94,0,101,0" />
+      <scope id="4307205004142795441" at="46,108,56,293">
+        <var name="results" id="4307205004143274178" />
+      </scope>
+      <unit id="4307205004142853476" at="47,247,51,5" name="jetbrains.mps.lang.smodel.query.generator.template.main.QueriesGenerated$1" />
+      <unit id="4307205004144277359" at="51,18,55,5" name="jetbrains.mps.lang.smodel.query.generator.template.main.QueriesGenerated$2" />
+      <unit id="4307205004142955948" at="59,247,63,5" name="jetbrains.mps.lang.smodel.query.generator.template.main.QueriesGenerated$3" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/4593895459761048274">
+    <file name="QueriesGenerated.java">
+      <node id="4307205004143195969" at="34,108,35,193" concept="4" />
+      <scope id="4307205004143195963" at="34,108,35,193" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/6322385757205252390">
+    <file name="QueriesGenerated.java">
+      <node id="4307205004144964266" at="37,108,38,193" concept="4" />
+      <scope id="4307205004144964265" at="37,108,38,193" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/6864030874027864910">
+    <file name="QueriesGenerated.java">
+      <node id="4307205004144961929" at="40,108,41,193" concept="4" />
+      <scope id="4307205004144961928" at="40,108,41,193" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/6864030874030058419">
+    <file name="QueriesGenerated.java">
+      <node id="4307205004144960991" at="43,108,44,193" concept="4" />
+      <scope id="4307205004144960990" at="43,108,44,193" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/7738379549905438724">
+    <file name="QueriesGenerated.java">
+      <node id="4307205004144966848" at="22,108,23,193" concept="4" />
+      <node id="7738379549905474462" at="25,108,26,188" concept="4" />
+      <scope id="4307205004144966847" at="22,108,23,193" />
+      <scope id="7738379549905474171" at="25,108,26,188" />
+    </file>
+  </root>
+  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)/7738379549910152710">
+    <file name="QueriesGenerated.java">
+      <node id="4307205004144963072" at="28,108,29,193" concept="4" />
+      <node id="5582028874771414670" at="31,108,32,194" concept="4" />
+      <scope id="4307205004144963071" at="28,108,29,193" />
+      <scope id="5582028874771414575" at="31,108,32,194" />
+    </file>
+  </root>
+</debug-info>
+
diff --git a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps
new file mode 100644
index 000000000000..e1f046f3b59d
--- /dev/null
+++ b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps
@@ -0,0 +1,1065 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)">
+  <persistence version="9" />
+  <languages>
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
+    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="0" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
+    <import index="mte5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="tp27" ref="r:00000000-0000-4000-0000-011c89590303(jetbrains.mps.lang.smodel.generator.baseLanguage.template.main@generator)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="kxzb" ref="r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)" />
+  </imports>
+  <registry>
+    <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" />
+      </concept>
+      <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">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
+        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </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">
+        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
+      </concept>
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+        <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
+      </concept>
+      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
+        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
+      </concept>
+      <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
+      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+        <reference id="1722980698497626483" name="template" index="v9R2y" />
+      </concept>
+      <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">
+        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
+      </concept>
+      <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
+        <reference id="1168285871518" name="applicableConcept" index="3gUMe" />
+        <child id="1092060348987" name="contentNode" index="13RCb5" />
+      </concept>
+      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
+        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
+      </concept>
+      <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX">
+        <child id="982871510068000158" name="sourceNodeQuery" index="1sPUBK" />
+      </concept>
+      <concept id="1167951910403" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodesQuery" flags="in" index="3JmXsc" />
+      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </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">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <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="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <reference id="1140138128738" name="concept" index="1PxNhF" />
+        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </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">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435808" name="initValue" index="HW$Y0" />
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
+    </language>
+  </registry>
+  <node concept="bUwia" id="4Cd_ANvqxii">
+    <property role="TrG5h" value="main" />
+    <node concept="3aamgX" id="1H31ARNQ$RD" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:3F2FyKbNNqb" resolve="WithStatement" />
+      <node concept="j$656" id="3ZgZ1njLDe2" role="1lVwrX">
+        <ref role="v9R2y" node="1H31ARNQ$RB" resolve="reduce_WithStatement" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="6H$fNdLgGxM" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:7mV0m3L$trF" resolve="UsagesExpression" />
+      <node concept="j$656" id="6H$fNdLgGxN" role="1lVwrX">
+        <ref role="v9R2y" node="6H$fNdLgGw4" resolve="reduce_UsagesExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="6H$fNdLAtHI" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:6H$fNdLyE4d" resolve="InstancesExpression" />
+      <node concept="j$656" id="6H$fNdLAtN7" role="1lVwrX">
+        <ref role="v9R2y" node="6H$fNdLyFo6" resolve="reduce_InstancesExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="3Z0MTj6l$GX" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:2sF4xi8qX2e" resolve="NodesExpression" />
+      <node concept="j$656" id="3Z0MTj6l$GY" role="1lVwrX">
+        <ref role="v9R2y" node="3Z0MTj6l$Fi" resolve="reduce_NodesExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="5uXC5_7dk$C" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:5uXC5_72l2X" resolve="ReferencesExpression" />
+      <node concept="j$656" id="5uXC5_7dk$D" role="1lVwrX">
+        <ref role="v9R2y" node="5uXC5_7dk$A" resolve="reduce_ReferencesExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="5X1VVpPJFdg" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:5X1VVpPJEGH" resolve="ModelsExpression" />
+      <node concept="j$656" id="5X1VVpPJFdh" role="1lVwrX">
+        <ref role="v9R2y" node="5X1VVpPJFde" resolve="reduce_ModelsExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="5X1VVpPS2IP" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:5X1VVpPN29y" resolve="ModulesExpression" />
+      <node concept="j$656" id="5X1VVpPS2IQ" role="1lVwrX">
+        <ref role="v9R2y" node="5X1VVpPS2IN" resolve="reduce_ModulesExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="3J6h25QGPcu" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:3J6h25Q5HRT" resolve="QueryParameterList" />
+      <node concept="j$656" id="3J6h25QGPcv" role="1lVwrX">
+        <ref role="v9R2y" node="3J6h25QGPcs" resolve="reduce_QueryParameterList" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="3J6h25QO0bv" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:3J6h25QeHP2" resolve="GlobalScope" />
+      <node concept="j$656" id="3J6h25QO0bw" role="1lVwrX">
+        <ref role="v9R2y" node="3J6h25QO0bt" resolve="reduce_GlobalScopeLiteral" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="31Tct3TnZp6" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:2oWvAovDHkX" resolve="ModulesScope" />
+      <node concept="j$656" id="31Tct3TnZp7" role="1lVwrX">
+        <ref role="v9R2y" node="31Tct3TnZm2" resolve="reduce_ModuleScopeLiteral" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="31Tct3TvJ$n" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:31Tct3Tk$xe" resolve="ModelScope" />
+      <node concept="j$656" id="31Tct3TvJ$o" role="1lVwrX">
+        <ref role="v9R2y" node="31Tct3TvJ$l" resolve="reduce_ModelScopeLiteral" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="31Tct3Tzi3N" role="3acgRq">
+      <ref role="30HIoZ" to="3xdn:31Tct3Txnn9" resolve="CustomScope" />
+      <node concept="j$656" id="31Tct3Tzi3O" role="1lVwrX">
+        <ref role="v9R2y" node="31Tct3Tzi3L" resolve="reduce_CustomScope" />
+      </node>
+    </node>
+  </node>
+  <node concept="13MO4I" id="6H$fNdLgGw4">
+    <property role="TrG5h" value="reduce_UsagesExpression" />
+    <property role="3GE5qa" value="expression.query" />
+    <ref role="3gUMe" to="3xdn:7mV0m3L$trF" resolve="UsagesExpression" />
+    <node concept="312cEu" id="6H$fNdLgKWW" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="6H$fNdLgKWX" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="6H$fNdLgKWY" role="3clF45" />
+        <node concept="37vLTG" id="6H$fNdLgKWZ" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEZmE" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="6H$fNdLgKX3" role="1B3o_S" />
+        <node concept="3clFbS" id="6H$fNdLgKX4" role="3clF47">
+          <node concept="3clFbF" id="6H$fNdLgMMv" role="3cqZAp">
+            <node concept="2YIFZM" id="6H$fNdLgNbW" role="3clFbG">
+              <ref role="37wK5l" to="kxzb:6H$fNdLgK3S" resolve="usages" />
+              <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+              <node concept="2YIFZM" id="3J6h25QQ7MU" role="37wK5m">
+                <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                <ref role="37wK5l" to="kxzb:3J6h25QHNxY" resolve="createConsoleScope" />
+                <node concept="10Nm6u" id="3J6h25QQ7MV" role="37wK5m" />
+                <node concept="10Nm6u" id="3J6h25QQ7MW" role="37wK5m" />
+                <node concept="29HgVG" id="3J6h25QQ7MX" role="lGtFl">
+                  <node concept="3NFfHV" id="3J6h25QQ7MY" role="3NFExx">
+                    <node concept="3clFbS" id="3J6h25QQ7MZ" role="2VODD2">
+                      <node concept="3clFbF" id="3J6h25QQ7N0" role="3cqZAp">
+                        <node concept="2OqwBi" id="3J6h25QQ7N1" role="3clFbG">
+                          <node concept="3TrEf2" id="3J6h25QQ7N2" role="2OqNvi">
+                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                          </node>
+                          <node concept="30H73N" id="3J6h25QQ7N3" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="10Nm6u" id="6H$fNdLgOPy" role="37wK5m">
+                <node concept="29HgVG" id="6H$fNdLgP9R" role="lGtFl">
+                  <node concept="3NFfHV" id="6H$fNdLgP9T" role="3NFExx">
+                    <node concept="3clFbS" id="6H$fNdLgP9V" role="2VODD2">
+                      <node concept="3clFbF" id="6H$fNdLgPeu" role="3cqZAp">
+                        <node concept="2OqwBi" id="6H$fNdLgPB4" role="3clFbG">
+                          <node concept="30H73N" id="6H$fNdLgPet" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="6H$fNdLgSnN" role="2OqNvi">
+                            <ref role="3Tt5mk" to="3xdn:7mV0m3L$trG" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="6H$fNdLgP5a" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6H$fNdLgKXt" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="6H$fNdLyFo6">
+    <property role="TrG5h" value="reduce_InstancesExpression" />
+    <property role="3GE5qa" value="expression.query" />
+    <ref role="3gUMe" to="3xdn:6H$fNdLyE4d" resolve="InstancesExpression" />
+    <node concept="312cEu" id="6H$fNdLyFo7" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="6H$fNdLyFo8" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="6H$fNdLyFo9" role="3clF45" />
+        <node concept="37vLTG" id="6H$fNdLyFoa" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEYP1" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="6H$fNdLyFoe" role="1B3o_S" />
+        <node concept="3clFbS" id="6H$fNdLyFof" role="3clF47">
+          <node concept="3clFbF" id="6H$fNdLyFog" role="3cqZAp">
+            <node concept="2YIFZM" id="6H$fNdLyMmh" role="3clFbG">
+              <ref role="37wK5l" to="kxzb:6H$fNdLyI$k" resolve="instances" />
+              <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+              <node concept="2YIFZM" id="3J6h25QQ6RU" role="37wK5m">
+                <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                <ref role="37wK5l" to="kxzb:3J6h25QHNxY" resolve="createConsoleScope" />
+                <node concept="10Nm6u" id="3J6h25QQ6RV" role="37wK5m" />
+                <node concept="10Nm6u" id="3J6h25QQ6RW" role="37wK5m" />
+                <node concept="29HgVG" id="3J6h25QQ6RX" role="lGtFl">
+                  <node concept="3NFfHV" id="3J6h25QQ6RY" role="3NFExx">
+                    <node concept="3clFbS" id="3J6h25QQ6RZ" role="2VODD2">
+                      <node concept="3clFbF" id="3J6h25QQ6S0" role="3cqZAp">
+                        <node concept="2OqwBi" id="3J6h25QQ6S1" role="3clFbG">
+                          <node concept="3TrEf2" id="3J6h25QQ6S2" role="2OqNvi">
+                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                          </node>
+                          <node concept="30H73N" id="3J6h25QQ6S3" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="10Nm6u" id="6H$fNdLyMml" role="37wK5m">
+                <node concept="1sPUBX" id="4PRmqZeCQd2" role="lGtFl">
+                  <ref role="v9R2y" to="tp27:3oBWDt57kLm" resolve="switch_toSAbstractConcept" />
+                  <node concept="3NFfHV" id="4PRmqZeIjSI" role="1sPUBK">
+                    <node concept="3clFbS" id="4PRmqZeIjSJ" role="2VODD2">
+                      <node concept="3clFbF" id="4PRmqZeIjUe" role="3cqZAp">
+                        <node concept="2OqwBi" id="4PRmqZeIjZG" role="3clFbG">
+                          <node concept="30H73N" id="4PRmqZeIjUd" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4PRmqZeIl8W" role="2OqNvi">
+                            <ref role="3Tt5mk" to="3xdn:6H$fNdLyE4e" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="6H$fNdLyMmt" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6H$fNdLyFou" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="3Z0MTj6l$Fi">
+    <property role="TrG5h" value="reduce_NodesExpression" />
+    <property role="3GE5qa" value="expression.query" />
+    <ref role="3gUMe" to="3xdn:2sF4xi8qX2e" resolve="NodesExpression" />
+    <node concept="312cEu" id="3Z0MTj6l_4f" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="3Z0MTj6l_4g" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="3Z0MTj6l_4h" role="3clF45" />
+        <node concept="37vLTG" id="3Z0MTj6l_4i" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEZ8i" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="3Z0MTj6l_4m" role="1B3o_S" />
+        <node concept="3clFbS" id="3Z0MTj6l_4n" role="3clF47">
+          <node concept="3clFbF" id="3Z0MTj6l_4o" role="3cqZAp">
+            <node concept="2YIFZM" id="3Z0MTj6lAI4" role="3clFbG">
+              <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+              <ref role="37wK5l" to="kxzb:hpHLh7Fj2X" resolve="nodes" />
+              <node concept="raruj" id="3Z0MTj6lAIs" role="lGtFl" />
+              <node concept="2YIFZM" id="3J6h25QJne$" role="37wK5m">
+                <ref role="37wK5l" to="kxzb:3J6h25QHNxY" resolve="createConsoleScope" />
+                <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                <node concept="10Nm6u" id="3J6h25QJnhU" role="37wK5m" />
+                <node concept="10Nm6u" id="3J6h25QJnp5" role="37wK5m" />
+                <node concept="29HgVG" id="3J6h25QJnsR" role="lGtFl">
+                  <node concept="3NFfHV" id="3J6h25QJnsU" role="3NFExx">
+                    <node concept="3clFbS" id="3J6h25QJnsV" role="2VODD2">
+                      <node concept="3clFbF" id="3J6h25QJnt1" role="3cqZAp">
+                        <node concept="2OqwBi" id="3J6h25QJnsW" role="3clFbG">
+                          <node concept="3TrEf2" id="3J6h25QJnsZ" role="2OqNvi">
+                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                          </node>
+                          <node concept="30H73N" id="3J6h25QJnt0" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3Z0MTj6l_4M" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="5uXC5_7dk$A">
+    <property role="TrG5h" value="reduce_ReferencesExpression" />
+    <property role="3GE5qa" value="expression.query" />
+    <ref role="3gUMe" to="3xdn:5uXC5_72l2X" resolve="ReferencesExpression" />
+    <node concept="312cEu" id="5uXC5_7dkZV" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="5uXC5_7dkZW" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="5uXC5_7dkZX" role="3clF45" />
+        <node concept="37vLTG" id="5uXC5_7dkZY" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEZfI" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="5uXC5_7dl02" role="1B3o_S" />
+        <node concept="3clFbS" id="5uXC5_7dl03" role="3clF47">
+          <node concept="3clFbF" id="5uXC5_7dl04" role="3cqZAp">
+            <node concept="2YIFZM" id="5uXC5_7dlxS" role="3clFbG">
+              <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+              <ref role="37wK5l" to="kxzb:1El5OLsHe1P" resolve="references" />
+              <node concept="2YIFZM" id="3J6h25QQ7a$" role="37wK5m">
+                <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                <ref role="37wK5l" to="kxzb:3J6h25QHNxY" resolve="createConsoleScope" />
+                <node concept="10Nm6u" id="3J6h25QQ7a_" role="37wK5m" />
+                <node concept="10Nm6u" id="3J6h25QQ7aA" role="37wK5m" />
+                <node concept="29HgVG" id="3J6h25QQ7aB" role="lGtFl">
+                  <node concept="3NFfHV" id="3J6h25QQ7aC" role="3NFExx">
+                    <node concept="3clFbS" id="3J6h25QQ7aD" role="2VODD2">
+                      <node concept="3clFbF" id="3J6h25QQ7aE" role="3cqZAp">
+                        <node concept="2OqwBi" id="3J6h25QQ7aF" role="3clFbG">
+                          <node concept="3TrEf2" id="3J6h25QQ7aG" role="2OqNvi">
+                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                          </node>
+                          <node concept="30H73N" id="3J6h25QQ7aH" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="5uXC5_7dlys" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5uXC5_7dl0E" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="5X1VVpPJFde">
+    <property role="TrG5h" value="reduce_ModelsExpression" />
+    <property role="3GE5qa" value="expression.query" />
+    <ref role="3gUMe" to="3xdn:5X1VVpPJEGH" resolve="ModelsExpression" />
+    <node concept="312cEu" id="5X1VVpPJFmb" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="5X1VVpPJFmc" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="5X1VVpPJFmd" role="3clF45" />
+        <node concept="37vLTG" id="5X1VVpPJFme" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEYVQ" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="5X1VVpPJFmi" role="1B3o_S" />
+        <node concept="3clFbS" id="5X1VVpPJFmj" role="3clF47">
+          <node concept="3clFbF" id="5X1VVpPJFmk" role="3cqZAp">
+            <node concept="2YIFZM" id="5X1VVpPN21_" role="3clFbG">
+              <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+              <ref role="37wK5l" to="kxzb:DM6_$imnYd" resolve="models" />
+              <node concept="2YIFZM" id="3J6h25QQ6A3" role="37wK5m">
+                <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                <ref role="37wK5l" to="kxzb:3J6h25QHNxY" resolve="createConsoleScope" />
+                <node concept="10Nm6u" id="3J6h25QQ6A4" role="37wK5m" />
+                <node concept="10Nm6u" id="3J6h25QQ6A5" role="37wK5m" />
+                <node concept="29HgVG" id="3J6h25QQ6A6" role="lGtFl">
+                  <node concept="3NFfHV" id="3J6h25QQ6A7" role="3NFExx">
+                    <node concept="3clFbS" id="3J6h25QQ6A8" role="2VODD2">
+                      <node concept="3clFbF" id="3J6h25QQ6A9" role="3cqZAp">
+                        <node concept="2OqwBi" id="3J6h25QQ6Aa" role="3clFbG">
+                          <node concept="3TrEf2" id="3J6h25QQ6Ab" role="2OqNvi">
+                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                          </node>
+                          <node concept="30H73N" id="3J6h25QQ6Ac" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="5X1VVpPN21P" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5X1VVpPJFmA" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="5X1VVpPS2IN">
+    <property role="TrG5h" value="reduce_ModulesExpression" />
+    <property role="3GE5qa" value="expression.query" />
+    <ref role="3gUMe" to="3xdn:5X1VVpPN29y" resolve="ModulesExpression" />
+    <node concept="312cEu" id="5X1VVpPS2Qx" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="5X1VVpPS2Qy" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="5X1VVpPS2Qz" role="3clF45" />
+        <node concept="37vLTG" id="5X1VVpPS2Q$" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEZ24" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="5X1VVpPS2QC" role="1B3o_S" />
+        <node concept="3clFbS" id="5X1VVpPS2QD" role="3clF47">
+          <node concept="3clFbF" id="5X1VVpPS2QE" role="3cqZAp">
+            <node concept="2YIFZM" id="5X1VVpPS2XS" role="3clFbG">
+              <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+              <ref role="37wK5l" to="kxzb:DM6_$ineY0" resolve="modules" />
+              <node concept="2YIFZM" id="3J6h25QQ6np" role="37wK5m">
+                <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                <ref role="37wK5l" to="kxzb:3J6h25QHNxY" resolve="createConsoleScope" />
+                <node concept="10Nm6u" id="3J6h25QQ6nq" role="37wK5m" />
+                <node concept="10Nm6u" id="3J6h25QQ6nr" role="37wK5m" />
+                <node concept="29HgVG" id="3J6h25QQ6ns" role="lGtFl">
+                  <node concept="3NFfHV" id="3J6h25QQ6nt" role="3NFExx">
+                    <node concept="3clFbS" id="3J6h25QQ6nu" role="2VODD2">
+                      <node concept="3clFbF" id="3J6h25QQ6nv" role="3cqZAp">
+                        <node concept="2OqwBi" id="3J6h25QQ6nw" role="3clFbG">
+                          <node concept="3TrEf2" id="3J6h25QQ6nx" role="2OqNvi">
+                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                          </node>
+                          <node concept="30H73N" id="3J6h25QQ6ny" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="5X1VVpPS2Y8" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5X1VVpPS2QW" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="3J6h25QGPcs">
+    <property role="TrG5h" value="reduce_QueryParameterList" />
+    <property role="3GE5qa" value="expression.parameter" />
+    <ref role="3gUMe" to="3xdn:3J6h25Q5HRT" resolve="QueryParameterList" />
+    <node concept="312cEu" id="3J6h25QGPG6" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="3J6h25QGPG7" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="3J6h25QGPG8" role="3clF45" />
+        <node concept="37vLTG" id="3J6h25QGPG9" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEXnd" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="3J6h25QGPGd" role="1B3o_S" />
+        <node concept="3clFbS" id="3J6h25QGPGe" role="3clF47">
+          <node concept="3clFbF" id="3J6h25QHLRA" role="3cqZAp">
+            <node concept="2YIFZM" id="3J6h25QHNTv" role="3clFbG">
+              <ref role="37wK5l" to="kxzb:3J6h25QHNxY" resolve="createConsoleScope" />
+              <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+              <node concept="10Nm6u" id="3J6h25QHP70" role="37wK5m">
+                <node concept="29HgVG" id="3J6h25QHPEH" role="lGtFl">
+                  <node concept="3NFfHV" id="3J6h25QHPEJ" role="3NFExx">
+                    <node concept="3clFbS" id="3J6h25QHPEL" role="2VODD2">
+                      <node concept="3cpWs8" id="3J6h25QJEyZ" role="3cqZAp">
+                        <node concept="3cpWsn" id="3J6h25QJEz2" role="3cpWs9">
+                          <property role="TrG5h" value="results" />
+                          <node concept="2OqwBi" id="3J6h25QNsHA" role="33vP2m">
+                            <node concept="2OqwBi" id="3J6h25QHTs6" role="2Oq$k0">
+                              <node concept="2OqwBi" id="3J6h25QHPRK" role="2Oq$k0">
+                                <node concept="30H73N" id="3J6h25QHPIF" role="2Oq$k0" />
+                                <node concept="3Tsc0h" id="3J6h25QHR3n" role="2OqNvi">
+                                  <ref role="3TtcxE" to="3xdn:3J6h25QCAaA" />
+                                </node>
+                              </node>
+                              <node concept="3zZkjj" id="3J6h25QI3Py" role="2OqNvi">
+                                <node concept="1bVj0M" id="3J6h25QI3P$" role="23t8la">
+                                  <node concept="3clFbS" id="3J6h25QI3P_" role="1bW5cS">
+                                    <node concept="3clFbF" id="3J6h25QI4fx" role="3cqZAp">
+                                      <node concept="2OqwBi" id="3J6h25QI4WH" role="3clFbG">
+                                        <node concept="37vLTw" id="3J6h25QI4fw" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="3J6h25QI3PA" resolve="it" />
+                                        </node>
+                                        <node concept="1mIQ4w" id="3J6h25QI9zR" role="2OqNvi">
+                                          <node concept="chp4Y" id="3J6h25QI9Xb" role="cj9EA">
+                                            <ref role="cht4Q" to="3xdn:3J6h25Q6eOJ" resolve="QueryParameterScope" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="Rh6nW" id="3J6h25QI3PA" role="1bW2Oz">
+                                    <property role="TrG5h" value="it" />
+                                    <node concept="2jxLKc" id="3J6h25QI3PB" role="1tU5fm" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3$u5V9" id="3J6h25QNvtH" role="2OqNvi">
+                              <node concept="1bVj0M" id="3J6h25QNvtJ" role="23t8la">
+                                <node concept="3clFbS" id="3J6h25QNvtK" role="1bW5cS">
+                                  <node concept="3clFbF" id="3J6h25QNw2l" role="3cqZAp">
+                                    <node concept="1PxgMI" id="3J6h25QN_u8" role="3clFbG">
+                                      <ref role="1PxNhF" to="3xdn:3J6h25Q6eOJ" resolve="QueryParameterScope" />
+                                      <node concept="37vLTw" id="3J6h25QNw2k" role="1PxMeX">
+                                        <ref role="3cqZAo" node="3J6h25QNvtL" resolve="it" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="Rh6nW" id="3J6h25QNvtL" role="1bW2Oz">
+                                  <property role="TrG5h" value="it" />
+                                  <node concept="2jxLKc" id="3J6h25QNvtM" role="1tU5fm" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="A3Dl8" id="3J6h25QJHGD" role="1tU5fm">
+                            <node concept="3Tqbb2" id="3J6h25QJEyY" role="A3Ik2">
+                              <ref role="ehGHo" to="3xdn:3J6h25Q6eOJ" resolve="QueryParameterScope" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs6" id="3J6h25QJFxr" role="3cqZAp">
+                        <node concept="3K4zz7" id="3J6h25QJLSB" role="3cqZAk">
+                          <node concept="2c44tf" id="3J6h25QJM7G" role="3K4E3e">
+                            <node concept="10Nm6u" id="3J6h25QJMol" role="2c44tc" />
+                          </node>
+                          <node concept="2OqwBi" id="3J6h25QNI5V" role="3K4GZi">
+                            <node concept="2OqwBi" id="3J6h25QJOMW" role="2Oq$k0">
+                              <node concept="37vLTw" id="3J6h25QJMoQ" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3J6h25QJEz2" resolve="results" />
+                              </node>
+                              <node concept="1uHKPH" id="3J6h25QJQDe" role="2OqNvi" />
+                            </node>
+                            <node concept="3TrEf2" id="3J6h25QNL58" role="2OqNvi">
+                              <ref role="3Tt5mk" to="3xdn:3J6h25QeYY9" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="3J6h25QJG_T" role="3K4Cdx">
+                            <node concept="37vLTw" id="3J6h25QJGa4" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3J6h25QJEz2" resolve="results" />
+                            </node>
+                            <node concept="1v1jN8" id="3J6h25QJJLv" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbT" id="3J6h25QHP3u" role="37wK5m">
+                <node concept="29HgVG" id="3J6h25QIeck" role="lGtFl">
+                  <node concept="3NFfHV" id="3J6h25QIecm" role="3NFExx">
+                    <node concept="3clFbS" id="3J6h25QIeco" role="2VODD2">
+                      <node concept="3cpWs8" id="3J6h25QJRgb" role="3cqZAp">
+                        <node concept="3cpWsn" id="3J6h25QJRgc" role="3cpWs9">
+                          <property role="TrG5h" value="results" />
+                          <node concept="A3Dl8" id="3J6h25QJRgr" role="1tU5fm">
+                            <node concept="3Tqbb2" id="3J6h25QJRgs" role="A3Ik2">
+                              <ref role="ehGHo" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="3J6h25QIiae" role="33vP2m">
+                            <node concept="2OqwBi" id="3J6h25QIe_O" role="2Oq$k0">
+                              <node concept="30H73N" id="3J6h25QIev7" role="2Oq$k0" />
+                              <node concept="3Tsc0h" id="3J6h25QIfLv" role="2OqNvi">
+                                <ref role="3TtcxE" to="3xdn:3J6h25QCAaA" />
+                              </node>
+                            </node>
+                            <node concept="3zZkjj" id="3J6h25QIsQE" role="2OqNvi">
+                              <node concept="1bVj0M" id="3J6h25QIsQG" role="23t8la">
+                                <node concept="3clFbS" id="3J6h25QIsQH" role="1bW5cS">
+                                  <node concept="3clFbF" id="3J6h25QItgD" role="3cqZAp">
+                                    <node concept="2OqwBi" id="3J6h25QItXP" role="3clFbG">
+                                      <node concept="37vLTw" id="3J6h25QItgC" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="3J6h25QIsQI" resolve="it" />
+                                      </node>
+                                      <node concept="1mIQ4w" id="3J6h25QIw3W" role="2OqNvi">
+                                        <node concept="chp4Y" id="3J6h25QIwtg" role="cj9EA">
+                                          <ref role="cht4Q" to="3xdn:3J6h25Q6eM6" resolve="QueryParameterIncludeReadOnly" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="Rh6nW" id="3J6h25QIsQI" role="1bW2Oz">
+                                  <property role="TrG5h" value="it" />
+                                  <node concept="2jxLKc" id="3J6h25QIsQJ" role="1tU5fm" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs6" id="3J6h25QJRgt" role="3cqZAp">
+                        <node concept="3K4zz7" id="3J6h25QJRgu" role="3cqZAk">
+                          <node concept="2c44tf" id="3J6h25QNVnM" role="3K4GZi">
+                            <node concept="3clFbT" id="3J6h25QNVTH" role="2c44tc">
+                              <property role="3clFbU" value="true" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="3J6h25QJRg$" role="3K4Cdx">
+                            <node concept="37vLTw" id="3J6h25QJRg_" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3J6h25QJRgc" resolve="results" />
+                            </node>
+                            <node concept="1v1jN8" id="3J6h25QJRgA" role="2OqNvi" />
+                          </node>
+                          <node concept="2c44tf" id="3J6h25QNMhK" role="3K4E3e">
+                            <node concept="3clFbT" id="3J6h25QNQhN" role="2c44tc">
+                              <property role="3clFbU" value="false" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="3J6h25QLwgt" role="37wK5m">
+                <ref role="3cqZAo" node="3J6h25QGPG9" resolve="context" />
+              </node>
+              <node concept="raruj" id="3J6h25QKuam" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3J6h25QGPGx" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="3J6h25QO0bt">
+    <property role="TrG5h" value="reduce_GlobalScopeLiteral" />
+    <property role="3GE5qa" value="expression.parameter" />
+    <ref role="3gUMe" to="3xdn:3J6h25QeHP2" resolve="GlobalScope" />
+    <node concept="312cEu" id="3J6h25QO0gm" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="3J6h25QO0gn" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="3J6h25QO0go" role="3clF45" />
+        <node concept="37vLTG" id="3J6h25QO0gp" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEWGy" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="3J6h25QO0gt" role="1B3o_S" />
+        <node concept="3clFbS" id="3J6h25QO0gu" role="3clF47">
+          <node concept="3clFbF" id="3J6h25QOG$P" role="3cqZAp">
+            <node concept="2YIFZM" id="3J6h25QOIM4" role="3clFbG">
+              <ref role="37wK5l" to="z1c3:~GlobalScope.getInstance():jetbrains.mps.project.GlobalScope" resolve="getInstance" />
+              <ref role="1Pybhc" to="z1c3:~GlobalScope" resolve="GlobalScope" />
+              <node concept="raruj" id="3J6h25QOMpM" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3J6h25QO0hE" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="31Tct3TvJ$l">
+    <property role="TrG5h" value="reduce_ModelScopeLiteral" />
+    <property role="3GE5qa" value="expression.parameter" />
+    <ref role="3gUMe" to="3xdn:31Tct3Tk$xe" resolve="ModelScope" />
+    <node concept="312cEu" id="31Tct3TvJKU" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="31Tct3TvJKV" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="31Tct3TvJKW" role="3clF45" />
+        <node concept="37vLTG" id="31Tct3TvJKX" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEWRA" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="31Tct3TvJL1" role="1B3o_S" />
+        <node concept="3clFbS" id="31Tct3TvJL2" role="3clF47">
+          <node concept="3clFbF" id="31Tct3TvJL3" role="3cqZAp">
+            <node concept="2ShNRf" id="31Tct3TvJL4" role="3clFbG">
+              <node concept="1pGfFk" id="31Tct3TvJL5" role="2ShVmc">
+                <ref role="37wK5l" to="mte5:~ModelsScope.&lt;init&gt;(java.lang.Iterable)" resolve="ModelsScope" />
+                <node concept="2ShNRf" id="31Tct3TvJL6" role="37wK5m">
+                  <node concept="Tc6Ow" id="5kx7ze1soco" role="2ShVmc">
+                    <node concept="3uibUv" id="5kx7ze1sE$1" role="HW$YZ">
+                      <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+                    </node>
+                    <node concept="10Nm6u" id="5kx7ze1socq" role="HW$Y0">
+                      <node concept="2b32R4" id="5kx7ze1socr" role="lGtFl">
+                        <node concept="3JmXsc" id="5kx7ze1socs" role="2P8S$">
+                          <node concept="3clFbS" id="5kx7ze1soct" role="2VODD2">
+                            <node concept="3clFbF" id="5kx7ze1socu" role="3cqZAp">
+                              <node concept="2OqwBi" id="5kx7ze1socv" role="3clFbG">
+                                <node concept="3Tsc0h" id="5kx7ze1socw" role="2OqNvi">
+                                  <ref role="3TtcxE" to="3xdn:31Tct3Tk$xf" />
+                                </node>
+                                <node concept="30H73N" id="5kx7ze1socx" role="2Oq$k0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="31Tct3TvJLi" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="31Tct3TvJLj" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="31Tct3Tzi3L">
+    <property role="TrG5h" value="reduce_CustomScope" />
+    <property role="3GE5qa" value="expression.parameter" />
+    <ref role="3gUMe" to="3xdn:31Tct3Txnn9" resolve="CustomScope" />
+    <node concept="312cEu" id="31Tct3TziB0" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="31Tct3TziB1" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="31Tct3TziB2" role="3clF45" />
+        <node concept="37vLTG" id="31Tct3TziB3" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="4Lv24c$Am79" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="31Tct3TziB7" role="1B3o_S" />
+        <node concept="3clFbS" id="31Tct3TziB8" role="3clF47">
+          <node concept="3clFbF" id="31Tct3Tzjm1" role="3cqZAp">
+            <node concept="10Nm6u" id="31Tct3Tzjm0" role="3clFbG">
+              <node concept="raruj" id="31Tct3Tzjmc" role="lGtFl" />
+              <node concept="29HgVG" id="31Tct3Tzjme" role="lGtFl">
+                <node concept="3NFfHV" id="31Tct3Tzjmh" role="3NFExx">
+                  <node concept="3clFbS" id="31Tct3Tzjmi" role="2VODD2">
+                    <node concept="3clFbF" id="31Tct3Tzjmo" role="3cqZAp">
+                      <node concept="2OqwBi" id="31Tct3Tzjmj" role="3clFbG">
+                        <node concept="3TrEf2" id="31Tct3Tzjmm" role="2OqNvi">
+                          <ref role="3Tt5mk" to="3xdn:31Tct3Txpke" />
+                        </node>
+                        <node concept="30H73N" id="31Tct3Tzjmn" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="31Tct3TziBp" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="31Tct3TnZm2">
+    <property role="TrG5h" value="reduce_ModuleScopeLiteral" />
+    <property role="3GE5qa" value="expression.parameter" />
+    <ref role="3gUMe" to="3xdn:2oWvAovDHkX" resolve="ModulesScope" />
+    <node concept="312cEu" id="31Tct3TnZLz" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="31Tct3TnZL$" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="31Tct3TnZL_" role="3clF45" />
+        <node concept="37vLTG" id="31Tct3TnZLA" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="3mC5XuEEX0v" role="1tU5fm">
+            <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="31Tct3TnZLE" role="1B3o_S" />
+        <node concept="3clFbS" id="31Tct3TnZLF" role="3clF47">
+          <node concept="3clFbF" id="31Tct3TnZLG" role="3cqZAp">
+            <node concept="2ShNRf" id="31Tct3TnZLH" role="3clFbG">
+              <node concept="1pGfFk" id="31Tct3TnZLI" role="2ShVmc">
+                <ref role="37wK5l" to="mte5:~ModulesScope.&lt;init&gt;(java.lang.Iterable)" resolve="ModulesScope" />
+                <node concept="2ShNRf" id="31Tct3TuFId" role="37wK5m">
+                  <node concept="Tc6Ow" id="31Tct3TuKiN" role="2ShVmc">
+                    <node concept="10Nm6u" id="31Tct3TuXBs" role="HW$Y0">
+                      <node concept="2b32R4" id="31Tct3TuYWE" role="lGtFl">
+                        <node concept="3JmXsc" id="31Tct3TuYWH" role="2P8S$">
+                          <node concept="3clFbS" id="31Tct3TuYWI" role="2VODD2">
+                            <node concept="3clFbF" id="31Tct3TuYWO" role="3cqZAp">
+                              <node concept="2OqwBi" id="31Tct3TuYWJ" role="3clFbG">
+                                <node concept="3Tsc0h" id="31Tct3TuYWM" role="2OqNvi">
+                                  <ref role="3TtcxE" to="3xdn:31Tct3TiJtC" />
+                                </node>
+                                <node concept="30H73N" id="31Tct3TuYWN" role="2Oq$k0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3uibUv" id="5WfJj_A2NVl" role="HW$YZ">
+                      <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="31Tct3TnZLY" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="31Tct3TnZLZ" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="1H31ARNQ$RB">
+    <property role="TrG5h" value="reduce_WithStatement" />
+    <property role="3GE5qa" value="" />
+    <ref role="3gUMe" to="3xdn:3F2FyKbNNqb" resolve="WithStatement" />
+    <node concept="9aQIb" id="1H31ARNQ$Sk" role="13RCb5">
+      <node concept="3clFbS" id="1H31ARNQ$Sm" role="9aQI4">
+        <node concept="3cpWs8" id="1H31ARNQ$U8" role="3cqZAp">
+          <node concept="3cpWsn" id="1H31ARNQ$U9" role="3cpWs9">
+            <property role="TrG5h" value="context" />
+            <node concept="3uibUv" id="1ycrhFMMW0Y" role="1tU5fm">
+              <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+            </node>
+            <node concept="2ShNRf" id="6ysF3v1j_n4" role="33vP2m">
+              <node concept="YeOm9" id="6ysF3v1j_n5" role="2ShVmc">
+                <node concept="1Y3b0j" id="6ysF3v1j_n6" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <ref role="1Y3XeK" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+                  <node concept="3Tm1VV" id="6ysF3v1j_n7" role="1B3o_S" />
+                  <node concept="3clFb_" id="1hGiwlkUV2G" role="jymVt">
+                    <property role="1EzhhJ" value="false" />
+                    <property role="TrG5h" value="getDefaultSearchScope" />
+                    <node concept="3uibUv" id="1hGiwlkUV2H" role="3clF45">
+                      <ref role="3uigEE" to="lui2:~SearchScope" resolve="SearchScope" />
+                    </node>
+                    <node concept="3Tm1VV" id="1hGiwlkUV2I" role="1B3o_S" />
+                    <node concept="3clFbS" id="1hGiwlkUV2L" role="3clF47">
+                      <node concept="3cpWs6" id="1hGiwlkVSwr" role="3cqZAp">
+                        <node concept="2YIFZM" id="1H31ARNRdyq" role="3cqZAk">
+                          <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                          <ref role="37wK5l" to="kxzb:1H31ARNR264" resolve="createScope" />
+                          <node concept="10Nm6u" id="1H31ARNRd_x" role="37wK5m">
+                            <node concept="29HgVG" id="1H31ARNRdP3" role="lGtFl">
+                              <node concept="3NFfHV" id="1H31ARNRdSb" role="3NFExx">
+                                <node concept="3clFbS" id="1H31ARNRdSc" role="2VODD2">
+                                  <node concept="3clFbF" id="1H31ARNRdV6" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1H31ARNRdY7" role="3clFbG">
+                                      <node concept="30H73N" id="1H31ARNRdV5" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="1H31ARNReaT" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="3xdn:3F2FyKbNNqR" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1H31ARNQ$UD" role="3cqZAp">
+          <node concept="10Nm6u" id="1H31ARNQ$UB" role="3clFbG" />
+          <node concept="2b32R4" id="1H31ARNQAaI" role="lGtFl">
+            <node concept="3JmXsc" id="1H31ARNQAaK" role="2P8S$">
+              <node concept="3clFbS" id="1H31ARNQAaM" role="2VODD2">
+                <node concept="3clFbF" id="1H31ARNQAg7" role="3cqZAp">
+                  <node concept="2OqwBi" id="1H31ARNQB5f" role="3clFbG">
+                    <node concept="2OqwBi" id="1H31ARNQAm6" role="2Oq$k0">
+                      <node concept="30H73N" id="1H31ARNQAg6" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="1H31ARNQABq" role="2OqNvi">
+                        <ref role="3Tt5mk" to="3xdn:3F2FyKbNNqc" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="1H31ARNQBKB" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpee:fzcqZ_x" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="raruj" id="1H31ARNQ$UT" role="lGtFl" />
+    </node>
+  </node>
+</model>
+
diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl
similarity index 52%
rename from plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl
rename to languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl
index a1844c744dbe..f358d27ccf77 100644
--- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl
+++ b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.console.blCommand" uuid="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" generatorOutputPath="${module}/source_gen" version="0">
+<language namespace="jetbrains.mps.lang.smodel.query" uuid="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" generatorOutputPath="${module}/source_gen" version="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
@@ -7,7 +7,7 @@
   </models>
   <accessoryModels />
   <generators>
-    <generator name="" generatorUID="jetbrains.mps.console.blCommand#5336086527852811409" uuid="504d7390-81ca-4422-8018-f7290efa217f">
+    <generator name="" generatorUID="jetbrains.mps.lang.smodel.query#5336086527852811409" uuid="504d7390-81ca-4422-8018-f7290efa217f">
       <models>
         <modelRoot contentPath="${module}/generator/template" type="default">
           <sourceRoot location="." />
@@ -18,22 +18,15 @@
       </facets>
       <external-templates />
       <dependencies>
-        <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-        <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-        <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
-        <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
         <dependency reexport="false">9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)</dependency>
         <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-        <dependency reexport="false" scope="design">857d0a79-6f44-4f46-84ed-9c5b42632011(jetbrains.mps.baseLanguage.closures#1199623535494)</dependency>
-        <dependency reexport="false" scope="design">5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)</dependency>
-        <dependency reexport="false">a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)</dependency>
-        <dependency reexport="false">de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)</dependency>
-        <dependency reexport="false">1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)</dependency>
-        <dependency reexport="false">7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime)</dependency>
-        <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
+        <dependency reexport="false">1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)</dependency>
         <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-        <dependency reexport="false">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
         <dependency reexport="false" scope="design">2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696)</dependency>
+        <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+        <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+        <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+        <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
       </dependencies>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -46,82 +39,23 @@
         <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" fqName="jetbrains.mps.console.base" version="0" />
-        <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" fqName="jetbrains.mps.console.blCommand" version="0" />
-        <language id="a5e4de53-46a3-44da-aab3-68fdf1c34ed0" fqName="jetbrains.mps.console.ideCommands" version="0" />
-        <language id="995a7394-7f76-4b8b-a929-c53448708106" fqName="jetbrains.mps.console.internalCommands" version="0" />
         <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
         <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
         <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
-        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
+        <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" fqName="jetbrains.mps.lang.smodel.query" version="0" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-        <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
       </languageVersions>
-      <mapping-priorities>
-        <mapping-priority-rule kind="strictly_before">
-          <greater-priority-mapping>
-            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
-            <external-mapping>
-              <mapping-node modelUID="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" nodeID="7600370246415688284" />
-            </external-mapping>
-          </greater-priority-mapping>
-          <lesser-priority-mapping>
-            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
-            <external-mapping>
-              <mapping-node modelUID="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" nodeID="5336086527852811410" />
-            </external-mapping>
-          </lesser-priority-mapping>
-        </mapping-priority-rule>
-        <mapping-priority-rule kind="strictly_before">
-          <greater-priority-mapping>
-            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
-            <external-mapping>
-              <mapping-node modelUID="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" nodeID="5336086527852811410" />
-            </external-mapping>
-          </greater-priority-mapping>
-          <lesser-priority-mapping>
-            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
-            <external-mapping>
-              <mapping-set>
-                <mapping-set-element>
-                  <generator generatorUID="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" />
-                  <external-mapping>
-                    <all-local-mappings />
-                  </external-mapping>
-                </mapping-set-element>
-                <mapping-set-element>
-                  <generator generatorUID="857d0a79-6f44-4f46-84ed-9c5b42632011(jetbrains.mps.baseLanguage.closures#1199623535494)" />
-                  <external-mapping>
-                    <all-local-mappings />
-                  </external-mapping>
-                </mapping-set-element>
-              </mapping-set>
-            </external-mapping>
-          </lesser-priority-mapping>
-        </mapping-priority-rule>
-      </mapping-priorities>
+      <mapping-priorities />
     </generator>
   </generators>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-    <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
-    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
-    <dependency reexport="false">a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)</dependency>
-    <dependency reexport="false">de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)</dependency>
-    <dependency reexport="false">7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime)</dependency>
-    <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
-    <dependency reexport="false">d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)</dependency>
-    <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
+    <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -149,13 +83,11 @@
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <runtime>
-    <dependency reexport="false">7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </runtime>
   <extendedLanguages>
     <extendedLanguage>7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</extendedLanguage>
     <extendedLanguage>ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</extendedLanguage>
-    <extendedLanguage>de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)</extendedLanguage>
     <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
     <extendedLanguage>a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)</extendedLanguage>
   </extendedLanguages>
diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps
new file mode 100644
index 000000000000..5b1fa29bcada
--- /dev/null
+++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.lang.smodel.query.actions)">
+  <persistence version="9" />
+  <languages>
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
+  </imports>
+  <registry>
+    <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" />
+      </concept>
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+    </language>
+    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
+      <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
+      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
+      <concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
+        <child id="1158700779049" name="nodeFactory" index="37WGs$" />
+      </concept>
+      <concept id="1158700725281" name="jetbrains.mps.lang.actions.structure.NodeFactory" flags="ig" index="37WvkG">
+        <reference id="1158700943156" name="applicableConcept" index="37XkoT" />
+        <child id="1158701448518" name="setupFunction" index="37ZfLb" />
+      </concept>
+      <concept id="1158701162220" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction" flags="in" index="37Y9Zx" />
+      <concept id="5584396657084912703" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_NewNode" flags="nn" index="1r4Lsj" />
+      <concept id="5584396657084920413" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_SampleNode" flags="nn" index="1r4N5L" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <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="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
+        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
+      </concept>
+      <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
+        <reference id="1139880128956" name="concept" index="1A9B2P" />
+      </concept>
+      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
+        <reference id="1139877738879" name="concept" index="1A0vxQ" />
+      </concept>
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <reference id="1140138128738" name="concept" index="1PxNhF" />
+        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
+      </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </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">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="37WguZ" id="3J6h25QtWbZ">
+    <property role="3GE5qa" value="expression" />
+    <property role="TrG5h" value="QueryExpression_NodeFactories" />
+    <node concept="37WvkG" id="3J6h25QtWc0" role="37WGs$">
+      <ref role="37XkoT" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
+      <node concept="37Y9Zx" id="3J6h25QtWc1" role="37ZfLb">
+        <node concept="3clFbS" id="3J6h25QtWc2" role="2VODD2">
+          <node concept="3clFbJ" id="3J6h25QtWc5" role="3cqZAp">
+            <node concept="3clFbS" id="3J6h25QtWc6" role="3clFbx">
+              <node concept="3clFbF" id="3J6h25QxUZU" role="3cqZAp">
+                <node concept="2OqwBi" id="3J6h25QCL5M" role="3clFbG">
+                  <node concept="2OqwBi" id="3J6h25QxVFq" role="2Oq$k0">
+                    <node concept="1r4Lsj" id="3J6h25QxUZS" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="3J6h25QCKdo" role="2OqNvi">
+                      <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="3J6h25QCMin" role="2OqNvi">
+                    <node concept="2OqwBi" id="3J6h25QCNJ5" role="2oxUTC">
+                      <node concept="1PxgMI" id="3J6h25QCNuO" role="2Oq$k0">
+                        <ref role="1PxNhF" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
+                        <node concept="1r4N5L" id="3J6h25QCMkZ" role="1PxMeX" />
+                      </node>
+                      <node concept="3TrEf2" id="3J6h25QCPoo" role="2OqNvi">
+                        <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3J6h25QtWie" role="3clFbw">
+              <node concept="1r4N5L" id="3J6h25QtWcn" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="3J6h25QtX3r" role="2OqNvi">
+                <node concept="chp4Y" id="3J6h25QtX4p" role="cj9EA">
+                  <ref role="cht4Q" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="3J6h25QDjj7" role="9aQIa">
+              <node concept="3clFbS" id="3J6h25QDjj8" role="9aQI4">
+                <node concept="3clFbF" id="3J6h25QDjou" role="3cqZAp">
+                  <node concept="37vLTI" id="3J6h25QDmYb" role="3clFbG">
+                    <node concept="10Nm6u" id="3J6h25QDn0P" role="37vLTx" />
+                    <node concept="2OqwBi" id="3J6h25QDj_g" role="37vLTJ">
+                      <node concept="1r4Lsj" id="3J6h25QDjot" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3J6h25QDl8l" role="2OqNvi">
+                        <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="37WguZ" id="31Tct3Tmt18">
+    <property role="3GE5qa" value="query.parameter" />
+    <property role="TrG5h" value="ScopeParameterLiteral_factories" />
+    <node concept="37WvkG" id="31Tct3Tmt19" role="37WGs$">
+      <ref role="37XkoT" to="3xdn:2oWvAovDHkX" resolve="ModulesScope" />
+      <node concept="37Y9Zx" id="31Tct3Tmt37" role="37ZfLb">
+        <node concept="3clFbS" id="31Tct3Tmt38" role="2VODD2">
+          <node concept="3clFbF" id="31Tct3Tmt3c" role="3cqZAp">
+            <node concept="2OqwBi" id="31Tct3TmvE2" role="3clFbG">
+              <node concept="2OqwBi" id="31Tct3Tmtdk" role="2Oq$k0">
+                <node concept="1r4Lsj" id="31Tct3Tmt3b" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="31Tct3TxscK" role="2OqNvi">
+                  <ref role="3TtcxE" to="3xdn:31Tct3TiJtC" />
+                </node>
+              </node>
+              <node concept="2DeJg1" id="31Tct3TxABi" role="2OqNvi">
+                <ref role="1A0vxQ" to="tp25:3wj3sjzQPFL" resolve="ModuleReferenceExpression" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="37WvkG" id="31Tct3TmLCU" role="37WGs$">
+      <ref role="37XkoT" to="3xdn:31Tct3Tk$xe" resolve="ModelScope" />
+      <node concept="37Y9Zx" id="31Tct3TmLCV" role="37ZfLb">
+        <node concept="3clFbS" id="31Tct3TmLCW" role="2VODD2">
+          <node concept="3clFbF" id="31Tct3TmLCX" role="3cqZAp">
+            <node concept="2OqwBi" id="31Tct3TmLCY" role="3clFbG">
+              <node concept="2OqwBi" id="31Tct3TmLCZ" role="2Oq$k0">
+                <node concept="1r4Lsj" id="31Tct3TmLD0" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="31Tct3TxD8L" role="2OqNvi">
+                  <ref role="3TtcxE" to="3xdn:31Tct3Tk$xf" />
+                </node>
+              </node>
+              <node concept="2DeJg1" id="31Tct3TxNCD" role="2OqNvi">
+                <ref role="1A0vxQ" to="tp25:v3WHCwUiHy" resolve="ModelReferenceExpression" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="37WvkG" id="31Tct3TnY01" role="37WGs$">
+      <ref role="37XkoT" to="3xdn:31Tct3Txnn9" resolve="CustomScope" />
+      <node concept="37Y9Zx" id="31Tct3TnY02" role="37ZfLb">
+        <node concept="3clFbS" id="31Tct3TnY03" role="2VODD2">
+          <node concept="3clFbF" id="31Tct3TnY04" role="3cqZAp">
+            <node concept="2OqwBi" id="31Tct3TnY05" role="3clFbG">
+              <node concept="2OqwBi" id="31Tct3TnY06" role="2Oq$k0">
+                <node concept="1r4Lsj" id="31Tct3TnY07" role="2Oq$k0" />
+                <node concept="3TrEf2" id="31Tct3TxOzG" role="2OqNvi">
+                  <ref role="3Tt5mk" to="3xdn:31Tct3Txpke" />
+                </node>
+              </node>
+              <node concept="2DeJnY" id="31Tct3TxPN2" role="2OqNvi">
+                <ref role="1A9B2P" to="tpee:gEShNN5" resolve="GenericNewExpression" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/plugins/console/lang/blCommand/languageModels/behavior.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps
similarity index 63%
rename from plugins/console/lang/blCommand/languageModels/behavior.mps
rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps
index 43248da09c7b..ec8e42e9467c 100644
--- a/plugins/console/lang/blCommand/languageModels/behavior.mps
+++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)">
+<model ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)">
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="zyb2" ref="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
-    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="kt01" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.datatransfer(JDK/)" />
-    <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
-    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
-    <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
+    <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -62,26 +55,21 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
@@ -106,48 +94,29 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </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">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </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="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
-        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
-      </concept>
-      <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
-        <child id="1145567471833" name="createdType" index="2T96Bj" />
-      </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
+      <concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3THzug">
+      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug">
         <reference id="1180481110358" name="conceptDeclaraton" index="3qa414" />
       </concept>
       <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
@@ -174,235 +143,12 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
     </language>
   </registry>
-  <node concept="13h7C7" id="2lR2lzqth1R">
-    <ref role="13h7C2" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-    <node concept="13hLZK" id="2lR2lzqth4f" role="13h7CW">
-      <node concept="3clFbS" id="2lR2lzqth4g" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="2lR2lzqthc1" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getExpectedRetType" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
-      <node concept="3Tm1VV" id="2lR2lzqthc2" role="1B3o_S" />
-      <node concept="3clFbS" id="2lR2lzqthc5" role="3clF47">
-        <node concept="3cpWs6" id="2lR2lzqtjT2" role="3cqZAp">
-          <node concept="2c44tf" id="2lR2lzqtjTs" role="3cqZAk">
-            <node concept="3cqZAl" id="2lR2lzqtjU6" role="2c44tc" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="2lR2lzqthc6" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="2lR2lzqthc7" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getBody" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:i2fhZ_m" resolve="getBody" />
-      <node concept="3Tm1VV" id="2lR2lzqthc8" role="1B3o_S" />
-      <node concept="3clFbS" id="2lR2lzqthcb" role="3clF47">
-        <node concept="3cpWs6" id="2lR2lzqtjXu" role="3cqZAp">
-          <node concept="2OqwBi" id="2lR2lzqtk84" role="3cqZAk">
-            <node concept="13iPFW" id="2lR2lzqtjYi" role="2Oq$k0" />
-            <node concept="3TrEf2" id="2lR2lzqtmtj" role="2OqNvi">
-              <ref role="3Tt5mk" to="3xdn:1yfzJNJreD_" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="2lR2lzqthcc" role="3clF45">
-        <ref role="ehGHo" to="tpee:fzclF80" resolve="StatementList" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="2lR2lzqthcd" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getThrowableTypes" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:5op8ooRkkc7" resolve="getThrowableTypes" />
-      <node concept="3Tm1VV" id="2lR2lzqthce" role="1B3o_S" />
-      <node concept="3clFbS" id="2lR2lzqthch" role="3clF47">
-        <node concept="3cpWs8" id="2lR2lzqtCR9" role="3cqZAp">
-          <node concept="3cpWsn" id="2lR2lzqtCRc" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="2I9FWS" id="2lR2lzqtCR7" role="1tU5fm">
-              <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
-            </node>
-            <node concept="2ShNRf" id="2lR2lzqtCSF" role="33vP2m">
-              <node concept="2T8Vx0" id="2lR2lzqtDsB" role="2ShVmc">
-                <node concept="2I9FWS" id="2lR2lzqtDsD" role="2T96Bj">
-                  <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2lR2lzqtDt_" role="3cqZAp">
-          <node concept="2OqwBi" id="2lR2lzqtEgc" role="3clFbG">
-            <node concept="37vLTw" id="2lR2lzqtDt$" role="2Oq$k0">
-              <ref role="3cqZAo" node="2lR2lzqtCRc" resolve="result" />
-            </node>
-            <node concept="TSZUe" id="2lR2lzqtLzD" role="2OqNvi">
-              <node concept="2c44tf" id="2lR2lzqtLB5" role="25WWJ7">
-                <node concept="3uibUv" id="2lR2lzqtLHg" role="2c44tc">
-                  <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="2lR2lzqtmw1" role="3cqZAp">
-          <node concept="37vLTw" id="2lR2lzqtLN_" role="3cqZAk">
-            <ref role="3cqZAo" node="2lR2lzqtCRc" resolve="result" />
-          </node>
-        </node>
-      </node>
-      <node concept="2I9FWS" id="2lR2lzqthci" role="3clF45">
-        <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="64VftqEeonj" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getShortHelp" />
-      <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
-      <node concept="3Tm1VV" id="64VftqEeonk" role="1B3o_S" />
-      <node concept="3clFbS" id="64VftqEeonn" role="3clF47">
-        <node concept="3clFbF" id="64VftqEeopH" role="3cqZAp">
-          <node concept="Xl_RD" id="64VftqEeopG" role="3clFbG">
-            <property role="Xl_RC" value="execute a statement list" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="64VftqEeono" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="64VftqEeosT" role="13h7CS">
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getDisplayString" />
-      <ref role="13i0hy" to="zyb2:64VftqEenfn" resolve="getShortDisplayString" />
-      <node concept="3clFbS" id="64VftqEeosW" role="3clF47">
-        <node concept="3clFbF" id="64VftqEeoCg" role="3cqZAp">
-          <node concept="Xl_RD" id="64VftqEeoCf" role="3clFbG">
-            <property role="Xl_RC" value="{ &lt;statements&gt; }" />
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="64VftqEeovs" role="3clF45" />
-      <node concept="3Tm1VV" id="64VftqEeovt" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="5G2W3aWAPT8">
-    <property role="3GE5qa" value="response" />
-    <ref role="13h7C2" to="3xdn:5G2W3aW$Vsk" resolve="ExceptionHolder" />
-    <node concept="13hLZK" id="5G2W3aWAPVw" role="13h7CW">
-      <node concept="3clFbS" id="5G2W3aWAPVx" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="5G2W3aWAQ0q" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="execute" />
-      <ref role="13i0hy" to="zyb2:7oNS25df64x" resolve="execute" />
-      <node concept="3Tm1VV" id="5G2W3aWAQ0t" role="1B3o_S" />
-      <node concept="3clFbS" id="5G2W3aWAQ0w" role="3clF47">
-        <node concept="3cpWs8" id="3EnpNH2zGjd" role="3cqZAp">
-          <node concept="3cpWsn" id="3EnpNH2zGje" role="3cpWs9">
-            <property role="TrG5h" value="contents" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="2lR2lzqyOOa" role="1tU5fm">
-              <ref role="3uigEE" to="kt01:~StringSelection" resolve="StringSelection" />
-            </node>
-            <node concept="2ShNRf" id="3EnpNH2zGjg" role="33vP2m">
-              <node concept="1pGfFk" id="3EnpNH2zGjh" role="2ShVmc">
-                <ref role="37wK5l" to="kt01:~StringSelection.&lt;init&gt;(java.lang.String)" resolve="StringSelection" />
-                <node concept="2OqwBi" id="5G2W3aWBmRR" role="37wK5m">
-                  <node concept="13iPFW" id="5G2W3aWBmHn" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="5G2W3aWBpek" role="2OqNvi">
-                    <ref role="3TsBF5" to="3xdn:5G2W3aWBbyD" resolve="stackTrace" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3EnpNH2zGjl" role="3cqZAp">
-          <node concept="2OqwBi" id="2lR2lzqySdw" role="3clFbG">
-            <node concept="2YIFZM" id="2lR2lzqyRFR" role="2Oq$k0">
-              <ref role="37wK5l" to="ddhc:~CopyPasteManagerEx.getInstanceEx():com.intellij.ide.CopyPasteManagerEx" resolve="getInstanceEx" />
-              <ref role="1Pybhc" to="ddhc:~CopyPasteManagerEx" resolve="CopyPasteManagerEx" />
-            </node>
-            <node concept="liA8E" id="2lR2lzqyTqf" role="2OqNvi">
-              <ref role="37wK5l" to="ddhc:~CopyPasteManagerEx.setContents(java.awt.datatransfer.Transferable):void" resolve="setContents" />
-              <node concept="37vLTw" id="2lR2lzqyTIS" role="37wK5m">
-                <ref role="3cqZAo" node="3EnpNH2zGje" resolve="contents" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3EnpNH2zGjt" role="3cqZAp">
-          <node concept="3cpWsn" id="3EnpNH2zGju" role="3cpWs9">
-            <property role="TrG5h" value="dialog" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="5G2W3aWBq0Q" role="1tU5fm">
-              <ref role="3uigEE" to="tprs:3EnpNH2zGjG" resolve="AnalyzeStacktraceDialog" />
-            </node>
-            <node concept="2ShNRf" id="3EnpNH2zGjw" role="33vP2m">
-              <node concept="1pGfFk" id="3EnpNH2zGjx" role="2ShVmc">
-                <ref role="37wK5l" to="tprs:3EnpNH2zGjR" resolve="AnalyzeStacktraceDialog" />
-                <node concept="37vLTw" id="5G2W3aWBqvO" role="37wK5m">
-                  <ref role="3cqZAo" node="5G2W3aWAQ0x" resolve="project" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3EnpNH2zGjC" role="3cqZAp">
-          <node concept="2OqwBi" id="3EnpNH2zGjD" role="3clFbG">
-            <node concept="37vLTw" id="3GM_nagTsDu" role="2Oq$k0">
-              <ref role="3cqZAo" node="3EnpNH2zGju" resolve="dialog" />
-            </node>
-            <node concept="liA8E" id="3EnpNH2zGjF" role="2OqNvi">
-              <ref role="37wK5l" to="jkm4:~DialogWrapper.show():void" resolve="show" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5G2W3aWAQ0x" role="3clF46">
-        <property role="TrG5h" value="project" />
-        <node concept="3uibUv" id="5G2W3aWBbyv" role="1tU5fm">
-          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="5G2W3aWAQ0z" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="5G2W3aWAQ0$" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="canExecute" />
-      <ref role="13i0hy" to="zyb2:2QdC0h7dh1h" resolve="canExecute" />
-      <node concept="3Tm1VV" id="5G2W3aWAQ0_" role="1B3o_S" />
-      <node concept="3clFbS" id="5G2W3aWAQ0C" role="3clF47">
-        <node concept="3clFbF" id="5G2W3aWBbyL" role="3cqZAp">
-          <node concept="3y3z36" id="5G2W3aWBfIR" role="3clFbG">
-            <node concept="10Nm6u" id="5G2W3aWBfLw" role="3uHU7w" />
-            <node concept="2OqwBi" id="5G2W3aWBbIF" role="3uHU7B">
-              <node concept="13iPFW" id="5G2W3aWBbyI" role="2Oq$k0" />
-              <node concept="3TrcHB" id="5G2W3aWBe3o" role="2OqNvi">
-                <ref role="3TsBF5" to="3xdn:5G2W3aWBbyD" resolve="stackTrace" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="5G2W3aWAQ0D" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="3J6h25QXCBO">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="13h7C2" to="3xdn:7mV0m3L$trF" resolve="UsagesExpression" />
     <node concept="13i0hz" id="3J6h25QXOd7" role="13h7CS">
       <property role="2Ki8OM" value="true" />
@@ -439,7 +185,7 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getHelpPage" />
-      <ref role="13i0hy" to="zyb2:64VftqEen2L" resolve="getHelpPage" />
+      <ref role="13i0hy" node="64VftqEen2L" resolve="getHelpPage" />
       <node concept="3Tm1VV" id="1fzYukMh_ax" role="1B3o_S" />
       <node concept="3clFbS" id="1fzYukMh_b8" role="3clF47">
         <node concept="3cpWs6" id="1fzYukMfugt" role="3cqZAp">
@@ -447,7 +193,7 @@
             <node concept="2OqwBi" id="1fzYukMfulT" role="3uHU7B">
               <node concept="13iAh5" id="1fzYukMfuh4" role="2Oq$k0" />
               <node concept="2qgKlT" id="1fzYukMfuDd" role="2OqNvi">
-                <ref role="37wK5l" to="zyb2:64VftqEen2L" resolve="getHelpPage" />
+                <ref role="37wK5l" node="64VftqEen2L" resolve="getHelpPage" />
               </node>
             </node>
             <node concept="Xl_RD" id="1fzYukMfoqu" role="3uHU7w">
@@ -463,7 +209,7 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getDisplayString" />
-      <ref role="13i0hy" to="zyb2:5YxQmqOFZEf" resolve="getDisplayString" />
+      <ref role="13i0hy" node="5YxQmqOFZEf" resolve="getDisplayString" />
       <node concept="3Tm1VV" id="25MaZwhhmBO" role="1B3o_S" />
       <node concept="3clFbS" id="25MaZwhhmCc" role="3clF47">
         <node concept="3clFbF" id="25MaZwhhmCh" role="3cqZAp">
@@ -474,7 +220,7 @@
             <node concept="2OqwBi" id="25MaZwhhmCe" role="3uHU7B">
               <node concept="13iAh5" id="25MaZwhhmCf" role="2Oq$k0" />
               <node concept="2qgKlT" id="25MaZwhhmCg" role="2OqNvi">
-                <ref role="37wK5l" to="zyb2:5YxQmqOFZEf" resolve="getDisplayString" />
+                <ref role="37wK5l" node="5YxQmqOFZEf" resolve="getDisplayString" />
               </node>
             </node>
           </node>
@@ -487,7 +233,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="3J6h25QXEXM">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="13h7C2" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
     <node concept="13i0hz" id="3J6h25QXCDW" role="13h7CS">
       <property role="2Ki8OM" value="true" />
@@ -521,7 +267,7 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getHelpPage" />
-      <ref role="13i0hy" to="zyb2:64VftqEen2L" resolve="getHelpPage" />
+      <ref role="13i0hy" node="64VftqEen2L" resolve="getHelpPage" />
       <node concept="3Tm1VV" id="1fzYukMfwCu" role="1B3o_S" />
       <node concept="3clFbS" id="1fzYukMfwCz" role="3clF47">
         <node concept="3cpWs8" id="1fzYukMfy3y" role="3cqZAp">
@@ -614,7 +360,7 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getDisplayString" />
-      <ref role="13i0hy" to="zyb2:5YxQmqOFZEf" resolve="getDisplayString" />
+      <ref role="13i0hy" node="5YxQmqOFZEf" resolve="getDisplayString" />
       <node concept="3Tm1VV" id="5YxQmqOFrIX" role="1B3o_S" />
       <node concept="3clFbS" id="5YxQmqOFrJn" role="3clF47">
         <node concept="3cpWs8" id="5YxQmqOFz5t" role="3cqZAp">
@@ -623,10 +369,10 @@
             <node concept="17QB3L" id="5YxQmqOFz5s" role="1tU5fm" />
             <node concept="2OqwBi" id="5YxQmqOFz5v" role="33vP2m">
               <node concept="2qgKlT" id="5YxQmqOFz5w" role="2OqNvi">
-                <ref role="37wK5l" to="zyb2:64VftqEenfn" resolve="getShortDisplayString" />
+                <ref role="37wK5l" node="64VftqEenfn" resolve="getShortDisplayString" />
               </node>
               <node concept="13iAh5" id="5YxQmqOFz5x" role="2Oq$k0">
-                <ref role="3eA5LN" to="3xdn:64VftqErqMg" resolve="ConsoleExpression" />
+                <ref role="3eA5LN" to="3xdn:64VftqErqMg" resolve="ExpressionHelpProvider" />
               </node>
             </node>
           </node>
@@ -671,7 +417,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="3J6h25QXEYw">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="13h7C2" to="3xdn:2sF4xi8qX2e" resolve="NodesExpression" />
     <node concept="13hLZK" id="3J6h25QXEYx" role="13h7CW">
       <node concept="3clFbS" id="3J6h25QXEYy" role="2VODD2" />
@@ -708,7 +454,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="3J6h25QXHz5">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="13h7C2" to="3xdn:5X1VVpPN29y" resolve="ModulesExpression" />
     <node concept="13i0hz" id="3J6h25QXHzP" role="13h7CS">
       <property role="2Ki8OM" value="true" />
@@ -745,7 +491,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="3J6h25QXJct">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="13h7C2" to="3xdn:5X1VVpPJEGH" resolve="ModelsExpression" />
     <node concept="13i0hz" id="3J6h25QXJdd" role="13h7CS">
       <property role="2Ki8OM" value="true" />
@@ -782,7 +528,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="3J6h25QXKQk">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="13h7C2" to="3xdn:6H$fNdLyE4d" resolve="InstancesExpression" />
     <node concept="13i0hz" id="3J6h25QXKR4" role="13h7CS">
       <property role="2Ki8OM" value="true" />
@@ -819,7 +565,7 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getHelpPage" />
-      <ref role="13i0hy" to="zyb2:64VftqEen2L" resolve="getHelpPage" />
+      <ref role="13i0hy" node="64VftqEen2L" resolve="getHelpPage" />
       <node concept="3Tm1VV" id="1fzYukMh_nt" role="1B3o_S" />
       <node concept="3clFbS" id="1fzYukMh_nu" role="3clF47">
         <node concept="3cpWs6" id="1fzYukMh_nv" role="3cqZAp">
@@ -827,7 +573,7 @@
             <node concept="2OqwBi" id="1fzYukMh_nx" role="3uHU7B">
               <node concept="13iAh5" id="1fzYukMh_ny" role="2Oq$k0" />
               <node concept="2qgKlT" id="1fzYukMh_nz" role="2OqNvi">
-                <ref role="37wK5l" to="zyb2:64VftqEen2L" resolve="getHelpPage" />
+                <ref role="37wK5l" node="64VftqEen2L" resolve="getHelpPage" />
               </node>
             </node>
             <node concept="Xl_RD" id="1fzYukMh_n$" role="3uHU7w">
@@ -843,7 +589,7 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getDisplayString" />
-      <ref role="13i0hy" to="zyb2:5YxQmqOFZEf" resolve="getDisplayString" />
+      <ref role="13i0hy" node="5YxQmqOFZEf" resolve="getDisplayString" />
       <node concept="3Tm1VV" id="25MaZwhhw20" role="1B3o_S" />
       <node concept="3clFbS" id="25MaZwhhw2o" role="3clF47">
         <node concept="3clFbF" id="25MaZwhhw2t" role="3cqZAp">
@@ -854,7 +600,7 @@
             <node concept="2OqwBi" id="25MaZwhhw2q" role="3uHU7B">
               <node concept="13iAh5" id="25MaZwhhw2r" role="2Oq$k0" />
               <node concept="2qgKlT" id="25MaZwhhw2s" role="2OqNvi">
-                <ref role="37wK5l" to="zyb2:5YxQmqOFZEf" resolve="getDisplayString" />
+                <ref role="37wK5l" node="5YxQmqOFZEf" resolve="getDisplayString" />
               </node>
             </node>
           </node>
@@ -867,7 +613,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="3J6h25QXMz2">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="13h7C2" to="3xdn:5uXC5_72l2X" resolve="ReferencesExpression" />
     <node concept="13i0hz" id="3J6h25QXMzM" role="13h7CS">
       <property role="2Ki8OM" value="true" />
@@ -903,192 +649,204 @@
       <node concept="3clFbS" id="3J6h25QXMz4" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="6kp4dbAb8Gj">
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="13h7C2" to="3xdn:DM6_$iqV$8" resolve="ProjectExpression" />
-    <node concept="13hLZK" id="6kp4dbAb8Gk" role="13h7CW">
-      <node concept="3clFbS" id="6kp4dbAb8Gl" role="2VODD2" />
+  <node concept="13h7C7" id="64VftqErqME">
+    <property role="3GE5qa" value="help" />
+    <ref role="13h7C2" to="3xdn:64VftqErqMg" resolve="ExpressionHelpProvider" />
+    <node concept="13hLZK" id="64VftqErqMF" role="13h7CW">
+      <node concept="3clFbS" id="64VftqErqMG" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="6kp4dbAb8H4" role="13h7CS">
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getSupportedParameters" />
-      <property role="13i0it" value="false" />
+    <node concept="13i0hz" id="64VftqErqMP" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <ref role="13i0hy" node="3J6h25QXCDW" resolve="getSupportedParameters" />
-      <node concept="3Tm1VV" id="6kp4dbAb8H5" role="1B3o_S" />
-      <node concept="3clFbS" id="6kp4dbAb8H9" role="3clF47">
-        <node concept="3clFbF" id="3E_u19H2d$m" role="3cqZAp">
-          <node concept="10Nm6u" id="3E_u19H2d$l" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="A3Dl8" id="6kp4dbAb8Ha" role="3clF45">
-        <node concept="3THzug" id="6kp4dbAb8Hb" role="A3Ik2">
-          <ref role="3qa414" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="13h7C7" id="3E_u19H2QLn">
-    <property role="3GE5qa" value="expression" />
-    <ref role="13h7C2" to="3xdn:7mV0m3L$tuv" resolve="ShowExpression" />
-    <node concept="13i0hz" id="3E_u19H2QLq" role="13h7CS">
+      <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="legalAsStatement" />
-      <ref role="13i0hy" to="tpek:1653mnvAgqK" resolve="legalAsStatement" />
-      <node concept="3clFbS" id="3E_u19H2QLt" role="3clF47">
-        <node concept="3clFbF" id="3E_u19H2QLB" role="3cqZAp">
-          <node concept="3clFbT" id="3E_u19H2QLA" role="3clFbG">
-            <property role="3clFbU" value="true" />
+      <property role="TrG5h" value="getKind" />
+      <ref role="13i0hy" node="64VftqEenf4" resolve="getKind" />
+      <node concept="3Tm1VV" id="64VftqErqMQ" role="1B3o_S" />
+      <node concept="3clFbS" id="64VftqErqMT" role="3clF47">
+        <node concept="3clFbF" id="64VftqErqN0" role="3cqZAp">
+          <node concept="Xl_RD" id="64VftqErqMZ" role="3clFbG">
+            <property role="Xl_RC" value="expression" />
           </node>
         </node>
       </node>
-      <node concept="10P_77" id="3E_u19H2QLy" role="3clF45" />
-      <node concept="3Tm1VV" id="3E_u19H2QLz" role="1B3o_S" />
+      <node concept="17QB3L" id="64VftqErqMU" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="59iQg8ryQMU">
+    <property role="3GE5qa" value="help" />
+    <ref role="13h7C2" to="3xdn:59iQg8ryQK3" resolve="OperationHelpProvider" />
+    <node concept="13hLZK" id="59iQg8ryQMV" role="13h7CW">
+      <node concept="3clFbS" id="59iQg8ryQMW" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="64VftqErvLH" role="13h7CS">
+    <node concept="13i0hz" id="59iQg8ryZpf" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getShortHelp" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
-      <node concept="3Tm1VV" id="64VftqErvLI" role="1B3o_S" />
-      <node concept="3clFbS" id="64VftqErvLL" role="3clF47">
-        <node concept="3clFbF" id="64VftqErxUy" role="3cqZAp">
-          <node concept="Xl_RD" id="64VftqErxUx" role="3clFbG">
-            <property role="Xl_RC" value="show sequence of nodes/references/models/modules in the Usages View panel" />
+      <property role="TrG5h" value="getKind" />
+      <ref role="13i0hy" node="64VftqEenf4" resolve="getKind" />
+      <node concept="3Tm1VV" id="59iQg8ryZpg" role="1B3o_S" />
+      <node concept="3clFbS" id="59iQg8ryZpj" role="3clF47">
+        <node concept="3clFbF" id="59iQg8ryZpq" role="3cqZAp">
+          <node concept="Xl_RD" id="59iQg8ryZpp" role="3clFbG">
+            <property role="Xl_RC" value="operation" />
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="64VftqErvLM" role="3clF45" />
-    </node>
-    <node concept="13hLZK" id="3E_u19H2QLo" role="13h7CW">
-      <node concept="3clFbS" id="3E_u19H2QLp" role="2VODD2" />
+      <node concept="17QB3L" id="59iQg8ryZpk" role="3clF45" />
     </node>
   </node>
-  <node concept="13h7C7" id="3E_u19H2SYz">
-    <property role="3GE5qa" value="expression.print" />
-    <ref role="13h7C2" to="3xdn:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-    <node concept="13i0hz" id="3E_u19H2SYA" role="13h7CS">
+  <node concept="13h7C7" id="qgIopNa9H8">
+    <property role="3GE5qa" value="help" />
+    <ref role="13h7C2" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
+    <node concept="13i0hz" id="qgIopNa9Hb" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="getShortHelp" />
       <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="legalAsStatement" />
-      <ref role="13i0hy" to="tpek:1653mnvAgqK" resolve="legalAsStatement" />
-      <node concept="3clFbS" id="3E_u19H2SYD" role="3clF47">
-        <node concept="3clFbF" id="3E_u19H2SYN" role="3cqZAp">
-          <node concept="3clFbT" id="3E_u19H2SYM" role="3clFbG">
-            <property role="3clFbU" value="true" />
+      <node concept="3Tm1VV" id="qgIopNa9Hc" role="1B3o_S" />
+      <node concept="17QB3L" id="qgIopNa9Hj" role="3clF45" />
+      <node concept="3clFbS" id="qgIopNa9He" role="3clF47">
+        <node concept="3cpWs6" id="1fzYukMge_6" role="3cqZAp">
+          <node concept="2OqwBi" id="1fzYukMgf0t" role="3cqZAk">
+            <node concept="2OqwBi" id="1fzYukMgeD5" role="2Oq$k0">
+              <node concept="13iPFW" id="1fzYukMge_s" role="2Oq$k0" />
+              <node concept="FGMqu" id="1fzYukMgePn" role="2OqNvi" />
+            </node>
+            <node concept="3TrcHB" id="1fzYukMgfvf" role="2OqNvi">
+              <ref role="3TsBF5" to="tpce:40UcGlRaVSw" resolve="conceptShortDescription" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="10P_77" id="3E_u19H2SYI" role="3clF45" />
-      <node concept="3Tm1VV" id="3E_u19H2SYJ" role="1B3o_S" />
     </node>
-    <node concept="13hLZK" id="3E_u19H2SY$" role="13h7CW">
-      <node concept="3clFbS" id="3E_u19H2SY_" role="2VODD2" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="64VftqEr$5E">
-    <property role="3GE5qa" value="expression.print" />
-    <ref role="13h7C2" to="3xdn:6_TW7xVaDdR" resolve="PrintExpression" />
-    <node concept="13hLZK" id="64VftqEr$5F" role="13h7CW">
-      <node concept="3clFbS" id="64VftqEr$5G" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="64VftqEr$5H" role="13h7CS">
+    <node concept="13i0hz" id="64VftqEen2L" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getShortHelp" />
+      <property role="13i0it" value="true" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
-      <node concept="3Tm1VV" id="64VftqEr$5I" role="1B3o_S" />
-      <node concept="3clFbS" id="64VftqEr$5L" role="3clF47">
-        <node concept="3clFbF" id="64VftqErBiU" role="3cqZAp">
-          <node concept="Xl_RD" id="64VftqErBiT" role="3clFbG">
-            <property role="Xl_RC" value="print into the console window" />
-          </node>
+      <property role="TrG5h" value="getHelpPage" />
+      <node concept="3Tm1VV" id="64VftqEen5c" role="1B3o_S" />
+      <node concept="17QB3L" id="64VftqEenf1" role="3clF45" />
+      <node concept="3clFbS" id="64VftqEen5e" role="3clF47">
+        <node concept="3clFbF" id="64VftqEenMI" role="3cqZAp">
+          <node concept="10Nm6u" id="64VftqEenMH" role="3clFbG" />
         </node>
       </node>
-      <node concept="17QB3L" id="64VftqEr$5M" role="3clF45" />
     </node>
-  </node>
-  <node concept="13h7C7" id="64VftqEeoGE">
-    <ref role="13h7C2" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
-    <node concept="13hLZK" id="64VftqEeoGF" role="13h7CW">
-      <node concept="3clFbS" id="64VftqEeoGG" role="2VODD2" />
+    <node concept="13i0hz" id="64VftqEenf4" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="2Ki8OM" value="true" />
+      <property role="TrG5h" value="getKind" />
+      <node concept="3Tm1VV" id="64VftqEenf5" role="1B3o_S" />
+      <node concept="17QB3L" id="64VftqEenfk" role="3clF45" />
+      <node concept="3clFbS" id="64VftqEenf7" role="3clF47" />
     </node>
-    <node concept="13i0hz" id="64VftqEeoGH" role="13h7CS">
+    <node concept="13i0hz" id="60B$833p9Uj" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getShortHelp" />
+      <property role="13i0it" value="true" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
-      <node concept="3Tm1VV" id="64VftqEeoGI" role="1B3o_S" />
-      <node concept="3clFbS" id="64VftqEeoGL" role="3clF47">
-        <node concept="3clFbF" id="64VftqEeoGS" role="3cqZAp">
-          <node concept="Xl_RD" id="64VftqEeoGR" role="3clFbG">
-            <property role="Xl_RC" value="evaluate an expression and print its result" />
+      <property role="TrG5h" value="getGroup" />
+      <node concept="3Tm1VV" id="60B$833p9Uk" role="1B3o_S" />
+      <node concept="17QB3L" id="60B$833pa0v" role="3clF45" />
+      <node concept="3clFbS" id="60B$833p9Um" role="3clF47">
+        <node concept="3cpWs6" id="60B$833paGI" role="3cqZAp">
+          <node concept="2OqwBi" id="60B$833ppp_" role="3cqZAk">
+            <node concept="2OqwBi" id="60B$833po1N" role="2Oq$k0">
+              <node concept="2JrnkZ" id="60B$833pnWY" role="2Oq$k0">
+                <node concept="2OqwBi" id="60B$833pjEc" role="2JrQYb">
+                  <node concept="2OqwBi" id="60B$833ph6$" role="2Oq$k0">
+                    <node concept="13iPFW" id="60B$833ph1c" role="2Oq$k0" />
+                    <node concept="FGMqu" id="60B$833pjl2" role="2OqNvi" />
+                  </node>
+                  <node concept="I4A8Y" id="60B$833pkue" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="liA8E" id="60B$833pozH" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getModule():org.jetbrains.mps.openapi.module.SModule" resolve="getModule" />
+              </node>
+            </node>
+            <node concept="liA8E" id="60B$833ppXQ" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~SModule.getModuleName():java.lang.String" resolve="getModuleName" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="64VftqEeoGM" role="3clF45" />
     </node>
-    <node concept="13i0hz" id="64VftqEepAv" role="13h7CS">
+    <node concept="13i0hz" id="64VftqEenfn" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="true" />
       <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getDisplayString" />
-      <ref role="13i0hy" to="zyb2:64VftqEenfn" resolve="getShortDisplayString" />
-      <node concept="3clFbS" id="64VftqEepAy" role="3clF47">
-        <node concept="3clFbF" id="64VftqEepAM" role="3cqZAp">
-          <node concept="Xl_RD" id="64VftqEepAL" role="3clFbG">
-            <property role="Xl_RC" value="&lt;expression&gt;" />
+      <property role="TrG5h" value="getShortDisplayString" />
+      <node concept="3Tm1VV" id="64VftqEenfo" role="1B3o_S" />
+      <node concept="17QB3L" id="64VftqEenfF" role="3clF45" />
+      <node concept="3clFbS" id="64VftqEenfq" role="3clF47">
+        <node concept="3cpWs8" id="60B$833bre_" role="3cqZAp">
+          <node concept="3cpWsn" id="60B$833breC" role="3cpWs9">
+            <property role="TrG5h" value="alias" />
+            <node concept="17QB3L" id="60B$833brez" role="1tU5fm" />
+            <node concept="2OqwBi" id="64VftqE$Cmc" role="33vP2m">
+              <node concept="2OqwBi" id="60B$833pf1e" role="2Oq$k0">
+                <node concept="13iPFW" id="60B$833peTq" role="2Oq$k0" />
+                <node concept="FGMqu" id="60B$833pfiy" role="2OqNvi" />
+              </node>
+              <node concept="3TrcHB" id="64VftqE$Efu" role="2OqNvi">
+                <ref role="3TsBF5" to="tpce:4qF2Hm2r7ja" resolve="conceptAlias" />
+              </node>
+            </node>
           </node>
         </node>
-      </node>
-      <node concept="17QB3L" id="64VftqEepAH" role="3clF45" />
-      <node concept="3Tm1VV" id="64VftqEepAI" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="64VftqErqME">
-    <property role="3GE5qa" value="expression" />
-    <ref role="13h7C2" to="3xdn:64VftqErqMg" resolve="ConsoleExpression" />
-    <node concept="13hLZK" id="64VftqErqMF" role="13h7CW">
-      <node concept="3clFbS" id="64VftqErqMG" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="64VftqErqMP" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getKind" />
-      <ref role="13i0hy" to="zyb2:64VftqEenf4" resolve="getKind" />
-      <node concept="3Tm1VV" id="64VftqErqMQ" role="1B3o_S" />
-      <node concept="3clFbS" id="64VftqErqMT" role="3clF47">
-        <node concept="3clFbF" id="64VftqErqN0" role="3cqZAp">
-          <node concept="Xl_RD" id="64VftqErqMZ" role="3clFbG">
-            <property role="Xl_RC" value="expression" />
+        <node concept="3clFbJ" id="60B$833brus" role="3cqZAp">
+          <node concept="3clFbS" id="60B$833bruv" role="3clFbx">
+            <node concept="3cpWs6" id="60B$833bum9" role="3cqZAp">
+              <node concept="37vLTw" id="60B$833buoy" role="3cqZAk">
+                <ref role="3cqZAo" node="60B$833breC" resolve="alias" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="60B$833brO1" role="3clFbw">
+            <node concept="37vLTw" id="60B$833brwr" role="2Oq$k0">
+              <ref role="3cqZAo" node="60B$833breC" resolve="alias" />
+            </node>
+            <node concept="17RvpY" id="60B$833bulK" role="2OqNvi" />
+          </node>
+          <node concept="9aQIb" id="60B$833buqS" role="9aQIa">
+            <node concept="3clFbS" id="60B$833buqT" role="9aQI4">
+              <node concept="3cpWs6" id="60B$833butg" role="3cqZAp">
+                <node concept="2OqwBi" id="60B$833bwqJ" role="3cqZAk">
+                  <node concept="2OqwBi" id="60B$833bvOA" role="2Oq$k0">
+                    <node concept="13iPFW" id="60B$833bvGY" role="2Oq$k0" />
+                    <node concept="FGMqu" id="60B$833bw48" role="2OqNvi" />
+                  </node>
+                  <node concept="3TrcHB" id="60B$833by7R" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="64VftqErqMU" role="3clF45" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="59iQg8ryQMU">
-    <property role="3GE5qa" value="expression" />
-    <ref role="13h7C2" to="3xdn:59iQg8ryQK3" resolve="ConsoleOperation" />
-    <node concept="13hLZK" id="59iQg8ryQMV" role="13h7CW">
-      <node concept="3clFbS" id="59iQg8ryQMW" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="59iQg8ryZpf" role="13h7CS">
+    <node concept="13i0hz" id="5YxQmqOFZEf" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
+      <property role="13i0it" value="true" />
       <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getKind" />
-      <ref role="13i0hy" to="zyb2:64VftqEenf4" resolve="getKind" />
-      <node concept="3Tm1VV" id="59iQg8ryZpg" role="1B3o_S" />
-      <node concept="3clFbS" id="59iQg8ryZpj" role="3clF47">
-        <node concept="3clFbF" id="59iQg8ryZpq" role="3cqZAp">
-          <node concept="Xl_RD" id="59iQg8ryZpp" role="3clFbG">
-            <property role="Xl_RC" value="operation" />
+      <property role="TrG5h" value="getDisplayString" />
+      <node concept="3Tm1VV" id="5YxQmqOFZEg" role="1B3o_S" />
+      <node concept="17QB3L" id="5YxQmqOFZEh" role="3clF45" />
+      <node concept="3clFbS" id="5YxQmqOFZEi" role="3clF47">
+        <node concept="3cpWs6" id="5YxQmqOG04_" role="3cqZAp">
+          <node concept="2OqwBi" id="2U2$P9VS2Kf" role="3cqZAk">
+            <node concept="13iPFW" id="2U2$P9VS2G4" role="2Oq$k0" />
+            <node concept="2qgKlT" id="2U2$P9VS2WO" role="2OqNvi">
+              <ref role="37wK5l" node="64VftqEenfn" resolve="getShortDisplayString" />
+            </node>
           </node>
         </node>
       </node>
-      <node concept="17QB3L" id="59iQg8ryZpk" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="qgIopNa9H9" role="13h7CW">
+      <node concept="3clFbS" id="qgIopNa9Ha" role="2VODD2" />
     </node>
   </node>
 </model>
diff --git a/plugins/console/lang/blCommand/languageModels/constraints.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps
similarity index 96%
rename from plugins/console/lang/blCommand/languageModels/constraints.mps
rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps
index 5066812f33d2..71c0d33fe653 100644
--- a/plugins/console/lang/blCommand/languageModels/constraints.mps
+++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)">
+<model ref="r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)">
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
-    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
+    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -80,7 +80,7 @@
         <reference id="1140138128738" name="concept" index="1PxNhF" />
         <child id="1140138123956" name="leftExpression" index="1PxMeX" />
       </concept>
-      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3THzug">
+      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug">
         <reference id="1180481110358" name="conceptDeclaraton" index="3qa414" />
       </concept>
     </language>
@@ -97,7 +97,7 @@
     </language>
   </registry>
   <node concept="1M2fIO" id="30Cvt28Y34P">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="1M2myG" to="3xdn:6H$fNdLyE4d" resolve="InstancesExpression" />
     <node concept="Um2eU" id="30Cvt28Y35m" role="1kkKnR">
       <node concept="3clFbS" id="30Cvt28Y35n" role="2VODD2">
@@ -117,7 +117,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="30Cvt28Y6EN">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="1M2myG" to="3xdn:7mV0m3L$trF" resolve="UsagesExpression" />
     <node concept="Um2eU" id="30Cvt28Y6EO" role="1kkKnR">
       <node concept="3clFbS" id="30Cvt28Y6EP" role="2VODD2">
@@ -137,7 +137,7 @@
     </node>
   </node>
   <node concept="1M2fIO" id="5YxQmqOA_1t">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <ref role="1M2myG" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
     <node concept="nKS2y" id="5YxQmqOA_1u" role="1MLUbF">
       <node concept="3clFbS" id="5YxQmqOA_1v" role="2VODD2">
diff --git a/plugins/console/lang/blCommand/languageModels/editor.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps
similarity index 78%
rename from plugins/console/lang/blCommand/languageModels/editor.mps
rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps
index d92e016cab22..9026b96d05f8 100644
--- a/plugins/console/lang/blCommand/languageModels/editor.mps
+++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)">
+<model ref="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)">
   <persistence version="9" />
   <languages>
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
@@ -7,14 +7,11 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
-    <import index="4l22" ref="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)" />
     <import index="tp2u" ref="r:00000000-0000-4000-0000-011c8959032a(jetbrains.mps.baseLanguage.collections.editor)" />
-    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)" />
-    <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)" />
     <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
   </imports>
@@ -34,8 +31,6 @@
       </concept>
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
-      <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
-      <concept id="1237308012275" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineStyleClassItem" flags="ln" index="ljvvj" />
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
@@ -68,10 +63,6 @@
       <concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
         <reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
       </concept>
-      <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
-        <property id="1186403713874" name="color" index="Vb096" />
-      </concept>
-      <concept id="1186404574412" name="jetbrains.mps.lang.editor.structure.BackgroundColorStyleClassItem" flags="ln" index="Veino" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
         <child id="1223387335081" name="query" index="3n$kyP" />
@@ -216,21 +207,14 @@
       <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="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="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
         <reference id="1139877738879" name="concept" index="1A0vxQ" />
       </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1143511969223" name="jetbrains.mps.lang.smodel.structure.Node_GetPrevSiblingOperation" flags="nn" index="YBYNd" />
       <concept id="1143512015885" name="jetbrains.mps.lang.smodel.structure.Node_GetNextSiblingOperation" flags="nn" index="YCak7" />
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
@@ -241,9 +225,6 @@
       <concept id="1172326502327" name="jetbrains.mps.lang.smodel.structure.Concept_IsExactlyOperation" flags="nn" index="3O6GUB">
         <child id="1206733650006" name="conceptArgument" index="3QVz_e" />
       </concept>
-      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
-        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
-      </concept>
       <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
@@ -271,77 +252,12 @@
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
-  <node concept="24kQdi" id="4Jke6BA4gx1">
-    <ref role="1XX52x" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-    <node concept="1QoScp" id="5RBjc7g8YOu" role="2wV5jI">
-      <property role="1QpmdY" value="true" />
-      <node concept="pkWqt" id="5RBjc7g8YOv" role="3e4ffs">
-        <node concept="3clFbS" id="5RBjc7g8YOw" role="2VODD2">
-          <node concept="3clFbF" id="5RBjc7g8Zf3" role="3cqZAp">
-            <node concept="3clFbC" id="5RBjc7g9p6A" role="3clFbG">
-              <node concept="2OqwBi" id="5RBjc7g9p6D" role="3uHU7B">
-                <node concept="pncrf" id="5RBjc7g9p6E" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="5RBjc7g9p6F" role="2OqNvi">
-                  <node concept="1xMEDy" id="5RBjc7g9p6G" role="1xVPHs">
-                    <node concept="chp4Y" id="5RBjc7g9p6H" role="ri$Ld">
-                      <ref role="cht4Q" to="eynw:E3nMz1EwaY" resolve="History" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="10Nm6u" id="5RBjc7g9p6C" role="3uHU7w" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3F1sOY" id="5RBjc7g8Z8u" role="1QoVPY">
-        <ref role="1NtTu8" to="3xdn:1yfzJNJreD_" />
-      </node>
-      <node concept="3EZMnI" id="5RBjc7g8YNa" role="1QoS34">
-        <node concept="3F0ifn" id="5RBjc7g8YNl" role="3EZMnx">
-          <property role="3F0ifm" value="{" />
-          <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
-          <node concept="ljvvj" id="5RBjc7g8YNs" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3F1sOY" id="5RBjc7g8YN$" role="3EZMnx">
-          <ref role="1NtTu8" to="3xdn:1yfzJNJreD_" />
-          <node concept="lj46D" id="5RBjc7g8YNC" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="ljvvj" id="5RBjc7g8YOh" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="5RBjc7g8YOa" role="3EZMnx">
-          <property role="3F0ifm" value="}" />
-          <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-        </node>
-        <node concept="l2Vlx" id="5RBjc7g8YNd" role="2iSdaV" />
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="YwfKjlWn7V">
-    <property role="3GE5qa" value="expression" />
-    <ref role="1XX52x" to="3xdn:7mV0m3L$tuv" resolve="ShowExpression" />
-    <node concept="3EZMnI" id="YwfKjlWo_n" role="2wV5jI">
-      <node concept="PMmxH" id="YwfKjlWo_l" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F1sOY" id="YwfKjlWo_w" role="3EZMnx">
-        <ref role="1NtTu8" to="3xdn:6_TW7xVwuxP" />
-      </node>
-      <node concept="l2Vlx" id="3J6h25QyTg8" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="6H$fNdLg_8M">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="1XX52x" to="3xdn:7mV0m3L$trF" resolve="UsagesExpression" />
     <node concept="3EZMnI" id="6H$fNdLgGvx" role="2wV5jI">
       <node concept="PMmxH" id="3J6h25Qh$80" role="3EZMnx">
@@ -361,43 +277,8 @@
       <node concept="l2Vlx" id="3J6h25Qhypd" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="6M9lfhDDWh5">
-    <property role="3GE5qa" value="expression.print" />
-    <ref role="1XX52x" to="3xdn:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-    <node concept="3EZMnI" id="7gnNafF7Ztz" role="2wV5jI">
-      <node concept="PMmxH" id="7gnNafF7ZtD" role="3EZMnx">
-        <ref role="1ERwB7" node="6D0CP__cz92" resolve="AbstractPrintExpression_Actions" />
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <node concept="OXEIz" id="6kp4dbAhdvj" role="P5bDN">
-          <node concept="UkePV" id="6kp4dbAhdy$" role="OY2wv">
-            <ref role="Ul1FP" to="3xdn:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F1sOY" id="7gnNafF7ZtI" role="3EZMnx">
-        <ref role="1NtTu8" to="3xdn:7gnNafF7Ztx" />
-      </node>
-      <node concept="l2Vlx" id="3J6h25Qz6bJ" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="5G2W3aWCXqw">
-    <property role="3GE5qa" value="response" />
-    <ref role="1XX52x" to="3xdn:5G2W3aW$Vsk" resolve="ExceptionHolder" />
-    <node concept="3EZMnI" id="5G2W3aWD0CO" role="2wV5jI">
-      <node concept="3F0ifn" id="5G2W3aWD0CV" role="3EZMnx">
-        <property role="3F0ifm" value="Exception:" />
-      </node>
-      <node concept="PMmxH" id="5G2W3aWD11C" role="3EZMnx">
-        <ref role="PMmxG" to="4l22:5G2W3aWCZ08" resolve="ClickableEditorComponent" />
-      </node>
-      <node concept="2iRfu4" id="5G2W3aWD0CR" role="2iSdaV" />
-      <node concept="Veino" id="5G2W3aWDrTB" role="3F10Kt">
-        <property role="Vb096" value="pink" />
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="3J6h25Q6Dvx">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <ref role="1XX52x" to="3xdn:3J6h25Q6eOJ" resolve="QueryParameterScope" />
     <node concept="3EZMnI" id="3J6h25Q6Dw$" role="2wV5jI">
       <node concept="l2Vlx" id="3J6h25Q6Dw_" role="2iSdaV" />
@@ -423,7 +304,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="3J6h25Qa5Pj">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <ref role="1XX52x" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
     <node concept="PMmxH" id="6kp4dbAr3XM" role="2wV5jI">
       <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
@@ -455,7 +336,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="3J6h25QeHPz">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <ref role="1XX52x" to="3xdn:3J6h25QeHPb" resolve="ScopeParameter" />
     <node concept="1QoScp" id="1N$kF6pZlFc" role="2wV5jI">
       <property role="1QpmdY" value="true" />
@@ -488,7 +369,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="6H$fNdLyE65">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <ref role="1XX52x" to="3xdn:6H$fNdLyE4d" resolve="InstancesExpression" />
     <node concept="3EZMnI" id="3J6h25QZKvq" role="2wV5jI">
       <node concept="PMmxH" id="3J6h25QZKvr" role="3EZMnx">
@@ -509,7 +390,7 @@
     </node>
   </node>
   <node concept="PKFIW" id="3J6h25Qh1DR">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="QueryExpression_EditorComponent" />
     <ref role="1XX52x" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
     <node concept="3EZMnI" id="3J6h25Q6Zvb" role="2wV5jI">
@@ -682,7 +563,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="3J6h25Q5HSh">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <ref role="1XX52x" to="3xdn:3J6h25Q5HRT" resolve="QueryParameterList" />
     <node concept="3F2HdR" id="3J6h25QCBQN" role="2wV5jI">
       <property role="2czwfO" value="," />
@@ -691,162 +572,8 @@
       <node concept="l2Vlx" id="3J6h25QCBQO" role="2czzBx" />
     </node>
   </node>
-  <node concept="1h_SRR" id="6D0CP__cz92">
-    <property role="3GE5qa" value="expression.print" />
-    <property role="TrG5h" value="AbstractPrintExpression_Actions" />
-    <ref role="1h_SK9" to="3xdn:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-    <node concept="1hA7zw" id="6D0CP__czcO" role="1h_SK8">
-      <property role="1hAc7j" value="delete_action_id" />
-      <node concept="1hAIg9" id="6D0CP__czcP" role="1hA7z_">
-        <node concept="3clFbS" id="6D0CP__czcQ" role="2VODD2">
-          <node concept="3clFbF" id="6D0CP__cTUX" role="3cqZAp">
-            <node concept="2OqwBi" id="6D0CP__cU1f" role="3clFbG">
-              <node concept="0IXxy" id="6D0CP__cTUW" role="2Oq$k0" />
-              <node concept="1P9Npp" id="6D0CP__cVAK" role="2OqNvi">
-                <node concept="2OqwBi" id="6D0CP__cVJQ" role="1P9ThW">
-                  <node concept="0IXxy" id="6D0CP__cVD$" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="6D0CP__cXm7" role="2OqNvi">
-                    <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="6D0CP__oERm">
-    <ref role="1XX52x" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
-    <node concept="3F1sOY" id="6_TW7xUYPpQ" role="2wV5jI">
-      <ref role="1NtTu8" to="3xdn:6D0CP__oaD2" />
-      <ref role="1ERwB7" node="PtBTHLWHzE" resolve="BLExpression_Actions" />
-    </node>
-  </node>
-  <node concept="1h_SRR" id="PtBTHLWHzE">
-    <property role="TrG5h" value="BLExpression_Actions" />
-    <ref role="1h_SK9" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
-    <node concept="1hA7zw" id="PtBTHLWI1q" role="1h_SK8">
-      <property role="1hAc7j" value="insert_action_id" />
-      <node concept="1hAIg9" id="PtBTHLWI1r" role="1hA7z_">
-        <node concept="3clFbS" id="PtBTHLWI1s" role="2VODD2">
-          <node concept="3cpWs8" id="PtBTHLWMQm" role="3cqZAp">
-            <node concept="3cpWsn" id="PtBTHLWMQp" role="3cpWs9">
-              <property role="TrG5h" value="blCommand" />
-              <node concept="3Tqbb2" id="PtBTHLWMQl" role="1tU5fm">
-                <ref role="ehGHo" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-              </node>
-              <node concept="2ShNRf" id="PtBTHLWMTP" role="33vP2m">
-                <node concept="3zrR0B" id="PtBTHLWMTN" role="2ShVmc">
-                  <node concept="3Tqbb2" id="PtBTHLWMTO" role="3zrR0E">
-                    <ref role="ehGHo" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="PtBTHLY7pU" role="3cqZAp">
-            <node concept="37vLTI" id="PtBTHLYmZ3" role="3clFbG">
-              <node concept="2ShNRf" id="PtBTHLYn51" role="37vLTx">
-                <node concept="3zrR0B" id="PtBTHLYn3W" role="2ShVmc">
-                  <node concept="3Tqbb2" id="PtBTHLYn3X" role="3zrR0E">
-                    <ref role="ehGHo" to="tpee:fzclF80" resolve="StatementList" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="PtBTHLY7zD" role="37vLTJ">
-                <node concept="37vLTw" id="PtBTHLY7pT" role="2Oq$k0">
-                  <ref role="3cqZAo" node="PtBTHLWMQp" resolve="blCommand" />
-                </node>
-                <node concept="3TrEf2" id="PtBTHLYfnQ" role="2OqNvi">
-                  <ref role="3Tt5mk" to="3xdn:1yfzJNJreD_" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="PtBTHLYnaO" role="3cqZAp">
-            <node concept="2OqwBi" id="PtBTHLYYR7" role="3clFbG">
-              <node concept="2OqwBi" id="PtBTHLYrFU" role="2Oq$k0">
-                <node concept="2OqwBi" id="PtBTHLYnkF" role="2Oq$k0">
-                  <node concept="37vLTw" id="PtBTHLYnaN" role="2Oq$k0">
-                    <ref role="3cqZAo" node="PtBTHLWMQp" resolve="blCommand" />
-                  </node>
-                  <node concept="3TrEf2" id="PtBTHLYq4X" role="2OqNvi">
-                    <ref role="3Tt5mk" to="3xdn:1yfzJNJreD_" />
-                  </node>
-                </node>
-                <node concept="3Tsc0h" id="PtBTHLYvQh" role="2OqNvi">
-                  <ref role="3TtcxE" to="tpee:fzcqZ_x" />
-                </node>
-              </node>
-              <node concept="WFELt" id="PtBTHLZgBk" role="2OqNvi">
-                <ref role="1A0vxQ" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="PtBTHLZgEJ" role="3cqZAp">
-            <node concept="37vLTI" id="PtBTHM0aSD" role="3clFbG">
-              <node concept="2OqwBi" id="PtBTHM0bmf" role="37vLTx">
-                <node concept="0IXxy" id="PtBTHM0beh" role="2Oq$k0" />
-                <node concept="3TrEf2" id="PtBTHM0dM$" role="2OqNvi">
-                  <ref role="3Tt5mk" to="3xdn:6D0CP__oaD2" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="PtBTHM05NP" role="37vLTJ">
-                <node concept="1PxgMI" id="PtBTHM04lS" role="2Oq$k0">
-                  <ref role="1PxNhF" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-                  <node concept="2OqwBi" id="PtBTHLZrLS" role="1PxMeX">
-                    <node concept="2OqwBi" id="PtBTHLZjMW" role="2Oq$k0">
-                      <node concept="2OqwBi" id="PtBTHLZgOI" role="2Oq$k0">
-                        <node concept="37vLTw" id="PtBTHLZgEI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="PtBTHLWMQp" resolve="blCommand" />
-                        </node>
-                        <node concept="3TrEf2" id="PtBTHLZid2" role="2OqNvi">
-                          <ref role="3Tt5mk" to="3xdn:1yfzJNJreD_" />
-                        </node>
-                      </node>
-                      <node concept="3Tsc0h" id="PtBTHLZnXj" role="2OqNvi">
-                        <ref role="3TtcxE" to="tpee:fzcqZ_x" />
-                      </node>
-                    </node>
-                    <node concept="1uHKPH" id="PtBTHLZGIL" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3TrEf2" id="PtBTHM08jj" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:fzclF8k" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="PtBTHLWMUs" role="3cqZAp">
-            <node concept="2OqwBi" id="PtBTHLWN2D" role="3clFbG">
-              <node concept="0IXxy" id="PtBTHLWMUq" role="2Oq$k0" />
-              <node concept="1P9Npp" id="PtBTHLX4PU" role="2OqNvi">
-                <node concept="37vLTw" id="PtBTHLX4Rk" role="1P9ThW">
-                  <ref role="3cqZAo" node="PtBTHLWMQp" resolve="blCommand" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1hA7zw" id="5YxQmqOF2S5" role="1h_SK8">
-      <property role="1hAc7j" value="backspace_action_id" />
-      <node concept="1hAIg9" id="5YxQmqOF2S6" role="1hA7z_">
-        <node concept="3clFbS" id="5YxQmqOF2S7" role="2VODD2">
-          <node concept="3clFbF" id="5YxQmqOF2UV" role="3cqZAp">
-            <node concept="2OqwBi" id="5YxQmqOF2Xs" role="3clFbG">
-              <node concept="0IXxy" id="5YxQmqOF2UU" role="2Oq$k0" />
-              <node concept="1PgB_6" id="5YxQmqOF3dx" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="31Tct3TxpkB">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <ref role="1XX52x" to="3xdn:31Tct3Txnn9" resolve="CustomScope" />
     <node concept="3F1sOY" id="31Tct3Txpmx" role="2wV5jI">
       <ref role="1NtTu8" to="3xdn:31Tct3Txpke" />
@@ -854,7 +581,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="31Tct3Tk$xC">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <ref role="1XX52x" to="3xdn:31Tct3Tk$xe" resolve="ModelScope" />
     <node concept="3EZMnI" id="31Tct3TvHU9" role="2wV5jI">
       <node concept="l2Vlx" id="31Tct3TvHUa" role="2iSdaV" />
@@ -890,7 +617,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="31Tct3TiJu1">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <ref role="1XX52x" to="3xdn:2oWvAovDHkX" resolve="ModulesScope" />
     <node concept="3EZMnI" id="31Tct3TohN2" role="2wV5jI">
       <node concept="l2Vlx" id="31Tct3TohN3" role="2iSdaV" />
@@ -926,7 +653,7 @@
     </node>
   </node>
   <node concept="1h_SRR" id="3_Z1D7Uv0CK">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="QueryParameter_Actions" />
     <ref role="1h_SK9" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
     <node concept="1hA7zw" id="3_Z1D7Uv3OH" role="1h_SK8">
@@ -1080,7 +807,7 @@
     </node>
   </node>
   <node concept="1h_SRR" id="qdYczXcLw1">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="QueryParameterScopeValue_Actions" />
     <ref role="1h_SK9" to="3xdn:3J6h25Q6eOJ" resolve="QueryParameterScope" />
     <node concept="1hA7zw" id="qdYczXcLw2" role="1h_SK8">
@@ -1130,7 +857,7 @@
           <node concept="3cpWs8" id="3_Z1D7UzvIK" role="3cqZAp">
             <node concept="3cpWsn" id="3_Z1D7UzvIL" role="3cpWs9">
               <property role="TrG5h" value="action" />
-              <node concept="3uibUv" id="3_Z1D7UzvIC" role="1tU5fm">
+              <node concept="3uibUv" id="2mWP9pMxdBJ" role="1tU5fm">
                 <ref role="3uigEE" to="f4zo:~CellAction" resolve="CellAction" />
               </node>
               <node concept="2OqwBi" id="3_Z1D7UzvIM" role="33vP2m">
@@ -1200,7 +927,7 @@
     </node>
   </node>
   <node concept="1h_SRR" id="1N$kF6q0sBF">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="CustomScope_Actions" />
     <ref role="1h_SK9" to="3xdn:31Tct3Txnn9" resolve="CustomScope" />
     <node concept="1hA7zw" id="1N$kF6q0sIh" role="1h_SK8">
@@ -1220,8 +947,8 @@
     </node>
   </node>
   <node concept="24kQdi" id="3F2FyKbNNqA">
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="1XX52x" to="3xdn:3F2FyKbNNqb" resolve="ScopeProvider" />
+    <property role="3GE5qa" value="" />
+    <ref role="1XX52x" to="3xdn:3F2FyKbNNqb" resolve="WithStatement" />
     <node concept="b$f91" id="3F2FyKbNNqC" role="2wV5jI">
       <node concept="3F1sOY" id="3F2FyKbNNr8" role="b$wch">
         <ref role="1NtTu8" to="3xdn:3F2FyKbNNqc" />
diff --git a/plugins/console/lang/blCommand/languageModels/structure.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps
similarity index 57%
rename from plugins/console/lang/blCommand/languageModels/structure.mps
rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps
index bb5d6035c753..47daa2911367 100644
--- a/plugins/console/lang/blCommand/languageModels/structure.mps
+++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)">
+<model ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)">
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
   </languages>
   <imports>
-    <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -18,7 +17,6 @@
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
-        <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
       <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ">
         <child id="1169127546356" name="extends" index="PrDN$" />
@@ -30,9 +28,6 @@
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
         <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
-      <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
-        <reference id="1082985295845" name="dataType" index="AX2Wp" />
-      </concept>
       <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
         <property id="1071599776563" name="role" index="20kJfa" />
         <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
@@ -49,33 +44,8 @@
       </concept>
     </language>
   </registry>
-  <node concept="1TIwiD" id="4Jke6BA4ffD">
-    <property role="TrG5h" value="BLCommand" />
-    <property role="R4oN_" value="baseLanguage statements" />
-    <property role="34LRSv" value="{" />
-    <ref role="1TJDcQ" to="eynw:1yfzJNJq9LL" resolve="GeneratedCommand" />
-    <node concept="1TJgyj" id="1yfzJNJreD_" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="body" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
-    </node>
-    <node concept="PrWs8" id="2lR2lzqth0Q" role="PzmwI">
-      <ref role="PrY4T" to="tpee:i2fhoOR" resolve="IMethodLike" />
-    </node>
-    <node concept="PrWs8" id="2lR2lzquo81" role="PzmwI">
-      <ref role="PrY4T" to="tpee:htgVS9_" resolve="IStatementListContainer" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="5WpmwkrQrRs">
-    <property role="3GE5qa" value="expression.print" />
-    <property role="TrG5h" value="PrintNodeReferenceExpression" />
-    <property role="34LRSv" value="#printNodeRef" />
-    <property role="R4oN_" value="print reference to the node" />
-    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-  </node>
   <node concept="1TIwiD" id="7mV0m3L$trF">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="UsagesExpression" />
     <property role="34LRSv" value="#usages" />
     <property role="R4oN_" value="direct references to a node in scope" />
@@ -87,24 +57,8 @@
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7mV0m3L$tuv">
-    <property role="3GE5qa" value="expression" />
-    <property role="TrG5h" value="ShowExpression" />
-    <property role="34LRSv" value="#show" />
-    <property role="R4oN_" value="show in usage view" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="PrWs8" id="64VftqErvIP" role="PzmwI">
-      <ref role="PrY4T" node="64VftqErqMg" resolve="ConsoleExpression" />
-    </node>
-    <node concept="1TJgyj" id="6_TW7xVwuxP" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="object" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="6H$fNdLyE4d">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="InstancesExpression" />
     <property role="34LRSv" value="#instances" />
     <property role="R4oN_" value="instances of a concept in scope" />
@@ -116,88 +70,42 @@
       <ref role="20lvS9" to="tp25:hzMxujR" resolve="IRefConceptArg" />
     </node>
   </node>
-  <node concept="1TIwiD" id="DM6_$iqV$8">
-    <property role="TrG5h" value="ProjectExpression" />
-    <property role="34LRSv" value="#project" />
-    <property role="3GE5qa" value="expression.query" />
-    <property role="R4oN_" value="the current project" />
-    <ref role="1TJDcQ" node="3J6h25Q2UNX" resolve="QueryExpression" />
-  </node>
-  <node concept="1TIwiD" id="7gnNafF7YMD">
-    <property role="3GE5qa" value="expression.print" />
-    <property role="TrG5h" value="PrintTextExpression" />
-    <property role="34LRSv" value="#printText" />
-    <property role="R4oN_" value="print as string" />
-    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-  </node>
-  <node concept="1TIwiD" id="4LU9FcrO3Hp">
-    <property role="3GE5qa" value="expression.print" />
-    <property role="TrG5h" value="PrintNodeExpression" />
-    <property role="34LRSv" value="#printNode" />
-    <property role="R4oN_" value="print node copy" />
-    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-  </node>
-  <node concept="1TIwiD" id="6M9lfhDDWgw">
-    <property role="3GE5qa" value="expression.print" />
-    <property role="TrG5h" value="AbstractPrintExpression" />
-    <property role="R5$K7" value="true" />
-    <property role="R5$K2" value="false" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="1TJgyj" id="7gnNafF7Ztx" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="object" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="2sF4xi8qX2e">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="NodesExpression" />
     <property role="34LRSv" value="#nodes" />
     <property role="R4oN_" value="all nodes in scope" />
     <ref role="1TJDcQ" node="3J6h25Q2UNX" resolve="QueryExpression" />
   </node>
   <node concept="1TIwiD" id="5uXC5_72l2X">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="ReferencesExpression" />
     <property role="34LRSv" value="#references" />
     <property role="R4oN_" value="all references in scope" />
     <ref role="1TJDcQ" node="3J6h25Q2UNX" resolve="QueryExpression" />
   </node>
   <node concept="1TIwiD" id="5X1VVpPJEGH">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="ModelsExpression" />
     <property role="34LRSv" value="#models" />
     <property role="R4oN_" value="all models in scope" />
     <ref role="1TJDcQ" node="3J6h25Q2UNX" resolve="QueryExpression" />
   </node>
   <node concept="1TIwiD" id="5X1VVpPN29y">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="ModulesExpression" />
     <property role="34LRSv" value="#modules" />
     <property role="R4oN_" value="all modules in scope" />
     <ref role="1TJDcQ" node="3J6h25Q2UNX" resolve="QueryExpression" />
   </node>
-  <node concept="1TIwiD" id="5G2W3aW$Vsk">
-    <property role="3GE5qa" value="response" />
-    <property role="TrG5h" value="ExceptionHolder" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyi" id="5G2W3aWBbyD" role="1TKVEl">
-      <property role="TrG5h" value="stackTrace" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
-    </node>
-    <node concept="PrWs8" id="3ob4OZ0kHtj" role="PzmwI">
-      <ref role="PrY4T" to="eynw:22lVekVIvmK" resolve="IClickable" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="3J6h25Q2UNX">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="QueryExpression" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="PrWs8" id="64VftqErCnv" role="PzmwI">
-      <ref role="PrY4T" node="64VftqErqMg" resolve="ConsoleExpression" />
+      <ref role="PrY4T" node="64VftqErqMg" resolve="ExpressionHelpProvider" />
     </node>
     <node concept="1TJgyj" id="3J6h25Q5Il8" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -207,14 +115,14 @@
     </node>
   </node>
   <node concept="1TIwiD" id="3J6h25Q2URP">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="QueryParameter" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="3J6h25Q5HRT">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="QueryParameterList" />
     <property role="34LRSv" value="&lt; .. &gt;" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
@@ -226,14 +134,14 @@
     </node>
   </node>
   <node concept="1TIwiD" id="3J6h25Q6eM6">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="QueryParameterIncludeReadOnly" />
     <property role="34LRSv" value="r/o+" />
     <property role="R4oN_" value="include read only" />
     <ref role="1TJDcQ" node="3J6h25Q2URP" resolve="QueryParameter" />
   </node>
   <node concept="1TIwiD" id="3J6h25Q6eOJ">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="QueryParameterScope" />
     <property role="34LRSv" value="scope" />
     <property role="R4oN_" value="used search scope" />
@@ -246,57 +154,20 @@
     </node>
   </node>
   <node concept="1TIwiD" id="3J6h25QeHP2">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="GlobalScope" />
     <property role="34LRSv" value="global" />
     <ref role="1TJDcQ" node="3J6h25QeHPb" resolve="ScopeParameter" />
   </node>
   <node concept="1TIwiD" id="3J6h25QeHPb">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="ScopeParameter" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
-  <node concept="1TIwiD" id="3J6h25QeHQy">
-    <property role="3GE5qa" value="expression.query.parameter" />
-    <property role="TrG5h" value="ProjectScope" />
-    <property role="34LRSv" value="project" />
-    <ref role="1TJDcQ" node="3J6h25QeHPb" resolve="ScopeParameter" />
-  </node>
-  <node concept="1TIwiD" id="6D0CP__oaBp">
-    <property role="TrG5h" value="BLExpression" />
-    <property role="R4oN_" value="baseLanguage expression" />
-    <ref role="1TJDcQ" to="eynw:1yfzJNJq9LL" resolve="GeneratedCommand" />
-    <node concept="1TJgyj" id="6D0CP__oaD2" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="PrWs8" id="6D0CP__qHGT" role="PzmwI">
-      <ref role="PrY4T" to="tpck:hLJPP0O" resolve="IWrapper" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="6_TW7xVaDdR">
-    <property role="3GE5qa" value="expression.print" />
-    <property role="TrG5h" value="PrintExpression" />
-    <property role="34LRSv" value="#print" />
-    <property role="R4oN_" value="smart print depending on content" />
-    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-    <node concept="PrWs8" id="64VftqEsbD$" role="PzmwI">
-      <ref role="PrY4T" node="64VftqErqMg" resolve="ConsoleExpression" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="6_TW7xVvrpf">
-    <property role="3GE5qa" value="expression.print" />
-    <property role="TrG5h" value="PrintSequenceExpression" />
-    <property role="34LRSv" value="#printSequence" />
-    <property role="R4oN_" value="print size with link to usages view" />
-    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-  </node>
   <node concept="1TIwiD" id="2oWvAovDHkX">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="ModulesScope" />
     <property role="34LRSv" value="modules" />
     <ref role="1TJDcQ" node="3J6h25QeHPb" resolve="ScopeParameter" />
@@ -308,7 +179,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="31Tct3Tk$xe">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="ModelScope" />
     <property role="34LRSv" value="models" />
     <ref role="1TJDcQ" node="3J6h25QeHPb" resolve="ScopeParameter" />
@@ -320,7 +191,7 @@
     </node>
   </node>
   <node concept="1TIwiD" id="31Tct3Txnn9">
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <property role="TrG5h" value="CustomScope" />
     <property role="34LRSv" value="custom" />
     <property role="R4oN_" value="? extends SearchScope" />
@@ -333,21 +204,25 @@
     </node>
   </node>
   <node concept="PlHQZ" id="64VftqErqMg">
-    <property role="3GE5qa" value="expression" />
-    <property role="TrG5h" value="ConsoleExpression" />
+    <property role="3GE5qa" value="help" />
+    <property role="TrG5h" value="ExpressionHelpProvider" />
     <node concept="PrWs8" id="64VftqErqMh" role="PrDN$">
-      <ref role="PrY4T" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+      <ref role="PrY4T" node="qgIopN3HO7" resolve="HelpProvider" />
     </node>
   </node>
   <node concept="PlHQZ" id="59iQg8ryQK3">
-    <property role="TrG5h" value="ConsoleOperation" />
-    <property role="3GE5qa" value="expression" />
+    <property role="TrG5h" value="OperationHelpProvider" />
+    <property role="3GE5qa" value="help" />
     <node concept="PrWs8" id="59iQg8ryQMx" role="PrDN$">
-      <ref role="PrY4T" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+      <ref role="PrY4T" node="qgIopN3HO7" resolve="HelpProvider" />
     </node>
   </node>
+  <node concept="PlHQZ" id="qgIopN3HO7">
+    <property role="TrG5h" value="HelpProvider" />
+    <property role="3GE5qa" value="help" />
+  </node>
   <node concept="1TIwiD" id="3F2FyKbNNqb">
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="" />
     <property role="TrG5h" value="WithStatement" />
     <property role="34LRSv" value="with" />
     <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
diff --git a/plugins/console/lang/blCommand/languageModels/typesystem.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps
similarity index 78%
rename from plugins/console/lang/blCommand/languageModels/typesystem.mps
rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps
index 03a7d9eec726..48641addd9cf 100644
--- a/plugins/console/lang/blCommand/languageModels/typesystem.mps
+++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)">
+<model ref="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)">
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -62,7 +61,6 @@
       </concept>
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
@@ -146,9 +144,12 @@
       <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="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="8758390115029295477" name="jetbrains.mps.lang.smodel.structure.SReferenceType" flags="in" index="2z4iKi" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
+      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
+        <reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
+      </concept>
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -172,9 +173,6 @@
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
-      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug">
-        <reference id="1180481110358" name="conceptDeclaraton" index="3qa414" />
-      </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">
@@ -220,39 +218,9 @@
       <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
     </language>
   </registry>
-  <node concept="1YbPZF" id="5WpmwkrQrVd">
-    <property role="TrG5h" value="typeof_PrintNodeReferenceExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <node concept="3clFbS" id="5WpmwkrQrZl" role="18ibNy">
-      <node concept="2NvLDW" id="5WpmwkrQseH" role="3cqZAp">
-        <property role="3wDh2S" value="true" />
-        <node concept="mw_s8" id="5WpmwkrQsfA" role="1ZfhKB">
-          <node concept="2c44tf" id="5WpmwkrQsfy" role="mwGJk">
-            <node concept="3Tqbb2" id="5WpmwkrQsh0" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="5WpmwkrQseK" role="1ZfhK$">
-          <node concept="1Z2H0r" id="5WpmwkrQs0E" role="mwGJk">
-            <node concept="2OqwBi" id="4LU9FcrOzNt" role="1Z2MuG">
-              <node concept="1YBJjd" id="5WpmwkrQs56" role="2Oq$k0">
-                <ref role="1YBMHb" node="5WpmwkrQrZn" resolve="printNodeReferenceExpression" />
-              </node>
-              <node concept="3TrEf2" id="6M9lfhDFVhT" role="2OqNvi">
-                <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="5WpmwkrQrZn" role="1YuTPh">
-      <property role="TrG5h" value="printNodeReferenceExpression" />
-      <ref role="1YaFvo" to="3xdn:5WpmwkrQrRs" resolve="PrintNodeReferenceExpression" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="6H$fNdLgSy1">
     <property role="TrG5h" value="typeof_UsagesExpression" />
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <node concept="3clFbS" id="6H$fNdLgSA6" role="18ibNy">
       <node concept="1Z5TYs" id="6H$fNdLgSJF" role="3cqZAp">
         <node concept="mw_s8" id="6H$fNdLgSKI" role="1ZfhKB">
@@ -298,7 +266,7 @@
   </node>
   <node concept="1YbPZF" id="6H$fNdLyEd0">
     <property role="TrG5h" value="typeof_InstancesExpression" />
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <node concept="3clFbS" id="6H$fNdLyEd1" role="18ibNy">
       <node concept="1ZobV4" id="67MRmRzGOFD" role="3cqZAp">
         <property role="3wDh2S" value="false" />
@@ -528,65 +496,9 @@
       <ref role="1YaFvo" to="3xdn:6H$fNdLyE4d" resolve="InstancesExpression" />
     </node>
   </node>
-  <node concept="1YbPZF" id="DM6_$iqVAS">
-    <property role="TrG5h" value="typeof_ProjectExpression" />
-    <property role="3GE5qa" value="expression.query" />
-    <node concept="3clFbS" id="DM6_$iqVEX" role="18ibNy">
-      <node concept="1Z5TYs" id="DM6_$iqXCh" role="3cqZAp">
-        <node concept="mw_s8" id="DM6_$iqXDG" role="1ZfhKB">
-          <node concept="2c44tf" id="DM6_$iqXEj" role="mwGJk">
-            <node concept="3uibUv" id="DM6_$iqXGy" role="2c44tc">
-              <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="DM6_$iqXCk" role="1ZfhK$">
-          <node concept="1Z2H0r" id="DM6_$iqXoj" role="mwGJk">
-            <node concept="1YBJjd" id="DM6_$iqXoG" role="1Z2MuG">
-              <ref role="1YBMHb" node="DM6_$iqVEZ" resolve="projectExpression" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="DM6_$iqVEZ" role="1YuTPh">
-      <property role="TrG5h" value="projectExpression" />
-      <ref role="1YaFvo" to="3xdn:DM6_$iqV$8" resolve="ProjectExpression" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="4LU9FcrO4k2">
-    <property role="TrG5h" value="typeof_PrintNodeExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <node concept="3clFbS" id="4LU9FcrO4k3" role="18ibNy">
-      <node concept="2NvLDW" id="4LU9FcrO4kx" role="3cqZAp">
-        <property role="3wDh2S" value="true" />
-        <node concept="mw_s8" id="4LU9FcrO4ky" role="1ZfhKB">
-          <node concept="2c44tf" id="4LU9FcrO4kz" role="mwGJk">
-            <node concept="3Tqbb2" id="4LU9FcrO4k$" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="4LU9FcrO4k_" role="1ZfhK$">
-          <node concept="1Z2H0r" id="4LU9FcrO4kA" role="mwGJk">
-            <node concept="2OqwBi" id="4LU9FcrOALI" role="1Z2MuG">
-              <node concept="1YBJjd" id="4LU9FcrO4Gq" role="2Oq$k0">
-                <ref role="1YBMHb" node="4LU9FcrO4k5" resolve="printNodeExpression" />
-              </node>
-              <node concept="3TrEf2" id="6M9lfhDFWW6" role="2OqNvi">
-                <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="4LU9FcrO4k5" role="1YuTPh">
-      <property role="TrG5h" value="printNodeExpression" />
-      <ref role="1YaFvo" to="3xdn:4LU9FcrO3Hp" resolve="PrintNodeExpression" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="3Z0MTj6lTFC">
     <property role="TrG5h" value="typeof_NodesExpresiion" />
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <node concept="3clFbS" id="3Z0MTj6lTFD" role="18ibNy">
       <node concept="1Z5TYs" id="5uXC5_7dM2K" role="3cqZAp">
         <node concept="mw_s8" id="5uXC5_7dM2L" role="1ZfhKB">
@@ -612,7 +524,7 @@
   </node>
   <node concept="1YbPZF" id="5uXC5_7di9F">
     <property role="TrG5h" value="typeof_ReferencesExpression" />
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <node concept="3clFbS" id="5uXC5_7di9G" role="18ibNy">
       <node concept="1Z5TYs" id="5uXC5_7eNAP" role="3cqZAp">
         <node concept="mw_s8" id="5uXC5_7eNAQ" role="1ZfhKB">
@@ -638,7 +550,7 @@
   </node>
   <node concept="1YbPZF" id="5X1VVpPJEZQ">
     <property role="TrG5h" value="typeof_ModelsExpression" />
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <node concept="3clFbS" id="5X1VVpPJEZR" role="18ibNy">
       <node concept="1Z5TYs" id="5X1VVpPJF8L" role="3cqZAp">
         <node concept="mw_s8" id="5X1VVpPJFa0" role="1ZfhKB">
@@ -664,7 +576,7 @@
   </node>
   <node concept="1YbPZF" id="5X1VVpPN2al">
     <property role="TrG5h" value="typeof_ModulesExpression" />
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="query" />
     <node concept="3clFbS" id="5X1VVpPN2am" role="18ibNy">
       <node concept="1Z5TYs" id="5X1VVpPN2hw" role="3cqZAp">
         <node concept="mw_s8" id="5X1VVpPNxFt" role="1ZfhKB">
@@ -692,7 +604,7 @@
   </node>
   <node concept="18kY7G" id="3J6h25QQOMZ">
     <property role="TrG5h" value="check_QueryDuplicatedParameters" />
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <node concept="3clFbS" id="3J6h25QQON0" role="18ibNy">
       <node concept="3cpWs8" id="3J6h25QRwwi" role="3cqZAp">
         <node concept="3cpWsn" id="3J6h25QRwwl" role="3cpWs9">
@@ -716,8 +628,8 @@
         <node concept="3cpWsn" id="3J6h25QRmGo" role="3cpWs9">
           <property role="TrG5h" value="parameterConcepts" />
           <node concept="A3Dl8" id="3J6h25QRmGi" role="1tU5fm">
-            <node concept="3THzug" id="3J6h25QRmGS" role="A3Ik2">
-              <ref role="3qa414" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
+            <node concept="3bZ5Sz" id="5wSyoDt1W6P" role="A3Ik2">
+              <ref role="3bZ5Sy" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
             </node>
           </node>
           <node concept="2OqwBi" id="3J6h25QRoCs" role="33vP2m">
@@ -733,7 +645,7 @@
                         <node concept="37vLTw" id="3J6h25QRjAQ" role="2Oq$k0">
                           <ref role="3cqZAo" node="3J6h25QRjrI" resolve="it" />
                         </node>
-                        <node concept="3NT_Vc" id="3J6h25QRm2B" role="2OqNvi" />
+                        <node concept="2yIwOk" id="5wSyoDt1WI6" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
@@ -779,7 +691,7 @@
                                   <node concept="37vLTw" id="3J6h25QTeKf" role="2Oq$k0">
                                     <ref role="3cqZAo" node="3J6h25QTeKk" resolve="p" />
                                   </node>
-                                  <node concept="3NT_Vc" id="3J6h25QTeKg" role="2OqNvi" />
+                                  <node concept="2yIwOk" id="5wSyoDt1ViQ" role="2OqNvi" />
                                 </node>
                                 <node concept="3O6GUB" id="3J6h25QTeKh" role="2OqNvi">
                                   <node concept="25Kdxt" id="3J6h25QTeKi" role="3QVz_e">
@@ -890,201 +802,9 @@
       <ref role="1YaFvo" to="3xdn:3J6h25Q5HRT" resolve="QueryParameterList" />
     </node>
   </node>
-  <node concept="1YbPZF" id="6D0CP__pkYQ">
-    <property role="TrG5h" value="typeof_AbstractPrintExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <node concept="3clFbS" id="6D0CP__pkYR" role="18ibNy">
-      <node concept="1Z5TYs" id="6D0CP__pldU" role="3cqZAp">
-        <node concept="mw_s8" id="6D0CP__pleZ" role="1ZfhKB">
-          <node concept="2c44tf" id="6D0CP__pleV" role="mwGJk">
-            <node concept="3cqZAl" id="6D0CP__plfy" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="6D0CP__pldX" role="1ZfhK$">
-          <node concept="1Z2H0r" id="6D0CP__pl6V" role="mwGJk">
-            <node concept="1YBJjd" id="6D0CP__pl7A" role="1Z2MuG">
-              <ref role="1YBMHb" node="6D0CP__pkYT" resolve="abstractPrintExpression" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="6D0CP__pkYT" role="1YuTPh">
-      <property role="TrG5h" value="abstractPrintExpression" />
-      <ref role="1YaFvo" to="3xdn:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="6_TW7xV9dnY">
-    <property role="TrG5h" value="typeof_ShowExpression" />
-    <property role="3GE5qa" value="expression" />
-    <node concept="3clFbS" id="6_TW7xV9dnZ" role="18ibNy">
-      <node concept="1Z5TYs" id="6_TW7xV9dwz" role="3cqZAp">
-        <node concept="mw_s8" id="6_TW7xV9dxK" role="1ZfhKB">
-          <node concept="2c44tf" id="6_TW7xV9dxG" role="mwGJk">
-            <node concept="3cqZAl" id="6_TW7xV9dyt" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="6_TW7xV9dwA" role="1ZfhK$">
-          <node concept="1Z2H0r" id="6_TW7xV9dpk" role="mwGJk">
-            <node concept="1YBJjd" id="6_TW7xV9dpZ" role="1Z2MuG">
-              <ref role="1YBMHb" node="6_TW7xV9do1" resolve="showExpression" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1ZobV4" id="6_TW7xVwwFu" role="3cqZAp">
-        <property role="3wDh2S" value="true" />
-        <node concept="mw_s8" id="6_TW7xVwwFx" role="1ZfhK$">
-          <node concept="1Z2H0r" id="6_TW7xVwuDy" role="mwGJk">
-            <node concept="2OqwBi" id="6_TW7xVwvF7" role="1Z2MuG">
-              <node concept="1YBJjd" id="6_TW7xVwuEm" role="2Oq$k0">
-                <ref role="1YBMHb" node="6_TW7xV9do1" resolve="showExpression" />
-              </node>
-              <node concept="3TrEf2" id="6_TW7xVwwtZ" role="2OqNvi">
-                <ref role="3Tt5mk" to="3xdn:6_TW7xVwuxP" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="6_TW7xVwwOK" role="1ZfhKB">
-          <node concept="2c44tf" id="6_TW7xVwwOL" role="mwGJk">
-            <node concept="2usRSg" id="6_TW7xVwwOM" role="2c44tc">
-              <node concept="A3Dl8" id="6_TW7xVwwON" role="2usUpS">
-                <node concept="3Tqbb2" id="6_TW7xVwwOO" role="A3Ik2" />
-              </node>
-              <node concept="A3Dl8" id="6_TW7xVwwOP" role="2usUpS">
-                <node concept="2z4iKi" id="6_TW7xVwwOQ" role="A3Ik2" />
-              </node>
-              <node concept="A3Dl8" id="6_TW7xVwwOR" role="2usUpS">
-                <node concept="H_c77" id="6_TW7xVwwOS" role="A3Ik2" />
-              </node>
-              <node concept="A3Dl8" id="6_TW7xVwwOT" role="2usUpS">
-                <node concept="3uibUv" id="6_TW7xVwwOU" role="A3Ik2">
-                  <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="6_TW7xV9do1" role="1YuTPh">
-      <property role="TrG5h" value="showExpression" />
-      <ref role="1YaFvo" to="3xdn:7mV0m3L$tuv" resolve="ShowExpression" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="6_TW7xVaM$f">
-    <property role="TrG5h" value="typeof_PrintExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <node concept="3clFbS" id="6_TW7xVaM$g" role="18ibNy">
-      <node concept="1ZobV4" id="6_TW7xVqlaW" role="3cqZAp">
-        <node concept="mw_s8" id="6_TW7xVqlaY" role="1ZfhK$">
-          <node concept="1Z2H0r" id="6_TW7xVqlaZ" role="mwGJk">
-            <node concept="2OqwBi" id="6_TW7xVqlb0" role="1Z2MuG">
-              <node concept="1YBJjd" id="6_TW7xVqlb1" role="2Oq$k0">
-                <ref role="1YBMHb" node="6_TW7xVaM$i" resolve="printExpression" />
-              </node>
-              <node concept="3TrEf2" id="6_TW7xVqlb2" role="2OqNvi">
-                <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="6_TW7xVqley" role="1ZfhKB">
-          <node concept="2c44tf" id="6_TW7xVqleu" role="mwGJk">
-            <node concept="2usRSg" id="2WuZn$zmq4e" role="2c44tc">
-              <node concept="3uibUv" id="2WuZn$zmq5i" role="2usUpS">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-              <node concept="3cqZAl" id="2WuZn$zmq7t" role="2usUpS" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="6_TW7xVaM$i" role="1YuTPh">
-      <property role="TrG5h" value="printExpression" />
-      <ref role="1YaFvo" to="3xdn:6_TW7xVaDdR" resolve="PrintExpression" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="6_TW7xVaPWK">
-    <property role="TrG5h" value="typeof_PrintTextExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <node concept="3clFbS" id="6_TW7xVaPWL" role="18ibNy">
-      <node concept="1ZobV4" id="6_TW7xVqlkf" role="3cqZAp">
-        <node concept="mw_s8" id="6_TW7xVqlkh" role="1ZfhK$">
-          <node concept="1Z2H0r" id="6_TW7xVqlki" role="mwGJk">
-            <node concept="2OqwBi" id="6_TW7xVqlkj" role="1Z2MuG">
-              <node concept="1YBJjd" id="6_TW7xVqlkk" role="2Oq$k0">
-                <ref role="1YBMHb" node="6_TW7xVaPWN" resolve="printTextExpression" />
-              </node>
-              <node concept="3TrEf2" id="6_TW7xVqlkl" role="2OqNvi">
-                <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="6_TW7xVqlkm" role="1ZfhKB">
-          <node concept="2c44tf" id="6_TW7xVqlnN" role="mwGJk">
-            <node concept="3uibUv" id="6_TW7xVqlnO" role="2c44tc">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="6_TW7xVaPWN" role="1YuTPh">
-      <property role="TrG5h" value="printTextExpression" />
-      <ref role="1YaFvo" to="3xdn:7gnNafF7YMD" resolve="PrintTextExpression" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="6_TW7xVvrr5">
-    <property role="TrG5h" value="typeof_PrintSequenceExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <node concept="3clFbS" id="6_TW7xVvrr6" role="18ibNy">
-      <node concept="1ZobV4" id="3m3GNuUbcC$" role="3cqZAp">
-        <node concept="mw_s8" id="3m3GNuUbcCL" role="1ZfhK$">
-          <node concept="1Z2H0r" id="3m3GNuUbcCM" role="mwGJk">
-            <node concept="2OqwBi" id="3m3GNuUbcCN" role="1Z2MuG">
-              <node concept="1YBJjd" id="3m3GNuUbcCO" role="2Oq$k0">
-                <ref role="1YBMHb" node="6_TW7xVvrr8" resolve="printSequenceExpression" />
-              </node>
-              <node concept="3TrEf2" id="3m3GNuUbcCP" role="2OqNvi">
-                <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="3m3GNuUbcCA" role="1ZfhKB">
-          <node concept="2c44tf" id="3m3GNuUbcCB" role="mwGJk">
-            <node concept="2usRSg" id="3m3GNuUbcCC" role="2c44tc">
-              <node concept="A3Dl8" id="3m3GNuUbcCD" role="2usUpS">
-                <node concept="3Tqbb2" id="3m3GNuUbcCE" role="A3Ik2" />
-              </node>
-              <node concept="A3Dl8" id="3m3GNuUbcCF" role="2usUpS">
-                <node concept="2z4iKi" id="3m3GNuUbcCG" role="A3Ik2" />
-              </node>
-              <node concept="A3Dl8" id="3m3GNuUbcCH" role="2usUpS">
-                <node concept="H_c77" id="3m3GNuUbcCI" role="A3Ik2" />
-              </node>
-              <node concept="A3Dl8" id="3m3GNuUbcCJ" role="2usUpS">
-                <node concept="3uibUv" id="3m3GNuUbcCK" role="A3Ik2">
-                  <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="6_TW7xVvrr8" role="1YuTPh">
-      <property role="TrG5h" value="printSequenceExpression" />
-      <ref role="1YaFvo" to="3xdn:6_TW7xVvrpf" resolve="PrintSequenceExpression" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="31Tct3TjJCE">
     <property role="TrG5h" value="typeof_ModuleScopeLiteral" />
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <node concept="3clFbS" id="31Tct3TjJCF" role="18ibNy">
       <node concept="2Gpval" id="31Tct3TrtuQ" role="3cqZAp">
         <node concept="2GrKxI" id="31Tct3TrtuS" role="2Gsz3X">
@@ -1126,7 +846,7 @@
   </node>
   <node concept="1YbPZF" id="31Tct3Tk$Pz">
     <property role="TrG5h" value="typeof_ModelScopeLiteral" />
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <node concept="3clFbS" id="31Tct3Tk$P$" role="18ibNy">
       <node concept="2Gpval" id="31Tct3TvI4f" role="3cqZAp">
         <node concept="2GrKxI" id="31Tct3TvI4g" role="2Gsz3X">
@@ -1166,7 +886,7 @@
   </node>
   <node concept="1YbPZF" id="31Tct3TxpmU">
     <property role="TrG5h" value="typeof_CustomScope" />
-    <property role="3GE5qa" value="expression.query.parameter" />
+    <property role="3GE5qa" value="query.parameter" />
     <node concept="3clFbS" id="31Tct3TxpmV" role="18ibNy">
       <node concept="1ZobV4" id="31Tct3Txrc7" role="3cqZAp">
         <property role="3wDh2S" value="true" />
@@ -1198,7 +918,7 @@
   </node>
   <node concept="1YbPZF" id="3F2FyKbNNPn">
     <property role="TrG5h" value="typeof_ScopeProvider" />
-    <property role="3GE5qa" value="expression.query" />
+    <property role="3GE5qa" value="" />
     <node concept="3clFbS" id="3F2FyKbNNPo" role="18ibNy">
       <node concept="2NvLDW" id="3F2FyKbNVdL" role="3cqZAp">
         <node concept="mw_s8" id="3F2FyKbNVdO" role="1ZfhK$">
@@ -1241,7 +961,7 @@
     </node>
     <node concept="1YaCAy" id="3F2FyKbNNPq" role="1YuTPh">
       <property role="TrG5h" value="scopeProvider" />
-      <ref role="1YaFvo" to="3xdn:3F2FyKbNNqb" resolve="ScopeProvider" />
+      <ref role="1YaFvo" to="3xdn:3F2FyKbNNqb" resolve="WithStatement" />
     </node>
   </node>
 </model>
diff --git a/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml b/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml
new file mode 100644
index 000000000000..9a50cb347ddb
--- /dev/null
+++ b/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/classes" />
+    <output-test url="file://$MODULE_DIR$/testclasses" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/source_gen" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="project" />
+    <orderEntry type="module" module-name="Closures-runtime" />
+    <orderEntry type="module" module-name="findUsages-runtime" />
+    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="smodel" />
+    <orderEntry type="module" module-name="collections-runtime" />
+    <orderEntry type="module" module-name="kernel" />
+    <orderEntry type="module" module-name="mps-platform" />
+    <orderEntry type="library" name="Annotations" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/dependencies
new file mode 100644
index 000000000000..7ef0b24c2b40
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/dependencies
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependenciesRoot>
+  <dependency className="jetbrains.mps.lang.smodel.query.actions.ActionAspectDescriptorImpl" file="ActionAspectDescriptorImpl.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="java.util.Arrays" />
+    <classNode dependClassName="java.util.Collection" />
+    <classNode dependClassName="java.util.Collections" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.actions.QueryExpression_NodeFactories" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.actions.ScopeParameterLiteral_factories" />
+    <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.NodeFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode extendsClassName="jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.actions.QueriesGenerated" file="QueriesGenerated.java" />
+  <dependency className="jetbrains.mps.lang.smodel.query.actions.QueryExpression_NodeFactories" file="QueryExpression_NodeFactories.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.NodeFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SModel" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.actions.ScopeParameterLiteral_factories" file="ScopeParameterLiteral_factories.java">
+    <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.NodeFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.action.SNodeFactoryOperations" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SModel" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+</dependenciesRoot>
+
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/generated
new file mode 100644
index 000000000000..44b9d10d6e60
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="-bbbi490kj6y3qoff2gur2tnnlm747ng" />
+
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies
new file mode 100644
index 000000000000..b0eb41f5c1a0
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependenciesRoot>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.BehaviorAspectDescriptor" file="BehaviorAspectDescriptor.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="java.util.Arrays" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.CustomScope_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.GlobalScope_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.InstancesExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ModelScope_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ModelsExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ModulesExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ModulesScope_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.NodesExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryParameterIncludeReadOnly_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryParameterList_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryParameterScope_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ReferencesExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.UsagesExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.WithStatement_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.smodel.runtime.BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.CustomScope_BehaviorDescriptor" file="CustomScope_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior" file="ExpressionHelpProvider_Behavior.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor" file="ExpressionHelpProvider_BehaviorDescriptor.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor" />
+    <classNode extendsClassName="java.lang.Cloneable" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.GlobalScope_BehaviorDescriptor" file="GlobalScope_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" file="HelpProvider_Behavior.java">
+    <classNode dependClassName="java.lang.Object" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor" file="HelpProvider_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.InstancesExpression_Behavior" file="InstancesExpression_Behavior.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Object" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="java.util.ArrayList" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.InstancesExpression_BehaviorDescriptor" file="InstancesExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.InstancesExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ModelScope_BehaviorDescriptor" file="ModelScope_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ModelsExpression_Behavior" file="ModelsExpression_Behavior.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.util.ArrayList" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ModelsExpression_BehaviorDescriptor" file="ModelsExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ModelsExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ModulesExpression_Behavior" file="ModulesExpression_Behavior.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.util.ArrayList" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ModulesExpression_BehaviorDescriptor" file="ModulesExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ModulesExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ModulesScope_BehaviorDescriptor" file="ModulesScope_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.NodesExpression_Behavior" file="NodesExpression_Behavior.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.util.ArrayList" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.NodesExpression_BehaviorDescriptor" file="NodesExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.NodesExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_Behavior" file="OperationHelpProvider_Behavior.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_BehaviorDescriptor" file="OperationHelpProvider_BehaviorDescriptor.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor" />
+    <classNode extendsClassName="java.lang.Cloneable" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_Behavior" file="QueryExpression_Behavior.java">
+    <classNode dependClassName="java.lang.Class" />
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Object" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" file="QueryExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_Behavior" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="java.lang.Cloneable" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.QueryParameterIncludeReadOnly_BehaviorDescriptor" file="QueryParameterIncludeReadOnly_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryParameter_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.QueryParameterList_BehaviorDescriptor" file="QueryParameterList_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.QueryParameterScope_BehaviorDescriptor" file="QueryParameterScope_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryParameter_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.QueryParameter_BehaviorDescriptor" file="QueryParameter_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ReferencesExpression_Behavior" file="ReferencesExpression_Behavior.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.util.ArrayList" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ReferencesExpression_BehaviorDescriptor" file="ReferencesExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ReferencesExpression_Behavior" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor" file="ScopeParameter_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.UsagesExpression_Behavior" file="UsagesExpression_Behavior.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Object" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="java.util.ArrayList" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.UsagesExpression_BehaviorDescriptor" file="UsagesExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.UsagesExpression_Behavior" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.lang.smodel.query.behavior.WithStatement_BehaviorDescriptor" file="WithStatement_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Statement_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+</dependenciesRoot>
+
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated
new file mode 100644
index 000000000000..04c3bdc97e6e
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="-7pua3x797dwzkdbo6ytgqp6xl3fxhje" />
+
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/dependencies
similarity index 89%
rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies
rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/dependencies
index bdc9047e1d5e..405b370ff601 100644
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/dependencies
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.constraints.ConstraintsAspectDescriptor" file="ConstraintsAspectDescriptor.java">
-    <classNode dependClassName="jetbrains.mps.console.blCommand.constraints.InstancesExpression_Constraints" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.constraints.QueryParameter_Constraints" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.constraints.UsagesExpression_Constraints" />
+  <dependency className="jetbrains.mps.lang.smodel.query.constraints.ConstraintsAspectDescriptor" file="ConstraintsAspectDescriptor.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.constraints.InstancesExpression_Constraints" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.constraints.QueryParameter_Constraints" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.constraints.UsagesExpression_Constraints" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.ids.SConceptId" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConstraintsDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.constraints.InstancesExpression_Constraints" file="InstancesExpression_Constraints.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.constraints.InstancesExpression_Constraints" file="InstancesExpression_Constraints.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
@@ -22,7 +22,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.constraints.QueryParameter_Constraints" file="QueryParameter_Constraints.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.constraints.QueryParameter_Constraints" file="QueryParameter_Constraints.java">
     <classNode dependClassName="java.lang.Class" />
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.Object" />
@@ -40,7 +40,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.constraints.UsagesExpression_Constraints" file="UsagesExpression_Constraints.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.constraints.UsagesExpression_Constraints" file="UsagesExpression_Constraints.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/generated
new file mode 100644
index 000000000000..e77797fb5113
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="46392qznikeitrog359pzxercj89m6o" />
+
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/dependencies
similarity index 78%
rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/dependencies
rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/dependencies
index 9b03bc099f62..4f11a33f1375 100644
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/dependencies
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/dependencies
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.Language" file="Language.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.Language" file="Language.java">
     <classNode dependClassName="java.lang.Class" />
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.Collection" />
     <classNode dependClassName="java.util.UUID" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.actions.ActionAspectDescriptorImpl" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.BehaviorAspectDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.constraints.ConstraintsAspectDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.EditorAspectDescriptorImpl" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.structure.StructureAspectDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.TypesystemDescriptor" />
     <classNode dependClassName="jetbrains.mps.generator.runtime.TemplateModule" />
     <classNode dependClassName="jetbrains.mps.generator.runtime.TemplateUtil" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.actions.ActionAspectDescriptorImpl" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.BehaviorAspectDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.constraints.ConstraintsAspectDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.EditorAspectDescriptorImpl" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.structure.StructureAspectDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.TypesystemDescriptor" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor" />
     <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor" />
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies
similarity index 67%
rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies
rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies
index 8d0c5807d5ab..7c66d72ba06e 100644
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Actions" file="AbstractPrintExpression_Actions.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.CustomScope_Actions" file="CustomScope_Actions.java">
     <classNode dependClassName="jetbrains.mps.editor.runtime.cells.AbstractCellAction" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
@@ -10,17 +9,13 @@
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Editor" file="AbstractPrintExpression_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.CustomScope_Editor" file="CustomScope_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Actions" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
     <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
-    <classNode dependClassName="jetbrains.mps.lang.editor.generator.internal.AbstractCellMenuPart_ReplaceNode_CustomNodeConcept" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.BasicCellContext" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.CompositeSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.CustomScope_Actions" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
@@ -30,124 +25,29 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.BLCommand_Editor" file="BLCommand_Editor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.cells.BigCellUtil" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleImpl" />
-    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Constant" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.style.Style" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.BLExpression_Actions" file="BLExpression_Actions.java">
-    <classNode dependClassName="jetbrains.mps.editor.runtime.cells.AbstractCellAction" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.BLExpression_Editor" file="BLExpression_Editor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.BLExpression_Actions" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
-    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.CustomScope_Actions" file="CustomScope_Actions.java">
-    <classNode dependClassName="jetbrains.mps.editor.runtime.cells.AbstractCellAction" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.CustomScope_Editor" file="CustomScope_Editor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.CustomScope_Actions" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
-    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.EditorAspectDescriptorImpl" file="EditorAspectDescriptorImpl.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.EditorAspectDescriptorImpl" file="EditorAspectDescriptorImpl.java">
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.Arrays" />
     <classNode dependClassName="java.util.Collection" />
     <classNode dependClassName="java.util.Collections" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.BLCommand_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.BLExpression_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.CustomScope_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.ExceptionHolder_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.InstancesExpression_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.ModelScope_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.ModulesScope_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryExpression_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryParameterList_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryParameterScope_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryParameter_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.ScopeParameter_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.ShowExpression_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.UsagesExpression_Editor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.WithStatement_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.CustomScope_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.InstancesExpression_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.ModelScope_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.ModulesScope_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryExpression_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryParameterList_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryParameterScope_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.ScopeParameter_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.UsagesExpression_Editor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.WithStatement_Editor" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.descriptor.ConceptEditor" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.descriptor.ConceptEditorComponent" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConceptDescriptor" />
     <classNode extendsClassName="jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.ExceptionHolder_Editor" file="ExceptionHolder_Editor.java">
-    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleImpl" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.MPSColors" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Constant" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.style.Style" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.style.StyleRegistry" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.InstancesExpression_Editor" file="InstancesExpression_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.InstancesExpression_Editor" file="InstancesExpression_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet" />
@@ -166,7 +66,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.ModelScope_Editor" file="ModelScope_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.ModelScope_Editor" file="ModelScope_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet" />
@@ -190,7 +90,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.ModulesScope_Editor" file="ModulesScope_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.ModulesScope_Editor" file="ModulesScope_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet" />
@@ -214,7 +114,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryExpression_Actions" file="QueryExpression_Actions.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryExpression_Actions" file="QueryExpression_Actions.java">
     <classNode dependClassName="jetbrains.mps.editor.runtime.cells.AbstractCellAction" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.selection.SelectionUtil" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
@@ -226,7 +126,7 @@
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryExpression_Editor" file="QueryExpression_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryExpression_Editor" file="QueryExpression_Editor.java">
     <classNode dependClassName="jetbrains.mps.editor.runtime.cells.BigCellUtil" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
@@ -235,20 +135,20 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent" file="QueryExpression_EditorComponent.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent" file="QueryExpression_EditorComponent.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.Collection" />
     <classNode dependClassName="java.util.Collections" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.collections.editor.Collections_Style_StyleSheet" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryExpression_Actions" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryExpression_KeyMap" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleImpl" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
     <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
     <classNode dependClassName="jetbrains.mps.lang.editor.generator.internal.AbstractCellMenuPart_ReplaceNode_CustomNodeConcept" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryExpression_Actions" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryExpression_KeyMap" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.BasicCellContext" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.CompositeSubstituteInfo" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
@@ -263,7 +163,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.openapi.editor.descriptor.ConceptEditorComponent" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryExpression_KeyMap" file="QueryExpression_KeyMap.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryExpression_KeyMap" file="QueryExpression_KeyMap.java">
     <classNode dependClassName="java.lang.Class" />
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.Object" />
@@ -283,15 +183,15 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.editor.runtime.cells.KeyMapImpl" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryParameterList_Editor" file="QueryParameterList_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryParameterList_Editor" file="QueryParameterList_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryParameter_Actions" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleImpl" />
     <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.RefNodeListHandler" />
     <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.RefNodeListHandlerElementKeyMap" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Actions" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cellActions.CellAction_DeleteNode" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cellLayout.CellLayout_Indent" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
@@ -307,7 +207,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryParameterScopeValue_Actions" file="QueryParameterScopeValue_Actions.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryParameterScopeValue_Actions" file="QueryParameterScopeValue_Actions.java">
     <classNode dependClassName="jetbrains.mps.editor.runtime.cells.AbstractCellAction" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
@@ -319,17 +219,17 @@
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryParameterScope_Editor" file="QueryParameterScope_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryParameterScope_Editor" file="QueryParameterScope_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryParameterScopeValue_Actions" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.editor.QueryParameter_Actions" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.FocusPolicy" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleImpl" />
     <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryParameterScopeValue_Actions" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Actions" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Constant" />
@@ -342,7 +242,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryParameter_Actions" file="QueryParameter_Actions.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Actions" file="QueryParameter_Actions.java">
     <classNode dependClassName="jetbrains.mps.editor.runtime.cells.AbstractCellAction" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.selection.SelectionUtil" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
@@ -355,7 +255,7 @@
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.QueryParameter_Editor" file="QueryParameter_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Editor" file="QueryParameter_Editor.java">
     <classNode dependClassName="jetbrains.mps.editor.runtime.cells.BigCellUtil" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
@@ -368,7 +268,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.ScopeParameter_Editor" file="ScopeParameter_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.ScopeParameter_Editor" file="ScopeParameter_Editor.java">
     <classNode dependClassName="jetbrains.mps.editor.runtime.cells.BigCellUtil" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
@@ -384,22 +284,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.ShowExpression_Editor" file="ShowExpression_Editor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
-    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
-    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
-    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.UsagesExpression_Editor" file="UsagesExpression_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.UsagesExpression_Editor" file="UsagesExpression_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet" />
@@ -418,7 +303,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.editor.WithStatement_Editor" file="WithStatement_Editor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.editor.WithStatement_Editor" file="WithStatement_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated
new file mode 100644
index 000000000000..4ca32627e140
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="89zw8f3bdv2fafwhz8ux0rwml5mw6g0" />
+
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated
new file mode 100644
index 000000000000..4f32eeeee4be
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="-7vb03q03yu07kp8c66nxg4my04k0c0t" />
+
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/dependencies
similarity index 92%
rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies
rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/dependencies
index 81f68f4a15f3..84b0b4c2fdb2 100644
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/dependencies
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.structure.StructureAspectDescriptor" file="StructureAspectDescriptor.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.structure.StructureAspectDescriptor" file="StructureAspectDescriptor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.Arrays" />
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated
new file mode 100644
index 000000000000..5c0c3598e34f
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="dyjr6916st5p3vl3cht5p5t8hk8pbn6" />
+
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies
similarity index 54%
rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies
rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies
index 647362ccd000..89a9a52e6dee 100644
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies
@@ -1,30 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.TypesystemDescriptor" file="TypesystemDescriptor.java">
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_AbstractPrintExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_CustomScope_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_InstancesExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_ModelScopeLiteral_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_ModelsExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_ModuleScopeLiteral_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_ModulesExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_NodesExpresiion_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_PrintExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_PrintNodeExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_PrintNodeReferenceExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_PrintSequenceExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_PrintTextExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_ProjectExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_ReferencesExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_ScopeProvider_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_ShowExpression_InferenceRule" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.typesystem.typeof_UsagesExpression_InferenceRule" />
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.TypesystemDescriptor" file="TypesystemDescriptor.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_CustomScope_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_InstancesExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModelScopeLiteral_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModelsExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModuleScopeLiteral_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModulesExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_NodesExpresiion_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_ReferencesExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_ScopeProvider_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.typesystem.typeof_UsagesExpression_InferenceRule" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.NonTypesystemRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule" file="check_QueryDuplicatedParameters_NonTypesystemRule.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule" file="check_QueryDuplicatedParameters_NonTypesystemRule.java">
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="jetbrains.mps.errors.IErrorReporter" />
     <classNode dependClassName="jetbrains.mps.errors.messageTargets.MessageTarget" />
@@ -41,23 +33,12 @@
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
     <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractNonTypesystemRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.NonTypesystemRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_AbstractPrintExpression_InferenceRule" file="typeof_AbstractPrintExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_CustomScope_InferenceRule" file="typeof_CustomScope_InferenceRule.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_CustomScope_InferenceRule" file="typeof_CustomScope_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
     <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
@@ -71,7 +52,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_InstancesExpression_InferenceRule" file="typeof_InstancesExpression_InferenceRule.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_InstancesExpression_InferenceRule" file="typeof_InstancesExpression_InferenceRule.java">
     <classNode dependClassName="java.lang.Object" />
     <classNode dependClassName="java.lang.Runnable" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
@@ -88,7 +69,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_ModelScopeLiteral_InferenceRule" file="typeof_ModelScopeLiteral_InferenceRule.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModelScopeLiteral_InferenceRule" file="typeof_ModelScopeLiteral_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
@@ -102,7 +83,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_ModelsExpression_InferenceRule" file="typeof_ModelsExpression_InferenceRule.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModelsExpression_InferenceRule" file="typeof_ModelsExpression_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
     <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
@@ -114,7 +95,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_ModuleScopeLiteral_InferenceRule" file="typeof_ModuleScopeLiteral_InferenceRule.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModuleScopeLiteral_InferenceRule" file="typeof_ModuleScopeLiteral_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
@@ -129,33 +110,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_ModulesExpression_InferenceRule" file="typeof_ModulesExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_NodesExpresiion_InferenceRule" file="typeof_NodesExpresiion_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_PrintExpression_InferenceRule" file="typeof_PrintExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModulesExpression_InferenceRule" file="typeof_ModulesExpression_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
     <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
     <classNode dependClassName="jetbrains.mps.smodel.SReference" />
@@ -168,8 +123,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_PrintNodeExpression_InferenceRule" file="typeof_PrintNodeExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_NodesExpresiion_InferenceRule" file="typeof_NodesExpresiion_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
     <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
@@ -181,8 +135,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_PrintNodeReferenceExpression_InferenceRule" file="typeof_PrintNodeReferenceExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_ReferencesExpression_InferenceRule" file="typeof_ReferencesExpression_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
     <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
@@ -194,74 +147,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_PrintSequenceExpression_InferenceRule" file="typeof_PrintSequenceExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_PrintTextExpression_InferenceRule" file="typeof_PrintTextExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_ProjectExpression_InferenceRule" file="typeof_ProjectExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_ReferencesExpression_InferenceRule" file="typeof_ReferencesExpression_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_ScopeProvider_InferenceRule" file="typeof_ScopeProvider_InferenceRule.java">
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
-    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
-    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_ShowExpression_InferenceRule" file="typeof_ShowExpression_InferenceRule.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_ScopeProvider_InferenceRule" file="typeof_ScopeProvider_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
     <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
@@ -275,7 +161,7 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.typesystem.typeof_UsagesExpression_InferenceRule" file="typeof_UsagesExpression_InferenceRule.java">
+  <dependency className="jetbrains.mps.lang.smodel.query.typesystem.typeof_UsagesExpression_InferenceRule" file="typeof_UsagesExpression_InferenceRule.java">
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
     <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated
new file mode 100644
index 000000000000..b6825fae113c
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="-cqlej1olmuwdpfkhrzbrw1smx5wu04x" />
+
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java
similarity index 76%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java
index 295f6cc6b349..2ac0fd16b92e 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand;
+package jetbrains.mps.lang.smodel.query;
 
 /*Generated by MPS */
 
@@ -10,22 +10,22 @@
 import jetbrains.mps.generator.runtime.TemplateUtil;
 import jetbrains.mps.smodel.runtime.ILanguageAspect;
 import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor;
-import jetbrains.mps.console.blCommand.actions.ActionAspectDescriptorImpl;
+import jetbrains.mps.lang.smodel.query.actions.ActionAspectDescriptorImpl;
 import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor;
 import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor;
 import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor;
-import jetbrains.mps.console.blCommand.editor.EditorAspectDescriptorImpl;
+import jetbrains.mps.lang.smodel.query.editor.EditorAspectDescriptorImpl;
 import jetbrains.mps.smodel.runtime.StructureAspectDescriptor;
 import jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor;
-import jetbrains.mps.console.blCommand.typesystem.TypesystemDescriptor;
+import jetbrains.mps.lang.smodel.query.typesystem.TypesystemDescriptor;
 
 public class Language extends LanguageRuntime {
-  public static String MODULE_REF = "1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)";
+  public static String MODULE_REF = "1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)";
   public Language() {
   }
   @Override
   public String getNamespace() {
-    return "jetbrains.mps.console.blCommand";
+    return "jetbrains.mps.lang.smodel.query";
   }
 
   @Override
@@ -38,11 +38,11 @@ public SLanguageId getId() {
   }
   @Override
   protected String[] getExtendedLanguageIDs() {
-    return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.console.base", "jetbrains.mps.baseLanguage", "jetbrains.mps.baseLanguage.tuples"};
+    return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.baseLanguage.tuples"};
   }
   @Override
   public Collection<TemplateModule> getGenerators() {
-    return TemplateUtil.<TemplateModule>asCollection(TemplateUtil.createInterpretedGenerator(this, "504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)"));
+    return TemplateUtil.<TemplateModule>asCollection(TemplateUtil.createInterpretedGenerator(this, "504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.lang.smodel.query#5336086527852811409)"));
   }
   @Override
   protected <T extends ILanguageAspect> T createAspect(Class<T> aspectClass) {
@@ -50,16 +50,16 @@ protected <T extends ILanguageAspect> T createAspect(Class<T> aspectClass) {
       return (T) new ActionAspectDescriptorImpl();
     }
     if (aspectClass == BehaviorAspectDescriptor.class) {
-      return (T) new jetbrains.mps.console.blCommand.behavior.BehaviorAspectDescriptor();
+      return (T) new jetbrains.mps.lang.smodel.query.behavior.BehaviorAspectDescriptor();
     }
     if (aspectClass == ConstraintsAspectDescriptor.class) {
-      return (T) new jetbrains.mps.console.blCommand.constraints.ConstraintsAspectDescriptor();
+      return (T) new jetbrains.mps.lang.smodel.query.constraints.ConstraintsAspectDescriptor();
     }
     if (aspectClass == EditorAspectDescriptor.class) {
       return (T) new EditorAspectDescriptorImpl();
     }
     if (aspectClass == StructureAspectDescriptor.class) {
-      return (T) new jetbrains.mps.console.blCommand.structure.StructureAspectDescriptor();
+      return (T) new jetbrains.mps.lang.smodel.query.structure.StructureAspectDescriptor();
     }
     if (aspectClass == IHelginsDescriptor.class) {
       return (T) new TypesystemDescriptor();
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ActionAspectDescriptorImpl.java
similarity index 81%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ActionAspectDescriptorImpl.java
index 60fb742e9800..73d9ed141c22 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ActionAspectDescriptorImpl.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.actions;
+package jetbrains.mps.lang.smodel.query.actions;
 
 /*Generated by MPS */
 
@@ -10,25 +10,23 @@
 import java.util.Collections;
 
 public class ActionAspectDescriptorImpl implements ActionAspectDescriptor {
-  private static final String LANGUAGE_FQ_NAME = "jetbrains.mps.console.blCommand";
+  private static final String LANGUAGE_FQ_NAME = "jetbrains.mps.lang.smodel.query";
 
   public Collection<NodeFactory> getFactories(SAbstractConcept concept) {
     if (LANGUAGE_FQ_NAME.equals(concept.getLanguage().getQualifiedName())) {
       switch (Arrays.binarySearch(stringSwitchCases_tpto26_a0a0a0c, concept.getName())) {
         case 0:
-          return Collections.<NodeFactory>singletonList(new printStatement_NodeFactories.NodeFactory_7284872370241013667());
-        case 1:
           return Collections.<NodeFactory>singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759609298945());
-        case 2:
+        case 1:
           return Collections.<NodeFactory>singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759608986170());
-        case 3:
+        case 2:
           return Collections.<NodeFactory>singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759608901705());
-        case 4:
+        case 3:
           return Collections.<NodeFactory>singletonList(new QueryExpression_NodeFactories.NodeFactory_4307205004138627840());
         default:
       }
     }
     return Collections.<NodeFactory>emptyList();
   }
-  private static String[] stringSwitchCases_tpto26_a0a0a0c = new String[]{"AbstractPrintExpression", "CustomScope", "ModelScope", "ModulesScope", "QueryExpression"};
+  private static String[] stringSwitchCases_tpto26_a0a0a0c = new String[]{"CustomScope", "ModelScope", "ModulesScope", "QueryExpression"};
 }
diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueriesGenerated.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueriesGenerated.java
new file mode 100644
index 000000000000..8372dfc1a561
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueriesGenerated.java
@@ -0,0 +1,7 @@
+package jetbrains.mps.lang.smodel.query.actions;
+
+/*Generated by MPS */
+
+
+public class QueriesGenerated {
+}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueryExpression_NodeFactories.java
similarity index 89%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueryExpression_NodeFactories.java
index 4589f1ed3050..9a6b9d59169f 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueryExpression_NodeFactories.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.actions;
+package jetbrains.mps.lang.smodel.query.actions;
 
 /*Generated by MPS */
 
@@ -12,8 +12,8 @@
 public class QueryExpression_NodeFactories {
   public static class NodeFactory_4307205004138627840 implements NodeFactory {
     public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) {
-      if (SNodeOperations.isInstanceOf(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression"))) {
-        SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), SLinkOperations.getTarget(SNodeOperations.cast(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")));
+      if (SNodeOperations.isInstanceOf(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression"))) {
+        SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), SLinkOperations.getTarget(SNodeOperations.cast(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")));
       } else {
         SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), null);
       }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ScopeParameterLiteral_factories.java
similarity index 97%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ScopeParameterLiteral_factories.java
index b93e8351c215..21d023121b68 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ScopeParameterLiteral_factories.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.actions;
+package jetbrains.mps.lang.smodel.query.actions;
 
 /*Generated by MPS */
 
diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/trace.info
new file mode 100644
index 000000000000..a62900a09a36
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/trace.info
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<debug-info>
+  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
+  <root>
+    <file name="ActionAspectDescriptorImpl.java">
+      <unit at="12,0,33,0" name="jetbrains.mps.lang.smodel.query.actions.ActionAspectDescriptorImpl" />
+    </file>
+    <file name="QueriesGenerated.java">
+      <unit at="6,0,8,0" name="jetbrains.mps.lang.smodel.query.actions.QueriesGenerated" />
+    </file>
+  </root>
+  <root nodeRef="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.lang.smodel.query.actions)/3492877759608901704">
+    <file name="ScopeParameterLiteral_factories.java">
+      <node id="3492877759608901836" at="13,91,14,384" concept="1" />
+      <node id="3492877759608986173" at="18,91,19,381" concept="1" />
+      <node id="3492877759609298948" at="23,91,24,374" concept="1" />
+      <node id="3492877759608901705" at="13,0,16,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
+      <node id="3492877759608986170" at="18,0,21,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
+      <node id="3492877759609298945" at="23,0,26,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
+      <scope id="3492877759608901705" at="13,91,14,384" />
+      <scope id="3492877759608986170" at="18,91,19,381" />
+      <scope id="3492877759609298945" at="23,91,24,374" />
+      <scope id="3492877759608901705" at="13,0,16,0">
+        <var name="enclosingNode" id="3492877759608901705" />
+        <var name="model" id="3492877759608901705" />
+        <var name="newNode" id="3492877759608901705" />
+        <var name="sampleNode" id="3492877759608901705" />
+      </scope>
+      <scope id="3492877759608986170" at="18,0,21,0">
+        <var name="enclosingNode" id="3492877759608986170" />
+        <var name="model" id="3492877759608986170" />
+        <var name="newNode" id="3492877759608986170" />
+        <var name="sampleNode" id="3492877759608986170" />
+      </scope>
+      <scope id="3492877759609298945" at="23,0,26,0">
+        <var name="enclosingNode" id="3492877759609298945" />
+        <var name="model" id="3492877759609298945" />
+        <var name="newNode" id="3492877759609298945" />
+        <var name="sampleNode" id="3492877759609298945" />
+      </scope>
+      <unit id="3492877759608901705" at="12,0,17,0" name="jetbrains.mps.lang.smodel.query.actions.ScopeParameterLiteral_factories$NodeFactory_3492877759608901705" />
+      <unit id="3492877759608986170" at="17,0,22,0" name="jetbrains.mps.lang.smodel.query.actions.ScopeParameterLiteral_factories$NodeFactory_3492877759608986170" />
+      <unit id="3492877759609298945" at="22,0,27,0" name="jetbrains.mps.lang.smodel.query.actions.ScopeParameterLiteral_factories$NodeFactory_3492877759609298945" />
+      <unit id="3492877759608901704" at="11,0,28,0" name="jetbrains.mps.lang.smodel.query.actions.ScopeParameterLiteral_factories" />
+    </file>
+  </root>
+  <root nodeRef="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.lang.smodel.query.actions)/4307205004138627839">
+    <file name="QueryExpression_NodeFactories.java">
+      <node id="4307205004139671546" at="15,208,16,531" concept="1" />
+      <node id="4307205004141606430" at="17,14,18,185" concept="1" />
+      <node id="4307205004141606087" at="17,12,19,7" concept="0" />
+      <node id="4307205004138627845" at="14,91,19,7" concept="2" />
+      <node id="4307205004138627840" at="14,0,21,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
+      <scope id="4307205004138627846" at="15,208,16,531" />
+      <scope id="4307205004141606088" at="17,14,18,185" />
+      <scope id="4307205004138627840" at="14,91,19,7" />
+      <scope id="4307205004138627840" at="14,0,21,0">
+        <var name="enclosingNode" id="4307205004138627840" />
+        <var name="model" id="4307205004138627840" />
+        <var name="newNode" id="4307205004138627840" />
+        <var name="sampleNode" id="4307205004138627840" />
+      </scope>
+      <unit id="4307205004138627840" at="13,0,22,0" name="jetbrains.mps.lang.smodel.query.actions.QueryExpression_NodeFactories$NodeFactory_4307205004138627840" />
+      <unit id="4307205004138627839" at="12,0,23,0" name="jetbrains.mps.lang.smodel.query.actions.QueryExpression_NodeFactories" />
+    </file>
+  </root>
+</debug-info>
+
diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java
new file mode 100644
index 000000000000..34eb8a92fb75
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java
@@ -0,0 +1,47 @@
+package jetbrains.mps.lang.smodel.query.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.smodel.runtime.BehaviorDescriptor;
+import java.util.Arrays;
+import jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted;
+
+public class BehaviorAspectDescriptor implements jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor {
+  public BehaviorAspectDescriptor() {
+  }
+  public BehaviorDescriptor getDescriptor(String fqName) {
+    switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) {
+      case 12:
+        return new UsagesExpression_BehaviorDescriptor();
+      case 2:
+        return new InstancesExpression_BehaviorDescriptor();
+      case 7:
+        return new NodesExpression_BehaviorDescriptor();
+      case 11:
+        return new ReferencesExpression_BehaviorDescriptor();
+      case 4:
+        return new ModelsExpression_BehaviorDescriptor();
+      case 5:
+        return new ModulesExpression_BehaviorDescriptor();
+      case 9:
+        return new QueryParameterList_BehaviorDescriptor();
+      case 8:
+        return new QueryParameterIncludeReadOnly_BehaviorDescriptor();
+      case 10:
+        return new QueryParameterScope_BehaviorDescriptor();
+      case 1:
+        return new GlobalScope_BehaviorDescriptor();
+      case 6:
+        return new ModulesScope_BehaviorDescriptor();
+      case 3:
+        return new ModelScope_BehaviorDescriptor();
+      case 0:
+        return new CustomScope_BehaviorDescriptor();
+      case 13:
+        return new WithStatement_BehaviorDescriptor();
+      default:
+        return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName);
+    }
+  }
+  private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"};
+}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/CustomScope_BehaviorDescriptor.java
similarity index 65%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/CustomScope_BehaviorDescriptor.java
index 83bed45b0710..97c662345b6a 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/CustomScope_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public CustomScope_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.CustomScope";
+    return "jetbrains.mps.lang.smodel.query.structure.CustomScope";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_Behavior.java
similarity index 75%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_Behavior.java
index 0e8e5512db9a..faadd8cc65e0 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_Behavior.java
@@ -1,11 +1,11 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
 import org.jetbrains.mps.openapi.model.SNode;
 import org.jetbrains.mps.openapi.language.SAbstractConcept;
 
-public class ConsoleExpression_Behavior {
+public class ExpressionHelpProvider_Behavior {
   public static void init(SNode thisNode) {
   }
   public static String virtual_getKind_7006261637493126084(SAbstractConcept thisConcept) {
diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_BehaviorDescriptor.java
new file mode 100644
index 000000000000..ed72037b0a5f
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_BehaviorDescriptor.java
@@ -0,0 +1,7 @@
+package jetbrains.mps.lang.smodel.query.behavior;
+
+/*Generated by MPS */
+
+
+public interface ExpressionHelpProvider_BehaviorDescriptor extends HelpProvider_BehaviorDescriptor {
+}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/GlobalScope_BehaviorDescriptor.java
similarity index 65%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/GlobalScope_BehaviorDescriptor.java
index 947638a15359..122ad2709468 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/GlobalScope_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public GlobalScope_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.GlobalScope";
+    return "jetbrains.mps.lang.smodel.query.structure.GlobalScope";
   }
 }
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_Behavior.java
similarity index 96%
rename from plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_Behavior.java
index f70daf7da746..84c2acee5ba4 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.base.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -10,7 +10,7 @@
 import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
 import jetbrains.mps.smodel.behaviour.BehaviorReflection;
 
-public class ConsoleHelpProvider_Behavior {
+public class HelpProvider_Behavior {
   public static void init(SNode thisNode) {
   }
   public static String virtual_getShortHelp_473081947982699339(SAbstractConcept thisConcept) {
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_BehaviorDescriptor.java
similarity index 84%
rename from plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_BehaviorDescriptor.java
index 0e639fdea349..5e72c6354d5c 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_BehaviorDescriptor.java
@@ -1,10 +1,10 @@
-package jetbrains.mps.console.base.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
 import org.jetbrains.mps.openapi.language.SConcept;
 
-public interface ConsoleHelpProvider_BehaviorDescriptor {
+public interface HelpProvider_BehaviorDescriptor {
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept);
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept);
   public String virtual_getKind_7006261637493126084(SConcept thisConcept);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_Behavior.java
similarity index 76%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_Behavior.java
index b580a9d3f4e0..3a5ced2af8b9 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -14,12 +14,12 @@ public class InstancesExpression_Behavior {
   public static void init(SNode thisNode) {
   }
   public static Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) {
-    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
+    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
   }
   public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) {
-    return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.QueryExpression", "virtual_getHelpPage_7006261637493125297", new Object[]{}) + "\nImplementation of this command uses the IDE indexes to speed up execution";
+    return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "virtual_getHelpPage_7006261637493125297", new Object[]{}) + "\nImplementation of this command uses the IDE indexes to speed up execution";
   }
   public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) {
-    return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.QueryExpression", "virtual_getDisplayString_6891027939994892943", new Object[]{}) + "(concept)";
+    return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "virtual_getDisplayString_6891027939994892943", new Object[]{}) + "(concept)";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_BehaviorDescriptor.java
similarity index 88%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_BehaviorDescriptor.java
index 23a08b3475a4..699f008784b8 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -19,6 +19,6 @@ public Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SConce
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.InstancesExpression";
+    return "jetbrains.mps.lang.smodel.query.structure.InstancesExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelScope_BehaviorDescriptor.java
similarity index 65%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelScope_BehaviorDescriptor.java
index f23ec4a7e516..487d456d3afb 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelScope_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public ModelScope_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ModelScope";
+    return "jetbrains.mps.lang.smodel.query.structure.ModelScope";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_Behavior.java
similarity index 81%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_Behavior.java
index 2b95c987487c..aa30b9a727ea 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -12,6 +12,6 @@ public class ModelsExpression_Behavior {
   public static void init(SNode thisNode) {
   }
   public static Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) {
-    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
+    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_BehaviorDescriptor.java
similarity index 82%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_BehaviorDescriptor.java
index 997d34018f59..9dfceaf7a643 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -13,6 +13,6 @@ public Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SConce
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ModelsExpression";
+    return "jetbrains.mps.lang.smodel.query.structure.ModelsExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_Behavior.java
similarity index 81%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_Behavior.java
index 3c0b2fc594be..58c928994ec8 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -12,6 +12,6 @@ public class ModulesExpression_Behavior {
   public static void init(SNode thisNode) {
   }
   public static Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) {
-    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
+    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_BehaviorDescriptor.java
similarity index 82%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_BehaviorDescriptor.java
index 39f93aa4d2e0..c9e77bb0e1b9 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -13,6 +13,6 @@ public Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SConce
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ModulesExpression";
+    return "jetbrains.mps.lang.smodel.query.structure.ModulesExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesScope_BehaviorDescriptor.java
similarity index 66%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesScope_BehaviorDescriptor.java
index 029b01c62b31..5a8f857d14cd 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesScope_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public ModulesScope_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ModulesScope";
+    return "jetbrains.mps.lang.smodel.query.structure.ModulesScope";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_Behavior.java
similarity index 81%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_Behavior.java
index dfa7158ce0cd..214b12ae0e1c 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -12,6 +12,6 @@ public class NodesExpression_Behavior {
   public static void init(SNode thisNode) {
   }
   public static Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) {
-    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
+    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_BehaviorDescriptor.java
similarity index 82%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_BehaviorDescriptor.java
index 1764788030a4..345237f22ad5 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -13,6 +13,6 @@ public Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SConce
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.NodesExpression";
+    return "jetbrains.mps.lang.smodel.query.structure.NodesExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_Behavior.java
similarity index 75%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_Behavior.java
index bb2d6ea78952..4b550c2b9fb3 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_Behavior.java
@@ -1,11 +1,11 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
 import org.jetbrains.mps.openapi.model.SNode;
 import org.jetbrains.mps.openapi.language.SAbstractConcept;
 
-public class ConsoleOperation_Behavior {
+public class OperationHelpProvider_Behavior {
   public static void init(SNode thisNode) {
   }
   public static String virtual_getKind_7006261637493126084(SAbstractConcept thisConcept) {
diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_BehaviorDescriptor.java
new file mode 100644
index 000000000000..414e37799eb0
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_BehaviorDescriptor.java
@@ -0,0 +1,7 @@
+package jetbrains.mps.lang.smodel.query.behavior;
+
+/*Generated by MPS */
+
+
+public interface OperationHelpProvider_BehaviorDescriptor extends HelpProvider_BehaviorDescriptor {
+}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_Behavior.java
similarity index 87%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_Behavior.java
index 514de5562ba2..a36f7a4cebd8 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -18,10 +18,10 @@ public static boolean virtual_legalAsStatement_1262430001741498032(SAbstractConc
   }
   public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) {
     String result = "Supported parameters:\n";
-    if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class<Iterable<SNode>>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode())) {
+    if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class<Iterable<SNode>>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode())) {
       result += "scope  (default = project)   specifies the boundaries of the lookup operation\n";
     }
-    if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class<Iterable<SNode>>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode())) {
+    if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class<Iterable<SNode>>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode())) {
       result += "r/o+   (default = false)     also search in read-only models\n";
     } else {
       result += "Note: read-only models are included in the search scope\n";
@@ -29,7 +29,7 @@ public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept th
     return result;
   }
   public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) {
-    String result = BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.ConsoleExpression", "virtual_getShortDisplayString_7006261637493126103", new Object[]{});
+    String result = BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", "virtual_getShortDisplayString_7006261637493126103", new Object[]{});
     if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class<Iterable<SNode>>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).isEmpty()) {
       return result;
     } else {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_BehaviorDescriptor.java
similarity index 67%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_BehaviorDescriptor.java
index dbbb4b70c1e8..36c5d2c5ffd3 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_BehaviorDescriptor.java
@@ -1,39 +1,38 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
 import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior;
 import org.jetbrains.mps.openapi.model.SNode;
 
-public abstract class QueryExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor {
+public abstract class QueryExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor {
   public QueryExpression_BehaviorDescriptor() {
   }
   public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
     return QueryExpression_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
   }
   public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
   }
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
     return QueryExpression_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
   }
   public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
-    return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept);
+    return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept);
   }
   public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
   }
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
   }
   public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) {
     return QueryExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept);
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.QueryExpression";
+    return "jetbrains.mps.lang.smodel.query.structure.QueryExpression";
   }
   public abstract Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept);
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java
similarity index 70%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java
index 0a8dd311bd81..110fe9f0bda5 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public QueryParameterIncludeReadOnly_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly";
+    return "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterList_BehaviorDescriptor.java
similarity index 73%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterList_BehaviorDescriptor.java
index 25d7cd274657..ef64663d36ff 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterList_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -9,6 +9,6 @@ public QueryParameterList_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.QueryParameterList";
+    return "jetbrains.mps.lang.smodel.query.structure.QueryParameterList";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterScope_BehaviorDescriptor.java
similarity index 68%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterScope_BehaviorDescriptor.java
index 42cad177f278..8bc50c34fb47 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterScope_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public QueryParameterScope_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.QueryParameterScope";
+    return "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameter_BehaviorDescriptor.java
similarity index 72%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameter_BehaviorDescriptor.java
index 697315de8e8c..bcec6684376b 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameter_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -9,6 +9,6 @@ public QueryParameter_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.QueryParameter";
+    return "jetbrains.mps.lang.smodel.query.structure.QueryParameter";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_Behavior.java
similarity index 82%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_Behavior.java
index f1c78f381b37..c58fdf2231e7 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -12,6 +12,6 @@ public class ReferencesExpression_Behavior {
   public static void init(SNode thisNode) {
   }
   public static Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) {
-    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
+    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_BehaviorDescriptor.java
similarity index 82%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_BehaviorDescriptor.java
index 135c3f09530b..b3b6410a497f 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -13,6 +13,6 @@ public Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SConce
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ReferencesExpression";
+    return "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ScopeParameter_BehaviorDescriptor.java
similarity index 72%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ScopeParameter_BehaviorDescriptor.java
index b4ff9c915116..b5c8ce422e14 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ScopeParameter_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -9,6 +9,6 @@ public ScopeParameter_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ScopeParameter";
+    return "jetbrains.mps.lang.smodel.query.structure.ScopeParameter";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_Behavior.java
similarity index 76%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_Behavior.java
index eec41dbc0c26..3d9bd74a50f3 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -14,12 +14,12 @@ public class UsagesExpression_Behavior {
   public static void init(SNode thisNode) {
   }
   public static Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) {
-    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
+    return ListSequence.fromListAndArray(new ArrayList<SNode>(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode());
   }
   public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) {
-    return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.QueryExpression", "virtual_getHelpPage_7006261637493125297", new Object[]{}) + "\nImplementation of this command uses the IDE indexes to speed up execution";
+    return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "virtual_getHelpPage_7006261637493125297", new Object[]{}) + "\nImplementation of this command uses the IDE indexes to speed up execution";
   }
   public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) {
-    return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.QueryExpression", "virtual_getDisplayString_6891027939994892943", new Object[]{}) + "(node)";
+    return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "virtual_getDisplayString_6891027939994892943", new Object[]{}) + "(node)";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_BehaviorDescriptor.java
similarity index 88%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_BehaviorDescriptor.java
index 7dac71a50a68..a6834ed8ddb9 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -19,6 +19,6 @@ public Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SConce
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.UsagesExpression";
+    return "jetbrains.mps.lang.smodel.query.structure.UsagesExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/WithStatement_BehaviorDescriptor.java
similarity index 72%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/WithStatement_BehaviorDescriptor.java
index ecf6c6714ca9..d05575a78dda 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/WithStatement_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.lang.smodel.query.behavior;
 
 /*Generated by MPS */
 
@@ -9,6 +9,6 @@ public WithStatement_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.WithStatement";
+    return "jetbrains.mps.lang.smodel.query.structure.WithStatement";
   }
 }
diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info
new file mode 100644
index 000000000000..216383caac7c
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<debug-info>
+  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
+  <root>
+    <file name="BehaviorAspectDescriptor.java">
+      <unit at="9,0,48,0" name="jetbrains.mps.lang.smodel.query.behavior.BehaviorAspectDescriptor" />
+    </file>
+    <file name="CustomScope_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.lang.smodel.query.behavior.CustomScope_BehaviorDescriptor" />
+    </file>
+    <file name="ExpressionHelpProvider_BehaviorDescriptor.java">
+      <unit at="6,0,8,0" name="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor" />
+    </file>
+    <file name="GlobalScope_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.lang.smodel.query.behavior.GlobalScope_BehaviorDescriptor" />
+    </file>
+    <file name="HelpProvider_BehaviorDescriptor.java">
+      <unit at="7,0,15,0" name="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor" />
+    </file>
+    <file name="InstancesExpression_BehaviorDescriptor.java">
+      <unit at="8,0,25,0" name="jetbrains.mps.lang.smodel.query.behavior.InstancesExpression_BehaviorDescriptor" />
+    </file>
+    <file name="ModelScope_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.lang.smodel.query.behavior.ModelScope_BehaviorDescriptor" />
+    </file>
+    <file name="ModelsExpression_BehaviorDescriptor.java">
+      <unit at="8,0,19,0" name="jetbrains.mps.lang.smodel.query.behavior.ModelsExpression_BehaviorDescriptor" />
+    </file>
+    <file name="ModulesExpression_BehaviorDescriptor.java">
+      <unit at="8,0,19,0" name="jetbrains.mps.lang.smodel.query.behavior.ModulesExpression_BehaviorDescriptor" />
+    </file>
+    <file name="ModulesScope_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.lang.smodel.query.behavior.ModulesScope_BehaviorDescriptor" />
+    </file>
+    <file name="NodesExpression_BehaviorDescriptor.java">
+      <unit at="8,0,19,0" name="jetbrains.mps.lang.smodel.query.behavior.NodesExpression_BehaviorDescriptor" />
+    </file>
+    <file name="OperationHelpProvider_BehaviorDescriptor.java">
+      <unit at="6,0,8,0" name="jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_BehaviorDescriptor" />
+    </file>
+    <file name="QueryExpression_BehaviorDescriptor.java">
+      <unit at="9,0,39,0" name="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
+    </file>
+    <file name="QueryParameterIncludeReadOnly_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.lang.smodel.query.behavior.QueryParameterIncludeReadOnly_BehaviorDescriptor" />
+    </file>
+    <file name="QueryParameterList_BehaviorDescriptor.java">
+      <unit at="7,0,15,0" name="jetbrains.mps.lang.smodel.query.behavior.QueryParameterList_BehaviorDescriptor" />
+    </file>
+    <file name="QueryParameterScope_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.lang.smodel.query.behavior.QueryParameterScope_BehaviorDescriptor" />
+    </file>
+    <file name="QueryParameter_BehaviorDescriptor.java">
+      <unit at="7,0,15,0" name="jetbrains.mps.lang.smodel.query.behavior.QueryParameter_BehaviorDescriptor" />
+    </file>
+    <file name="ReferencesExpression_BehaviorDescriptor.java">
+      <unit at="8,0,19,0" name="jetbrains.mps.lang.smodel.query.behavior.ReferencesExpression_BehaviorDescriptor" />
+    </file>
+    <file name="ScopeParameter_BehaviorDescriptor.java">
+      <unit at="7,0,15,0" name="jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor" />
+    </file>
+    <file name="UsagesExpression_BehaviorDescriptor.java">
+      <unit at="8,0,25,0" name="jetbrains.mps.lang.smodel.query.behavior.UsagesExpression_BehaviorDescriptor" />
+    </file>
+    <file name="WithStatement_BehaviorDescriptor.java">
+      <unit at="7,0,15,0" name="jetbrains.mps.lang.smodel.query.behavior.WithStatement_BehaviorDescriptor" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/4307205004146936308">
+    <file name="UsagesExpression_Behavior.java">
+      <node id="3470161847490034786" at="16,114,17,435" concept="4" />
+      <node id="1433263869219693597" at="19,94,20,303" concept="4" />
+      <node id="2410037095038282257" at="22,99,23,239" concept="4" />
+      <node id="4307205004146936308" at="14,0,16,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4307205004146936308" at="16,0,19,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
+      <node id="4307205004146936308" at="19,0,22,0" concept="5" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="4307205004146936308" at="22,0,25,0" concept="5" trace="virtual_getDisplayString_6891027939994892943#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="4307205004146936310" at="14,43,14,43" />
+      <scope id="4307205004146983753" at="16,114,17,435" />
+      <scope id="1433263869220246216" at="19,94,20,303" />
+      <scope id="2410037095038282252" at="22,99,23,239" />
+      <scope id="4307205004146936308" at="14,0,16,0">
+        <var name="thisNode" id="4307205004146936308" />
+      </scope>
+      <scope id="4307205004146936308" at="16,0,19,0">
+        <var name="thisConcept" id="4307205004146936308" />
+      </scope>
+      <scope id="4307205004146936308" at="19,0,22,0">
+        <var name="thisConcept" id="4307205004146936308" />
+      </scope>
+      <scope id="4307205004146936308" at="22,0,25,0">
+        <var name="thisConcept" id="4307205004146936308" />
+      </scope>
+      <unit id="4307205004146936308" at="13,0,26,0" name="jetbrains.mps.lang.smodel.query.behavior.UsagesExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/4307205004146945906">
+    <file name="QueryExpression_Behavior.java">
+      <node id="4225915845891111332" at="16,100,17,16" concept="4" />
+      <node id="1433263869219709154" at="19,94,20,46" concept="3" />
+      <node id="1433263869219780383" at="21,483,22,98" concept="1" />
+      <node id="1433263869219777969" at="24,493,25,81" concept="1" />
+      <node id="1433263869219798899" at="26,12,27,76" concept="1" />
+      <node id="1433263869219766829" at="28,5,29,18" concept="4" />
+      <node id="6891027939994775901" at="31,99,32,249" concept="3" />
+      <node id="6891027939994783838" at="33,304,34,20" concept="4" />
+      <node id="6891027939994786004" at="35,12,36,37" concept="4" />
+      <node id="4307205004146945906" at="14,0,16,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="1433263869219798588" at="26,10,28,5" concept="0" />
+      <node id="6891027939994784978" at="35,10,37,5" concept="0" />
+      <node id="4307205004146945906" at="16,0,19,0" concept="5" trace="virtual_legalAsStatement_1262430001741498032#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Z" />
+      <node id="1433263869219780381" at="20,46,23,5" concept="2" />
+      <node id="1433263869219703458" at="23,5,28,5" concept="2" />
+      <node id="6891027939994778323" at="32,249,37,5" concept="2" />
+      <node id="4307205004146945906" at="31,0,39,0" concept="5" trace="virtual_getDisplayString_6891027939994892943#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="4307205004146945906" at="19,0,31,0" concept="5" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="4307205004146945908" at="14,43,14,43" />
+      <scope id="4225915845891111311" at="16,100,17,16" />
+      <scope id="1433263869219780382" at="21,483,22,98" />
+      <scope id="1433263869219703459" at="24,493,25,81" />
+      <scope id="1433263869219798589" at="26,12,27,76" />
+      <scope id="6891027939994778325" at="33,304,34,20" />
+      <scope id="6891027939994786005" at="35,12,36,37" />
+      <scope id="4307205004146945906" at="14,0,16,0">
+        <var name="thisNode" id="4307205004146945906" />
+      </scope>
+      <scope id="4307205004146945906" at="16,0,19,0">
+        <var name="thisConcept" id="4307205004146945906" />
+      </scope>
+      <scope id="6891027939994745815" at="31,99,37,5">
+        <var name="result" id="6891027939994775902" />
+      </scope>
+      <scope id="4307205004146945906" at="31,0,39,0">
+        <var name="thisConcept" id="4307205004146945906" />
+      </scope>
+      <scope id="1433263869219703331" at="19,94,29,18">
+        <var name="result" id="1433263869219709157" />
+      </scope>
+      <scope id="4307205004146945906" at="19,0,31,0">
+        <var name="thisConcept" id="4307205004146945906" />
+      </scope>
+      <unit id="4307205004146945906" at="13,0,40,0" name="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/4307205004146945952">
+    <file name="NodesExpression_Behavior.java">
+      <node id="4830115408592167482" at="14,114,15,435" concept="4" />
+      <node id="4307205004146945952" at="12,0,14,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4307205004146945952" at="14,0,17,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
+      <scope id="4307205004146945954" at="12,43,12,43" />
+      <scope id="4307205004146945960" at="14,114,15,435" />
+      <scope id="4307205004146945952" at="12,0,14,0">
+        <var name="thisNode" id="4307205004146945952" />
+      </scope>
+      <scope id="4307205004146945952" at="14,0,17,0">
+        <var name="thisConcept" id="4307205004146945952" />
+      </scope>
+      <unit id="4307205004146945952" at="11,0,18,0" name="jetbrains.mps.lang.smodel.query.behavior.NodesExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/4307205004146956485">
+    <file name="ModulesExpression_Behavior.java">
+      <node id="4830115408592155729" at="14,114,15,435" concept="4" />
+      <node id="4307205004146956485" at="12,0,14,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4307205004146956485" at="14,0,17,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
+      <scope id="4307205004146956487" at="12,43,12,43" />
+      <scope id="4307205004146956535" at="14,114,15,435" />
+      <scope id="4307205004146956485" at="12,0,14,0">
+        <var name="thisNode" id="4307205004146956485" />
+      </scope>
+      <scope id="4307205004146956485" at="14,0,17,0">
+        <var name="thisConcept" id="4307205004146956485" />
+      </scope>
+      <unit id="4307205004146956485" at="11,0,18,0" name="jetbrains.mps.lang.smodel.query.behavior.ModulesExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/4307205004146963229">
+    <file name="ModelsExpression_Behavior.java">
+      <node id="4830115408592112296" at="14,114,15,435" concept="4" />
+      <node id="4307205004146963229" at="12,0,14,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4307205004146963229" at="14,0,17,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
+      <scope id="4307205004146963231" at="12,43,12,43" />
+      <scope id="4307205004146963279" at="14,114,15,435" />
+      <scope id="4307205004146963229" at="12,0,14,0">
+        <var name="thisNode" id="4307205004146963229" />
+      </scope>
+      <scope id="4307205004146963229" at="14,0,17,0">
+        <var name="thisConcept" id="4307205004146963229" />
+      </scope>
+      <unit id="4307205004146963229" at="11,0,18,0" name="jetbrains.mps.lang.smodel.query.behavior.ModelsExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/4307205004146970004">
+    <file name="InstancesExpression_Behavior.java">
+      <node id="3470161847490021102" at="16,114,17,435" concept="4" />
+      <node id="1433263869220247007" at="19,94,20,303" concept="4" />
+      <node id="2410037095038320797" at="22,99,23,242" concept="4" />
+      <node id="4307205004146970004" at="14,0,16,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4307205004146970004" at="16,0,19,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
+      <node id="4307205004146970004" at="19,0,22,0" concept="5" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="4307205004146970004" at="22,0,25,0" concept="5" trace="virtual_getDisplayString_6891027939994892943#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="4307205004146970006" at="14,43,14,43" />
+      <scope id="4307205004146970054" at="16,114,17,435" />
+      <scope id="1433263869220247006" at="19,94,20,303" />
+      <scope id="2410037095038320792" at="22,99,23,242" />
+      <scope id="4307205004146970004" at="14,0,16,0">
+        <var name="thisNode" id="4307205004146970004" />
+      </scope>
+      <scope id="4307205004146970004" at="16,0,19,0">
+        <var name="thisConcept" id="4307205004146970004" />
+      </scope>
+      <scope id="4307205004146970004" at="19,0,22,0">
+        <var name="thisConcept" id="4307205004146970004" />
+      </scope>
+      <scope id="4307205004146970004" at="22,0,25,0">
+        <var name="thisConcept" id="4307205004146970004" />
+      </scope>
+      <unit id="4307205004146970004" at="13,0,26,0" name="jetbrains.mps.lang.smodel.query.behavior.InstancesExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/4307205004146976962">
+    <file name="ReferencesExpression_Behavior.java">
+      <node id="4830115408592183139" at="14,114,15,435" concept="4" />
+      <node id="4307205004146976962" at="12,0,14,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4307205004146976962" at="14,0,17,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
+      <scope id="4307205004146976964" at="12,43,12,43" />
+      <scope id="4307205004146977012" at="14,114,15,435" />
+      <scope id="4307205004146976962" at="12,0,14,0">
+        <var name="thisNode" id="4307205004146976962" />
+      </scope>
+      <scope id="4307205004146976962" at="14,0,17,0">
+        <var name="thisConcept" id="4307205004146976962" />
+      </scope>
+      <unit id="4307205004146976962" at="11,0,18,0" name="jetbrains.mps.lang.smodel.query.behavior.ReferencesExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/473081947982699336">
+    <file name="HelpProvider_Behavior.java">
+      <node id="1433263869219891526" at="16,94,17,278" concept="4" />
+      <node id="7006261637493128366" at="19,94,20,16" concept="4" />
+      <node id="6928665434441165614" at="22,91,23,163" concept="4" />
+      <node id="6928665434437563301" at="25,104,26,275" concept="3" />
+      <node id="6928665434437576073" at="27,48,28,19" concept="4" />
+      <node id="6928665434437576528" at="29,12,30,256" concept="4" />
+      <node id="6891027939994894629" at="33,99,34,236" concept="4" />
+      <node id="473081947982699336" at="14,0,16,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="6928665434437576376" at="29,10,31,5" concept="0" />
+      <node id="473081947982699336" at="16,0,19,0" concept="5" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="473081947982699336" at="19,0,22,0" concept="5" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="473081947982699336" at="22,0,25,0" concept="5" trace="virtual_getGroup_6928665434441162387#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="473081947982699336" at="33,0,36,0" concept="5" trace="virtual_getDisplayString_6891027939994892943#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="6928665434437564316" at="26,275,31,5" concept="2" />
+      <node id="473081947982699336" at="25,0,33,0" concept="5" trace="virtual_getShortDisplayString_7006261637493126103#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="473081947982699338" at="14,43,14,43" />
+      <scope id="473081947982699342" at="16,94,17,278" />
+      <scope id="7006261637493125454" at="19,94,20,16" />
+      <scope id="6928665434441162390" at="22,91,23,163" />
+      <scope id="6928665434437564319" at="27,48,28,19" />
+      <scope id="6928665434437576377" at="29,12,30,256" />
+      <scope id="6891027939994892946" at="33,99,34,236" />
+      <scope id="473081947982699336" at="14,0,16,0">
+        <var name="thisNode" id="473081947982699336" />
+      </scope>
+      <scope id="473081947982699336" at="16,0,19,0">
+        <var name="thisConcept" id="473081947982699336" />
+      </scope>
+      <scope id="473081947982699336" at="19,0,22,0">
+        <var name="thisConcept" id="473081947982699336" />
+      </scope>
+      <scope id="473081947982699336" at="22,0,25,0">
+        <var name="thisConcept" id="473081947982699336" />
+      </scope>
+      <scope id="473081947982699336" at="33,0,36,0">
+        <var name="thisConcept" id="473081947982699336" />
+      </scope>
+      <scope id="7006261637493126106" at="25,104,31,5">
+        <var name="alias" id="6928665434437563304" />
+      </scope>
+      <scope id="473081947982699336" at="25,0,33,0">
+        <var name="thisConcept" id="473081947982699336" />
+      </scope>
+      <unit id="473081947982699336" at="13,0,37,0" name="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/5932042262275648698">
+    <file name="OperationHelpProvider_Behavior.java">
+      <node id="5932042262275683930" at="11,90,12,23" concept="4" />
+      <node id="5932042262275648698" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="5932042262275648698" at="11,0,14,0" concept="5" trace="virtual_getKind_7006261637493126084#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="5932042262275648700" at="9,43,9,43" />
+      <scope id="5932042262275683923" at="11,90,12,23" />
+      <scope id="5932042262275648698" at="9,0,11,0">
+        <var name="thisNode" id="5932042262275648698" />
+      </scope>
+      <scope id="5932042262275648698" at="11,0,14,0">
+        <var name="thisConcept" id="5932042262275648698" />
+      </scope>
+      <unit id="5932042262275648698" at="8,0,15,0" name="jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)/7006261637496548522">
+    <file name="ExpressionHelpProvider_Behavior.java">
+      <node id="7006261637496548544" at="11,90,12,24" concept="4" />
+      <node id="7006261637496548522" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7006261637496548522" at="11,0,14,0" concept="5" trace="virtual_getKind_7006261637493126084#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="7006261637496548524" at="9,43,9,43" />
+      <scope id="7006261637496548537" at="11,90,12,24" />
+      <scope id="7006261637496548522" at="9,0,11,0">
+        <var name="thisNode" id="7006261637496548522" />
+      </scope>
+      <scope id="7006261637496548522" at="11,0,14,0">
+        <var name="thisConcept" id="7006261637496548522" />
+      </scope>
+      <unit id="7006261637496548522" at="8,0,15,0" name="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior" />
+    </file>
+  </root>
+</debug-info>
+
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/ConstraintsAspectDescriptor.java
similarity index 93%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/ConstraintsAspectDescriptor.java
index 061f1318a747..be3dc8be8c86 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/ConstraintsAspectDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.constraints;
+package jetbrains.mps.lang.smodel.query.constraints;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/InstancesExpression_Constraints.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/InstancesExpression_Constraints.java
index 77996e73a8fb..d4f1c1758344 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/InstancesExpression_Constraints.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.constraints;
+package jetbrains.mps.lang.smodel.query.constraints;
 
 /*Generated by MPS */
 
@@ -32,7 +32,7 @@ public boolean canBeAncestor(SNode node, @Nullable SNode childNode, SNode childC
     return result;
   }
   public static boolean static_canBeAnAncestor(SNode node, SNode childNode, SNode childConcept, final IOperationContext operationContext) {
-    return !(SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L, "jetbrains.mps.console.blCommand.structure.GlobalScope")));
+    return !(SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L, "jetbrains.mps.lang.smodel.query.structure.GlobalScope")));
   }
-  private static SNodePointer canBeAncesctorBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)", "3470161847493603670");
+  private static SNodePointer canBeAncesctorBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)", "3470161847493603670");
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/QueryParameter_Constraints.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/QueryParameter_Constraints.java
index 9519de89480d..1a479ae4fa70 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/QueryParameter_Constraints.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.constraints;
+package jetbrains.mps.lang.smodel.query.constraints;
 
 /*Generated by MPS */
 
@@ -37,10 +37,10 @@ public static boolean static_canBeAChild(SNode node, SNode parentNode, SNode lin
     if (neq_2bkn6k_a0a0d(SNodeOperations.getContainingLinkDeclaration(parentNode), SLinkOperations.findLinkDeclaration(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")))) {
       return false;
     }
-    return Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class<Iterable<SNode>>) ((Class) Object.class), SNodeOperations.asSConcept(SNodeOperations.getConcept(SNodeOperations.cast(SNodeOperations.getParent(parentNode), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression")))), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains((SNode) childConcept);
+    return Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class<Iterable<SNode>>) ((Class) Object.class), SNodeOperations.asSConcept(SNodeOperations.getConcept(SNodeOperations.cast(SNodeOperations.getParent(parentNode), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression")))), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains((SNode) childConcept);
   }
   private static boolean neq_2bkn6k_a0a0d(Object a, Object b) {
     return !(((a != null ? a.equals(b) : a == b)));
   }
-  private static SNodePointer canBeChildBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)", "6891027939993473118");
+  private static SNodePointer canBeChildBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)", "6891027939993473118");
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/UsagesExpression_Constraints.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/UsagesExpression_Constraints.java
index 318e5f338076..f851c80b5f74 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/UsagesExpression_Constraints.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.constraints;
+package jetbrains.mps.lang.smodel.query.constraints;
 
 /*Generated by MPS */
 
@@ -32,7 +32,7 @@ public boolean canBeAncestor(SNode node, @Nullable SNode childNode, SNode childC
     return result;
   }
   public static boolean static_canBeAnAncestor(SNode node, SNode childNode, SNode childConcept, final IOperationContext operationContext) {
-    return !(SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L, "jetbrains.mps.console.blCommand.structure.GlobalScope")));
+    return !(SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L, "jetbrains.mps.lang.smodel.query.structure.GlobalScope")));
   }
-  private static SNodePointer canBeAncesctorBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)", "3470161847493618356");
+  private static SNodePointer canBeAncesctorBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)", "3470161847493618356");
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/trace.info
similarity index 95%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/trace.info
index 27c3c0c02868..50d49bcf3aac 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/trace.info
@@ -12,10 +12,10 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" />
   <root>
     <file name="ConstraintsAspectDescriptor.java">
-      <unit at="9,0,26,0" name="jetbrains.mps.console.blCommand.constraints.ConstraintsAspectDescriptor" />
+      <unit at="9,0,26,0" name="jetbrains.mps.lang.smodel.query.constraints.ConstraintsAspectDescriptor" />
     </file>
   </root>
-  <root nodeRef="r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)/3470161847493603637">
+  <root nodeRef="r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)/3470161847493603637">
     <file name="InstancesExpression_Constraints.java">
       <node id="3470161847493603637" at="17,44,18,98" concept="9" />
       <node id="3470161847493603637" at="21,46,22,16" concept="5" />
@@ -53,10 +53,10 @@
         <var name="context" id="3470161847493603637" />
         <var name="node" id="3470161847493603637" />
       </scope>
-      <unit id="3470161847493603637" at="16,0,39,0" name="jetbrains.mps.console.blCommand.constraints.InstancesExpression_Constraints" />
+      <unit id="3470161847493603637" at="16,0,39,0" name="jetbrains.mps.lang.smodel.query.constraints.InstancesExpression_Constraints" />
     </file>
   </root>
-  <root nodeRef="r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)/3470161847493618355">
+  <root nodeRef="r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)/3470161847493618355">
     <file name="UsagesExpression_Constraints.java">
       <node id="3470161847493618355" at="17,41,18,98" concept="9" />
       <node id="3470161847493618355" at="21,46,22,16" concept="5" />
@@ -94,10 +94,10 @@
         <var name="context" id="3470161847493618355" />
         <var name="node" id="3470161847493618355" />
       </scope>
-      <unit id="3470161847493618355" at="16,0,39,0" name="jetbrains.mps.console.blCommand.constraints.UsagesExpression_Constraints" />
+      <unit id="3470161847493618355" at="16,0,39,0" name="jetbrains.mps.lang.smodel.query.constraints.UsagesExpression_Constraints" />
     </file>
   </root>
-  <root nodeRef="r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)/6891027939993473117">
+  <root nodeRef="r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)/6891027939993473117">
     <file name="QueryParameter_Constraints.java">
       <node id="6891027939993473117" at="19,39,20,98" concept="9" />
       <node id="6891027939993473117" at="23,43,24,16" concept="5" />
@@ -147,7 +147,7 @@
         <var name="operationContext" id="6891027939993473117" />
         <var name="parentNode" id="6891027939993473117" />
       </scope>
-      <unit id="6891027939993473117" at="18,0,47,0" name="jetbrains.mps.console.blCommand.constraints.QueryParameter_Constraints" />
+      <unit id="6891027939993473117" at="18,0,47,0" name="jetbrains.mps.lang.smodel.query.constraints.QueryParameter_Constraints" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Actions.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Actions.java
index 4333888ccdbf..dbe987ebd00a 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Actions.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -23,7 +23,7 @@ public void execute(EditorContext editorContext) {
       this.execute_internal(editorContext, this.myNode);
     }
     public void execute_internal(EditorContext editorContext, SNode node) {
-      SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter"));
+      SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter"));
     }
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Editor.java
similarity index 98%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Editor.java
index f5c1ded85581..5950c14bf253 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java
similarity index 59%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java
index 23f91904156c..ebd62fdeaa5d 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -15,36 +15,26 @@ public class EditorAspectDescriptorImpl implements EditorAspectDescriptor {
   public Collection<ConceptEditor> getEditors(ConceptDescriptor descriptor) {
     switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0b, descriptor.getConceptFqName())) {
       case 0:
-        return Collections.<ConceptEditor>singletonList(new AbstractPrintExpression_Editor());
-      case 1:
-        return Collections.<ConceptEditor>singletonList(new BLCommand_Editor());
-      case 2:
-        return Collections.<ConceptEditor>singletonList(new BLExpression_Editor());
-      case 3:
         return Collections.<ConceptEditor>singletonList(new CustomScope_Editor());
-      case 4:
-        return Collections.<ConceptEditor>singletonList(new ExceptionHolder_Editor());
-      case 5:
+      case 1:
         return Collections.<ConceptEditor>singletonList(new InstancesExpression_Editor());
-      case 6:
+      case 2:
         return Collections.<ConceptEditor>singletonList(new ModelScope_Editor());
-      case 7:
+      case 3:
         return Collections.<ConceptEditor>singletonList(new ModulesScope_Editor());
-      case 8:
+      case 4:
         return Collections.<ConceptEditor>singletonList(new QueryExpression_Editor());
-      case 9:
+      case 5:
         return Collections.<ConceptEditor>singletonList(new QueryParameter_Editor());
-      case 10:
+      case 6:
         return Collections.<ConceptEditor>singletonList(new QueryParameterList_Editor());
-      case 11:
+      case 7:
         return Collections.<ConceptEditor>singletonList(new QueryParameterScope_Editor());
-      case 12:
+      case 8:
         return Collections.<ConceptEditor>singletonList(new ScopeParameter_Editor());
-      case 13:
-        return Collections.<ConceptEditor>singletonList(new ShowExpression_Editor());
-      case 14:
+      case 9:
         return Collections.<ConceptEditor>singletonList(new UsagesExpression_Editor());
-      case 15:
+      case 10:
         return Collections.<ConceptEditor>singletonList(new WithStatement_Editor());
       default:
     }
@@ -53,7 +43,7 @@ public Collection<ConceptEditor> getEditors(ConceptDescriptor descriptor) {
   public Collection<ConceptEditorComponent> getEditorComponents(ConceptDescriptor descriptor, String editorComponentId) {
     switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0c, descriptor.getConceptFqName())) {
       case 0:
-        if ("jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent".equals(editorComponentId)) {
+        if ("jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent".equals(editorComponentId)) {
           return Collections.<ConceptEditorComponent>singletonList(new QueryExpression_EditorComponent());
         }
         break;
@@ -63,6 +53,6 @@ public Collection<ConceptEditorComponent> getEditorComponents(ConceptDescriptor
   }
 
 
-  private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.BLCommand", "jetbrains.mps.console.blCommand.structure.BLExpression", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.ExceptionHolder", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"};
-  private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.console.blCommand.structure.QueryExpression"};
+  private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"};
+  private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.lang.smodel.query.structure.QueryExpression"};
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/InstancesExpression_Editor.java
similarity index 97%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/InstancesExpression_Editor.java
index aae4e1b37062..5407a460e32f 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/InstancesExpression_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -34,7 +34,7 @@ private EditorCell createCollection_le77e3_a(EditorContext editorContext, SNode
     return editorCell;
   }
   private EditorCell createComponent_le77e3_a0(EditorContext editorContext, SNode node) {
-    EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent");
+    EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent");
     return editorCell;
   }
   private EditorCell createConstant_le77e3_b0(EditorContext editorContext, SNode node) {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModelScope_Editor.java
similarity index 99%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModelScope_Editor.java
index 0baacc993944..92f9e9d9579d 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModelScope_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModulesScope_Editor.java
similarity index 99%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModulesScope_Editor.java
index 54aa24d651c6..73f96eb95fba 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModulesScope_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Actions.java
similarity index 98%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Actions.java
index d60034aa2551..1d036b3b95aa 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Actions.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Editor.java
similarity index 90%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Editor.java
index 7148fd5e2bef..98942d7fcc60 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -15,7 +15,7 @@ public EditorCell createEditorCell(EditorContext editorContext, SNode node) {
     return this.createComponent_8t0fqe_a(editorContext, node);
   }
   private EditorCell createComponent_8t0fqe_a(EditorContext editorContext, SNode node) {
-    EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent");
+    EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent");
     EditorCell bigCell = BigCellUtil.findBigCell(editorCell, node);
     if (bigCell != null) {
       bigCell.setBig(true);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_EditorComponent.java
similarity index 98%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_EditorComponent.java
index c1635ba8770a..a8a8fdc11956 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_EditorComponent.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -54,7 +54,7 @@ public static class ReplaceWith_QueryExpression_cellMenu_adikco_a0a0 extends Abs
     public ReplaceWith_QueryExpression_cellMenu_adikco_a0a0() {
     }
     public String getReplacementConceptName() {
-      return "jetbrains.mps.console.blCommand.structure.QueryExpression";
+      return "jetbrains.mps.lang.smodel.query.structure.QueryExpression";
     }
   }
   private EditorCell createCollection_adikco_b0(EditorContext editorContext, SNode node) {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_KeyMap.java
similarity index 95%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_KeyMap.java
index be857998e3c5..a374cac9d436 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_KeyMap.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -40,7 +40,7 @@ public boolean canExecute(final EditorContext editorContext) {
       if (contextNode == null) {
         return false;
       }
-      if (!(SNodeOperations.isInstanceOf(contextNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression")))) {
+      if (!(SNodeOperations.isInstanceOf(contextNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression")))) {
         return false;
       }
       return this.canExecute_internal(editorContext, contextNode, this.getSelectedNodes(editorContext));
@@ -53,7 +53,7 @@ private boolean canExecute_internal(final EditorContext editorContext, final SNo
       return ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty() && Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class<Iterable<SNode>>) ((Class) Object.class), SNodeOperations.asSConcept(SNodeOperations.getConceptDeclaration(node)), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).isNotEmpty();
     }
     private void execute_internal(final EditorContext editorContext, final SNode node, final List<SNode> selectedNodes) {
-      SNodeFactoryOperations.addNewChild(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter")));
+      SNodeFactoryOperations.addNewChild(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter")));
     }
     public String getKeyStroke() {
       return " <";
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterList_Editor.java
similarity index 99%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterList_Editor.java
index 36200568282c..9993456c2513 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterList_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScopeValue_Actions.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScopeValue_Actions.java
index 65d836a3875c..baae3d3cbbba 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScopeValue_Actions.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -27,8 +27,8 @@ public void execute(EditorContext editorContext) {
       this.execute_internal(editorContext, this.myNode);
     }
     public void execute_internal(EditorContext editorContext, SNode node) {
-      if (!(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")))), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter")))) {
-        SLinkOperations.setTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter"))));
+      if (!(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")))), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter")))) {
+        SLinkOperations.setTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter"))));
         return;
       }
       CellAction action = editorContext.getEditorComponent().findNodeCell(node).getAction(CellActionType.DELETE);
@@ -48,8 +48,8 @@ public void execute(EditorContext editorContext) {
       this.execute_internal(editorContext, this.myNode);
     }
     public void execute_internal(EditorContext editorContext, SNode node) {
-      if (!(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")))), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter")))) {
-        SLinkOperations.setTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter"))));
+      if (!(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")))), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter")))) {
+        SLinkOperations.setTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter"))));
         return;
       }
       CellAction action = editorContext.getEditorComponent().findNodeCell(node).getAction(CellActionType.DELETE);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScope_Editor.java
similarity index 98%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScope_Editor.java
index 045f829afff1..ca13ea8d22b7 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScope_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Actions.java
similarity index 88%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Actions.java
index 9749a262f080..80b82422a627 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Actions.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -28,15 +28,15 @@ public void execute(EditorContext editorContext) {
       this.execute_internal(editorContext, this.myNode);
     }
     public void execute_internal(EditorContext editorContext, SNode node) {
-      SNode parameterList = SNodeOperations.as(SNodeOperations.getParent(node), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"));
-      if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).count() == 1 && !(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter")))) {
-        SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter"));
+      SNode parameterList = SNodeOperations.as(SNodeOperations.getParent(node), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"));
+      if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).count() == 1 && !(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter")))) {
+        SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter"));
         return;
       }
 
       SNodeOperations.deleteNode(node);
       if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty()) {
-        SNode queryExpression = SNodeOperations.as(SNodeOperations.getParent(parameterList), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression"));
+        SNode queryExpression = SNodeOperations.as(SNodeOperations.getParent(parameterList), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression"));
         if (queryExpression != null) {
           SelectionUtil.selectLabelCellAnSetCaret(editorContext, queryExpression, "ALIAS_EDITOR_COMPONENT", -1);
         }
@@ -52,15 +52,15 @@ public void execute(EditorContext editorContext) {
       this.execute_internal(editorContext, this.myNode);
     }
     public void execute_internal(EditorContext editorContext, SNode node) {
-      SNode parameterList = SNodeOperations.as(SNodeOperations.getParent(node), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"));
-      if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).count() == 1 && !(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter")))) {
-        SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter"));
+      SNode parameterList = SNodeOperations.as(SNodeOperations.getParent(node), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"));
+      if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).count() == 1 && !(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter")))) {
+        SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter"));
         return;
       }
 
       SNodeOperations.deleteNode(node);
       if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty()) {
-        SNode queryExpression = SNodeOperations.as(SNodeOperations.getParent(parameterList), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression"));
+        SNode queryExpression = SNodeOperations.as(SNodeOperations.getParent(parameterList), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression"));
         if (queryExpression != null) {
           SelectionUtil.selectLabelCellAnSetCaret(editorContext, queryExpression, "ALIAS_EDITOR_COMPONENT", -1);
         }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Editor.java
similarity index 97%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Editor.java
index e13f88e8db77..0b40e356ba8d 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ScopeParameter_Editor.java
similarity index 95%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ScopeParameter_Editor.java
index d889c65bb8d5..b9da37a3669f 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ScopeParameter_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -38,7 +38,7 @@ private EditorCell createAlternation_pzkiaj_a(EditorContext editorContext, SNode
     return editorCell;
   }
   private static boolean renderingCondition_pzkiaj_a0(SNode node, EditorContext editorContext) {
-    return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter"));
+    return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter"));
   }
   private EditorCell createError_pzkiaj_a0(EditorContext editorContext, SNode node) {
     EditorCell_Error editorCell = new EditorCell_Error(editorContext, node, "<no scope>");
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/UsagesExpression_Editor.java
similarity index 97%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/UsagesExpression_Editor.java
index 6e83177ce2d4..230d2a7a79a9 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/UsagesExpression_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
@@ -34,7 +34,7 @@ private EditorCell createCollection_ikz501_a(EditorContext editorContext, SNode
     return editorCell;
   }
   private EditorCell createComponent_ikz501_a0(EditorContext editorContext, SNode node) {
-    EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent");
+    EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent");
     return editorCell;
   }
   private EditorCell createConstant_ikz501_b0(EditorContext editorContext, SNode node) {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/WithStatement_Editor.java
similarity index 99%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/WithStatement_Editor.java
index 4b2c16c1332d..523ddd4de63b 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/WithStatement_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.lang.smodel.query.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info
similarity index 72%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info
index 9d1147617dc8..eb957540f106 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info
@@ -13,104 +13,10 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" />
   <root>
     <file name="EditorAspectDescriptorImpl.java">
-      <unit at="13,0,69,0" name="jetbrains.mps.console.blCommand.editor.EditorAspectDescriptorImpl" />
+      <unit at="13,0,59,0" name="jetbrains.mps.lang.smodel.query.editor.EditorAspectDescriptorImpl" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/1125969196844413435">
-    <file name="ShowExpression_Editor.java">
-      <node id="1125969196844413435" at="18,79,19,63" concept="7" />
-      <node id="1125969196844413435" at="21,89,22,96" concept="6" />
-      <node id="1125969196844413435" at="22,96,23,48" concept="2" />
-      <node id="1125969196844413435" at="23,48,24,28" concept="2" />
-      <node id="1125969196844413435" at="24,28,25,79" concept="2" />
-      <node id="1125969196844413435" at="25,79,26,82" concept="0" />
-      <node id="1125969196844413435" at="25,79,26,82" concept="2" />
-      <node id="1125969196844413435" at="26,82,27,80" concept="0" />
-      <node id="1125969196844413435" at="26,82,27,80" concept="2" />
-      <node id="1125969196844413435" at="27,80,28,22" concept="7" />
-      <node id="1125969196844419413" at="30,89,31,131" concept="6" />
-      <node id="1125969196844419413" at="31,131,32,22" concept="7" />
-      <node id="1125969196844413435" at="34,87,35,252" concept="6" />
-      <node id="1125969196844413435" at="35,252,36,33" concept="7" />
-      <node id="1125969196844413435" at="39,120,40,49" concept="10" />
-      <node id="1125969196844413435" at="42,81,43,74" concept="6" />
-      <node id="1125969196844413435" at="43,74,44,41" concept="2" />
-      <node id="1125969196844413435" at="44,41,45,24" concept="7" />
-      <node id="1125969196844413435" at="47,69,48,137" concept="2" />
-      <node id="1125969196844413435" at="49,41,50,37" concept="2" />
-      <node id="1125969196844413435" at="56,44,57,54" concept="6" />
-      <node id="1125969196844413435" at="57,54,58,43" concept="2" />
-      <node id="1125969196844413435" at="58,43,59,40" concept="2" />
-      <node id="1125969196844413435" at="59,40,60,24" concept="7" />
-      <node id="1125969196844413435" at="63,40,64,27" concept="7" />
-      <node id="1125969196844413435" at="18,0,21,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1125969196844413435" at="39,0,42,0" concept="1" trace="objectSingleRoleHandler_rowo1n_b0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="1125969196844413435" at="48,137,51,7" concept="4" />
-      <node id="1125969196844413435" at="63,0,66,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="1125969196844419413" at="30,0,34,0" concept="5" trace="createComponent_rowo1n_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1125969196844413435" at="34,0,38,0" concept="5" trace="createRefNode_rowo1n_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1125969196844413435" at="42,0,47,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1125969196844413435" at="47,0,53,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="1125969196844413435" at="55,0,62,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1125969196844413435" at="21,0,30,0" concept="5" trace="createCollection_rowo1n_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <scope id="1125969196844413435" at="18,79,19,63" />
-      <scope id="1125969196844413435" at="25,79,26,82" />
-      <scope id="1125969196844413435" at="26,82,27,80" />
-      <scope id="1125969196844413435" at="39,120,40,49" />
-      <scope id="1125969196844413435" at="49,41,50,37" />
-      <scope id="1125969196844413435" at="63,40,64,27" />
-      <scope id="1125969196844419413" at="30,89,32,22">
-        <var name="editorCell" id="1125969196844419413" />
-      </scope>
-      <scope id="1125969196844413435" at="34,87,36,33">
-        <var name="provider" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="18,0,21,0">
-        <var name="editorContext" id="1125969196844413435" />
-        <var name="node" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="39,0,42,0">
-        <var name="containmentLink" id="1125969196844413435" />
-        <var name="context" id="1125969196844413435" />
-        <var name="ownerNode" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="42,81,45,24">
-        <var name="editorCell" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="63,0,66,0" />
-      <scope id="1125969196844419413" at="30,0,34,0">
-        <var name="editorContext" id="1125969196844419413" />
-        <var name="node" id="1125969196844419413" />
-      </scope>
-      <scope id="1125969196844413435" at="34,0,38,0">
-        <var name="editorContext" id="1125969196844413435" />
-        <var name="node" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="47,69,51,7" />
-      <scope id="1125969196844413435" at="56,44,60,24">
-        <var name="editorCell" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="42,0,47,0">
-        <var name="child" id="1125969196844413435" />
-        <var name="editorContext" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="47,0,53,0">
-        <var name="child" id="1125969196844413435" />
-        <var name="editorCell" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="21,89,28,22">
-        <var name="editorCell" id="1125969196844413435" />
-      </scope>
-      <scope id="1125969196844413435" at="55,0,62,0" />
-      <scope id="1125969196844413435" at="21,0,30,0">
-        <var name="editorContext" id="1125969196844413435" />
-        <var name="node" id="1125969196844413435" />
-      </scope>
-      <unit id="1125969196844413435" at="38,0,68,0" name="jetbrains.mps.console.blCommand.editor.ShowExpression_Editor$objectSingleRoleHandler_rowo1n_b0" />
-      <unit id="1125969196844413435" at="17,0,69,0" name="jetbrains.mps.console.blCommand.editor.ShowExpression_Editor" />
-    </file>
-  </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/2081879850498509291">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/2081879850498509291">
     <file name="CustomScope_Actions.java">
       <node id="2081879850498509291" at="14,95,15,112" concept="2" />
       <node id="2081879850498509291" at="18,0,19,0" concept="3" trace="myNode" />
@@ -140,11 +46,11 @@
         <var name="editorContext" id="2081879850498509291" />
         <var name="node" id="2081879850498509291" />
       </scope>
-      <unit id="2081879850498509291" at="17,0,29,0" name="jetbrains.mps.console.blCommand.editor.CustomScope_Actions$CustomScope_Actions_BACKSPACE" />
-      <unit id="2081879850498509291" at="13,0,30,0" name="jetbrains.mps.console.blCommand.editor.CustomScope_Actions" />
+      <unit id="2081879850498509291" at="17,0,29,0" name="jetbrains.mps.lang.smodel.query.editor.CustomScope_Actions$CustomScope_Actions_BACKSPACE" />
+      <unit id="2081879850498509291" at="13,0,30,0" name="jetbrains.mps.lang.smodel.query.editor.CustomScope_Actions" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/3492877759607928705">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/3492877759607928705">
     <file name="ModulesScope_Editor.java">
       <node id="3492877759607928705" at="27,79,28,63" concept="7" />
       <node id="3492877759607928705" at="30,89,31,96" concept="6" />
@@ -332,11 +238,11 @@
         <var name="elementNode" id="3492877759607928705" />
         <var name="listOwner" id="3492877759607928705" />
       </scope>
-      <unit id="3492877759607928705" at="73,0,118,0" name="jetbrains.mps.console.blCommand.editor.ModulesScope_Editor$moduleListHandler_szrfqn_d0" />
-      <unit id="3492877759607928705" at="26,0,128,0" name="jetbrains.mps.console.blCommand.editor.ModulesScope_Editor" />
+      <unit id="3492877759607928705" at="73,0,118,0" name="jetbrains.mps.lang.smodel.query.editor.ModulesScope_Editor$moduleListHandler_szrfqn_d0" />
+      <unit id="3492877759607928705" at="26,0,128,0" name="jetbrains.mps.lang.smodel.query.editor.ModulesScope_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/3492877759608408168">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/3492877759608408168">
     <file name="ModelScope_Editor.java">
       <node id="3492877759608408168" at="27,79,28,63" concept="7" />
       <node id="3492877759608408168" at="30,89,31,96" concept="6" />
@@ -524,11 +430,11 @@
         <var name="elementNode" id="3492877759608408168" />
         <var name="listOwner" id="3492877759608408168" />
       </scope>
-      <unit id="3492877759608408168" at="73,0,118,0" name="jetbrains.mps.console.blCommand.editor.ModelScope_Editor$modelListHandler_ukl9kw_d0" />
-      <unit id="3492877759608408168" at="26,0,128,0" name="jetbrains.mps.console.blCommand.editor.ModelScope_Editor" />
+      <unit id="3492877759608408168" at="73,0,118,0" name="jetbrains.mps.lang.smodel.query.editor.ModelScope_Editor$modelListHandler_ukl9kw_d0" />
+      <unit id="3492877759608408168" at="26,0,128,0" name="jetbrains.mps.lang.smodel.query.editor.ModelScope_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/3492877759611770151">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/3492877759611770151">
     <file name="CustomScope_Editor.java">
       <node id="3492877759611770151" at="18,79,19,63" concept="7" />
       <node id="3492877759611770151" at="21,89,22,96" concept="6" />
@@ -606,11 +512,11 @@
         <var name="editorContext" id="3492877759611770151" />
         <var name="node" id="3492877759611770151" />
       </scope>
-      <unit id="3492877759611770151" at="33,0,64,0" name="jetbrains.mps.console.blCommand.editor.CustomScope_Editor$scopeSingleRoleHandler_sm4cuc_a0" />
-      <unit id="3492877759611770151" at="17,0,65,0" name="jetbrains.mps.console.blCommand.editor.CustomScope_Editor" />
+      <unit id="3492877759611770151" at="33,0,64,0" name="jetbrains.mps.lang.smodel.query.editor.CustomScope_Editor$scopeSingleRoleHandler_sm4cuc_a0" />
+      <unit id="3492877759611770151" at="17,0,65,0" name="jetbrains.mps.lang.smodel.query.editor.CustomScope_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4143037406246603312">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4143037406246603312">
     <file name="QueryParameter_Actions.java">
       <node id="4143037406246603312" at="18,95,19,112" concept="2" />
       <node id="4143037406246603312" at="19,112,20,118" concept="2" />
@@ -693,12 +599,12 @@
         <var name="editorContext" id="4143037406246603312" />
         <var name="node" id="4143037406246603312" />
       </scope>
-      <unit id="4143037406246603312" at="22,0,46,0" name="jetbrains.mps.console.blCommand.editor.QueryParameter_Actions$QueryParameter_Actions_DELETE" />
-      <unit id="4143037406246603312" at="46,0,70,0" name="jetbrains.mps.console.blCommand.editor.QueryParameter_Actions$QueryParameter_Actions_BACKSPACE" />
-      <unit id="4143037406246603312" at="17,0,71,0" name="jetbrains.mps.console.blCommand.editor.QueryParameter_Actions" />
+      <unit id="4143037406246603312" at="22,0,46,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Actions$QueryParameter_Actions_DELETE" />
+      <unit id="4143037406246603312" at="46,0,70,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Actions$QueryParameter_Actions_BACKSPACE" />
+      <unit id="4143037406246603312" at="17,0,71,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Actions" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4234138103881610918">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4234138103881610918">
     <file name="WithStatement_Editor.java">
       <node id="4234138103881610918" at="25,79,26,63" concept="7" />
       <node id="4234138103881610918" at="28,89,29,97" concept="6" />
@@ -987,12 +893,12 @@
         <var name="editorContext" id="4234138103881610918" />
         <var name="node" id="4234138103881610918" />
       </scope>
-      <unit id="4234138103881610918" at="73,0,103,0" name="jetbrains.mps.console.blCommand.editor.WithStatement_Editor$scopeSingleRoleHandler_4f6do1_b0a0" />
-      <unit id="4234138103881610918" at="141,0,171,0" name="jetbrains.mps.console.blCommand.editor.WithStatement_Editor$stmtsSingleRoleHandler_4f6do1_b1a" />
-      <unit id="4234138103881610918" at="24,0,186,0" name="jetbrains.mps.console.blCommand.editor.WithStatement_Editor" />
+      <unit id="4234138103881610918" at="73,0,103,0" name="jetbrains.mps.lang.smodel.query.editor.WithStatement_Editor$scopeSingleRoleHandler_4f6do1_b0a0" />
+      <unit id="4234138103881610918" at="141,0,171,0" name="jetbrains.mps.lang.smodel.query.editor.WithStatement_Editor$stmtsSingleRoleHandler_4f6do1_b1a" />
+      <unit id="4234138103881610918" at="24,0,186,0" name="jetbrains.mps.lang.smodel.query.editor.WithStatement_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4307205004132277777">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4307205004132277777">
     <file name="QueryParameterList_Editor.java">
       <node id="4307205004132277777" at="26,79,27,63" concept="7" />
       <node id="4307205004132277777" at="29,89,30,96" concept="6" />
@@ -1109,11 +1015,11 @@
         <var name="elementNode" id="4307205004132277777" />
         <var name="listOwner" id="4307205004132277777" />
       </scope>
-      <unit id="4307205004132277777" at="44,0,90,0" name="jetbrains.mps.console.blCommand.editor.QueryParameterList_Editor$parameterListHandler_3efoba_a0" />
-      <unit id="4307205004132277777" at="25,0,91,0" name="jetbrains.mps.console.blCommand.editor.QueryParameterList_Editor" />
+      <unit id="4307205004132277777" at="44,0,90,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameterList_Editor$parameterListHandler_3efoba_a0" />
+      <unit id="4307205004132277777" at="25,0,91,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameterList_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4307205004132521953">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4307205004132521953">
     <file name="QueryParameterScope_Editor.java">
       <node id="4307205004132521953" at="24,79,25,63" concept="7" />
       <node id="4307205004132521953" at="27,89,28,96" concept="6" />
@@ -1231,11 +1137,11 @@
         <var name="child" id="4307205004132521953" />
         <var name="editorCell" id="4307205004132521953" />
       </scope>
-      <unit id="4307205004132521953" at="58,0,92,0" name="jetbrains.mps.console.blCommand.editor.QueryParameterScope_Editor$valueSingleRoleHandler_5iann0_c0" />
-      <unit id="4307205004132521953" at="23,0,93,0" name="jetbrains.mps.console.blCommand.editor.QueryParameterScope_Editor" />
+      <unit id="4307205004132521953" at="58,0,92,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameterScope_Editor$valueSingleRoleHandler_5iann0_c0" />
+      <unit id="4307205004132521953" at="23,0,93,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameterScope_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4307205004133424467">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4307205004133424467">
     <file name="QueryParameter_Editor.java">
       <node id="4307205004133424467" at="18,79,19,62" concept="7" />
       <node id="4307205004133424467" at="21,88,22,131" concept="6" />
@@ -1271,10 +1177,10 @@
         <var name="editorContext" id="4307205004133424467" />
         <var name="node" id="4307205004133424467" />
       </scope>
-      <unit id="4307205004133424467" at="17,0,37,0" name="jetbrains.mps.console.blCommand.editor.QueryParameter_Editor" />
+      <unit id="4307205004133424467" at="17,0,37,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameter_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4307205004134636899">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4307205004134636899">
     <file name="ScopeParameter_Editor.java">
       <node id="4307205004134636899" at="21,79,22,64" concept="7" />
       <node id="4307205004134636899" at="24,90,25,40" concept="6" />
@@ -1340,10 +1246,10 @@
         <var name="editorContext" id="4307205004134636899" />
         <var name="node" id="4307205004134636899" />
       </scope>
-      <unit id="4307205004134636899" at="20,0,56,0" name="jetbrains.mps.console.blCommand.editor.ScopeParameter_Editor" />
+      <unit id="4307205004134636899" at="20,0,56,0" name="jetbrains.mps.lang.smodel.query.editor.ScopeParameter_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4307205004135242359">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4307205004135242359">
     <file name="QueryExpression_EditorComponent.java">
       <node id="4307205004135242359" at="29,47,30,35" concept="7" />
       <node id="4307205004135242359" at="32,79,33,63" concept="7" />
@@ -1514,12 +1420,12 @@
         <var name="editorContext" id="4307205004135242359" />
         <var name="node" id="4307205004135242359" />
       </scope>
-      <unit id="4307205004136481971" at="53,0,60,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent$ReplaceWith_QueryExpression_cellMenu_adikco_a0a0" />
-      <unit id="4307205004135242359" at="87,0,117,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent$parameterSingleRoleHandler_adikco_b1a" />
-      <unit id="4307205004135242359" at="28,0,128,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent" />
+      <unit id="4307205004136481971" at="53,0,60,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent$ReplaceWith_QueryExpression_cellMenu_adikco_a0a0" />
+      <unit id="4307205004135242359" at="87,0,117,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent$parameterSingleRoleHandler_adikco_b1a" />
+      <unit id="4307205004135242359" at="28,0,128,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4307205004136299046">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4307205004136299046">
     <file name="QueryExpression_Editor.java">
       <node id="4307205004136299046" at="14,79,15,62" concept="7" />
       <node id="4307205004138907513" at="17,88,18,165" concept="6" />
@@ -1544,10 +1450,10 @@
         <var name="editorContext" id="4307205004138907513" />
         <var name="node" id="4307205004138907513" />
       </scope>
-      <unit id="4307205004136299046" at="13,0,27,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_Editor" />
+      <unit id="4307205004136299046" at="13,0,27,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4307205004140167141">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4307205004140167141">
     <file name="QueryExpression_KeyMap.java">
       <node id="4307205004140167141" at="21,35,22,42" concept="2" />
       <node id="4307205004140167141" at="22,42,23,24" concept="6" />
@@ -1617,11 +1523,11 @@
       <scope id="4307205004140167141" at="34,0,48,0">
         <var name="editorContext" id="4307205004140167141" />
       </scope>
-      <unit id="4307205004140167141" at="27,0,62,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_KeyMap$QueryExpression_KeyMap_Action0" />
-      <unit id="4307205004140167141" at="20,0,63,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_KeyMap" />
+      <unit id="4307205004140167141" at="27,0,62,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_KeyMap$QueryExpression_KeyMap_Action0" />
+      <unit id="4307205004140167141" at="20,0,63,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_KeyMap" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/4307205004140653645">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/4307205004140653645">
     <file name="QueryExpression_Actions.java">
       <node id="4307205004140653645" at="17,95,18,114" concept="2" />
       <node id="4307205004140653645" at="18,114,19,120" concept="2" />
@@ -1674,12 +1580,12 @@
         <var name="editorContext" id="4307205004140653645" />
         <var name="node" id="4307205004140653645" />
       </scope>
-      <unit id="4307205004140653645" at="21,0,34,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_Actions$QueryExpression_Actions_DELETE" />
-      <unit id="4307205004140653645" at="34,0,47,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_Actions$QueryExpression_Actions_BACKSPACE" />
-      <unit id="4307205004140653645" at="16,0,48,0" name="jetbrains.mps.console.blCommand.editor.QueryExpression_Actions" />
+      <unit id="4307205004140653645" at="21,0,34,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_Actions$QueryExpression_Actions_DELETE" />
+      <unit id="4307205004140653645" at="34,0,47,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_Actions$QueryExpression_Actions_BACKSPACE" />
+      <unit id="4307205004140653645" at="16,0,48,0" name="jetbrains.mps.lang.smodel.query.editor.QueryExpression_Actions" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/472307078068901889">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/472307078068901889">
     <file name="QueryParameterScopeValue_Actions.java">
       <node id="472307078068901889" at="17,95,18,132" concept="2" />
       <node id="472307078068901889" at="18,132,19,138" concept="2" />
@@ -1752,416 +1658,12 @@
         <var name="editorContext" id="472307078068901889" />
         <var name="node" id="472307078068901889" />
       </scope>
-      <unit id="472307078068901889" at="21,0,42,0" name="jetbrains.mps.console.blCommand.editor.QueryParameterScopeValue_Actions$QueryParameterScopeValue_Actions_DELETE" />
-      <unit id="472307078068901889" at="42,0,63,0" name="jetbrains.mps.console.blCommand.editor.QueryParameterScopeValue_Actions$QueryParameterScopeValue_Actions_BACKSPACE" />
-      <unit id="472307078068901889" at="16,0,64,0" name="jetbrains.mps.console.blCommand.editor.QueryParameterScopeValue_Actions" />
-    </file>
-  </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/5464054275389851713">
-    <file name="BLCommand_Editor.java">
-      <node id="5464054275389851713" at="25,79,26,64" concept="7" />
-      <node id="5464054275389851713" at="28,90,29,40" concept="6" />
-      <node id="5464054275389851713" at="29,40,30,94" concept="2" />
-      <node id="5464054275389851713" at="30,94,31,33" concept="6" />
-      <node id="5464054275389851713" at="32,31,33,72" concept="2" />
-      <node id="5464054275389851713" at="34,12,35,69" concept="2" />
-      <node id="5464054275389851713" at="36,5,37,67" concept="6" />
-      <node id="5464054275389851713" at="38,26,39,27" concept="2" />
-      <node id="5464054275389851713" at="40,5,41,79" concept="2" />
-      <node id="5464054275389851713" at="41,79,42,22" concept="7" />
-      <node id="6766461360451875779" at="44,96,45,212" concept="7" />
-      <node id="5464054275389851713" at="47,90,48,96" concept="6" />
-      <node id="5464054275389851713" at="48,96,49,49" concept="2" />
-      <node id="5464054275389851713" at="49,49,50,82" concept="0" />
-      <node id="5464054275389851713" at="49,49,50,82" concept="2" />
-      <node id="5464054275389851713" at="50,82,51,81" concept="0" />
-      <node id="5464054275389851713" at="50,82,51,81" concept="2" />
-      <node id="5464054275389851713" at="51,81,52,82" concept="0" />
-      <node id="5464054275389851713" at="51,81,52,82" concept="2" />
-      <node id="5464054275389851713" at="52,82,53,22" concept="7" />
-      <node id="6766461360451874005" at="55,89,56,87" concept="6" />
-      <node id="6766461360451874005" at="56,87,57,48" concept="2" />
-      <node id="6766461360451874005" at="57,48,58,34" concept="6" />
-      <node id="6766461360451874005" at="58,34,59,68" concept="2" />
-      <node id="6766461360451874005" at="59,68,60,63" concept="2" />
-      <node id="6766461360451874005" at="60,63,61,40" concept="2" />
-      <node id="6766461360451874005" at="61,40,62,34" concept="2" />
-      <node id="6766461360451874005" at="62,34,63,22" concept="7" />
-      <node id="5464054275389851713" at="65,88,66,244" concept="6" />
-      <node id="5464054275389851713" at="66,244,67,33" concept="7" />
-      <node id="5464054275389851713" at="70,119,71,49" concept="10" />
-      <node id="5464054275389851713" at="73,81,74,74" concept="6" />
-      <node id="5464054275389851713" at="74,74,75,41" concept="2" />
-      <node id="5464054275389851713" at="75,41,76,24" concept="7" />
-      <node id="5464054275389851713" at="78,69,79,137" concept="2" />
-      <node id="5464054275389851713" at="80,41,81,35" concept="2" />
-      <node id="5464054275389851713" at="82,7,83,36" concept="6" />
-      <node id="5464054275389851713" at="83,36,84,63" concept="2" />
-      <node id="5464054275389851713" at="84,63,85,65" concept="2" />
-      <node id="5464054275389851713" at="85,65,86,42" concept="2" />
-      <node id="5464054275389851713" at="91,44,92,54" concept="6" />
-      <node id="5464054275389851713" at="92,54,93,41" concept="2" />
-      <node id="5464054275389851713" at="93,41,94,40" concept="2" />
-      <node id="5464054275389851713" at="94,40,95,24" concept="7" />
-      <node id="5464054275389851713" at="98,40,99,25" concept="7" />
-      <node id="6766461360451874058" at="103,89,104,87" concept="6" />
-      <node id="6766461360451874058" at="104,87,105,48" concept="2" />
-      <node id="6766461360451874058" at="105,48,106,34" concept="6" />
-      <node id="6766461360451874058" at="106,34,107,69" concept="2" />
-      <node id="6766461360451874058" at="107,69,108,40" concept="2" />
-      <node id="6766461360451874058" at="108,40,109,34" concept="2" />
-      <node id="6766461360451874058" at="109,34,110,22" concept="7" />
-      <node id="5464054275389851713" at="112,87,113,243" concept="6" />
-      <node id="5464054275389851713" at="113,243,114,33" concept="7" />
-      <node id="5464054275389851713" at="117,118,118,49" concept="10" />
-      <node id="5464054275389851713" at="120,81,121,74" concept="6" />
-      <node id="5464054275389851713" at="121,74,122,41" concept="2" />
-      <node id="5464054275389851713" at="122,41,123,24" concept="7" />
-      <node id="5464054275389851713" at="125,69,126,137" concept="2" />
-      <node id="5464054275389851713" at="127,41,128,35" concept="2" />
-      <node id="5464054275389851713" at="134,44,135,54" concept="6" />
-      <node id="5464054275389851713" at="135,54,136,41" concept="2" />
-      <node id="5464054275389851713" at="136,41,137,40" concept="2" />
-      <node id="5464054275389851713" at="137,40,138,24" concept="7" />
-      <node id="5464054275389851713" at="141,40,142,25" concept="7" />
-      <node id="5464054275389851713" at="34,10,36,5" concept="0" />
-      <node id="5464054275389851713" at="25,0,28,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5464054275389851713" at="37,67,40,5" concept="4" />
-      <node id="6766461360451874079" at="44,0,47,0" concept="9" trace="renderingCondition_zc016d_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)Z" />
-      <node id="5464054275389851713" at="70,0,73,0" concept="1" trace="bodySingleRoleHandler_zc016d_b0a#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="5464054275389851713" at="79,137,82,7" concept="4" />
-      <node id="5464054275389851713" at="98,0,101,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="5464054275389851713" at="117,0,120,0" concept="1" trace="bodySingleRoleHandler_zc016d_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="5464054275389851713" at="126,137,129,7" concept="4" />
-      <node id="5464054275389851713" at="141,0,144,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="5464054275389851713" at="65,0,69,0" concept="5" trace="createRefNode_zc016d_b0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5464054275389851713" at="112,0,116,0" concept="5" trace="createRefNode_zc016d_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5464054275389851713" at="31,33,36,5" concept="4" />
-      <node id="5464054275389851713" at="73,0,78,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5464054275389851713" at="120,0,125,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5464054275389851713" at="125,0,131,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="5464054275389851713" at="90,0,97,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5464054275389851713" at="133,0,140,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5464054275389851713" at="47,0,55,0" concept="5" trace="createCollection_zc016d_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6766461360451874058" at="103,0,112,0" concept="5" trace="createConstant_zc016d_c0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6766461360451874005" at="55,0,65,0" concept="5" trace="createConstant_zc016d_a0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5464054275389851713" at="78,0,88,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="5464054275389851713" at="28,0,44,0" concept="5" trace="createAlternation_zc016d_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <scope id="5464054275389851713" at="25,79,26,64" />
-      <scope id="5464054275389851713" at="32,31,33,72" />
-      <scope id="5464054275389851713" at="34,12,35,69" />
-      <scope id="5464054275389851713" at="38,26,39,27" />
-      <scope id="6766461360451874080" at="44,96,45,212" />
-      <scope id="5464054275389851713" at="49,49,50,82" />
-      <scope id="5464054275389851713" at="50,82,51,81" />
-      <scope id="5464054275389851713" at="51,81,52,82" />
-      <scope id="5464054275389851713" at="70,119,71,49" />
-      <scope id="5464054275389851713" at="80,41,81,35" />
-      <scope id="5464054275389851713" at="98,40,99,25" />
-      <scope id="5464054275389851713" at="117,118,118,49" />
-      <scope id="5464054275389851713" at="127,41,128,35" />
-      <scope id="5464054275389851713" at="141,40,142,25" />
-      <scope id="5464054275389851713" at="65,88,67,33">
-        <var name="provider" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="112,87,114,33">
-        <var name="provider" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="25,0,28,0">
-        <var name="editorContext" id="5464054275389851713" />
-        <var name="node" id="5464054275389851713" />
-      </scope>
-      <scope id="6766461360451874079" at="44,0,47,0">
-        <var name="editorContext" id="6766461360451874079" />
-        <var name="node" id="6766461360451874079" />
-      </scope>
-      <scope id="5464054275389851713" at="70,0,73,0">
-        <var name="containmentLink" id="5464054275389851713" />
-        <var name="context" id="5464054275389851713" />
-        <var name="ownerNode" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="73,81,76,24">
-        <var name="editorCell" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="98,0,101,0" />
-      <scope id="5464054275389851713" at="117,0,120,0">
-        <var name="containmentLink" id="5464054275389851713" />
-        <var name="context" id="5464054275389851713" />
-        <var name="ownerNode" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="120,81,123,24">
-        <var name="editorCell" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="141,0,144,0" />
-      <scope id="5464054275389851713" at="65,0,69,0">
-        <var name="editorContext" id="5464054275389851713" />
-        <var name="node" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="91,44,95,24">
-        <var name="editorCell" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="112,0,116,0">
-        <var name="editorContext" id="5464054275389851713" />
-        <var name="node" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="125,69,129,7" />
-      <scope id="5464054275389851713" at="134,44,138,24">
-        <var name="editorCell" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="73,0,78,0">
-        <var name="child" id="5464054275389851713" />
-        <var name="editorContext" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="120,0,125,0">
-        <var name="child" id="5464054275389851713" />
-        <var name="editorContext" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="47,90,53,22">
-        <var name="editorCell" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="125,0,131,0">
-        <var name="child" id="5464054275389851713" />
-        <var name="editorCell" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="90,0,97,0" />
-      <scope id="6766461360451874058" at="103,89,110,22">
-        <var name="editorCell" id="6766461360451874058" />
-        <var name="style" id="6766461360451874058" />
-      </scope>
-      <scope id="5464054275389851713" at="133,0,140,0" />
-      <scope id="5464054275389851713" at="47,0,55,0">
-        <var name="editorContext" id="5464054275389851713" />
-        <var name="node" id="5464054275389851713" />
-      </scope>
-      <scope id="6766461360451874005" at="55,89,63,22">
-        <var name="editorCell" id="6766461360451874005" />
-        <var name="style" id="6766461360451874005" />
-      </scope>
-      <scope id="5464054275389851713" at="78,69,86,42">
-        <var name="style" id="5464054275389851713" />
-      </scope>
-      <scope id="6766461360451874058" at="103,0,112,0">
-        <var name="editorContext" id="6766461360451874058" />
-        <var name="node" id="6766461360451874058" />
-      </scope>
-      <scope id="6766461360451874005" at="55,0,65,0">
-        <var name="editorContext" id="6766461360451874005" />
-        <var name="node" id="6766461360451874005" />
-      </scope>
-      <scope id="5464054275389851713" at="78,0,88,0">
-        <var name="child" id="5464054275389851713" />
-        <var name="editorCell" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="28,90,42,22">
-        <var name="alternationCondition" id="5464054275389851713" />
-        <var name="bigCell" id="5464054275389851713" />
-        <var name="editorCell" id="5464054275389851713" />
-      </scope>
-      <scope id="5464054275389851713" at="28,0,44,0">
-        <var name="editorContext" id="5464054275389851713" />
-        <var name="node" id="5464054275389851713" />
-      </scope>
-      <unit id="5464054275389851713" at="116,0,146,0" name="jetbrains.mps.console.blCommand.editor.BLCommand_Editor$bodySingleRoleHandler_zc016d_a0" />
-      <unit id="5464054275389851713" at="69,0,103,0" name="jetbrains.mps.console.blCommand.editor.BLCommand_Editor$bodySingleRoleHandler_zc016d_b0a" />
-      <unit id="5464054275389851713" at="24,0,147,0" name="jetbrains.mps.console.blCommand.editor.BLCommand_Editor" />
-    </file>
-  </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/6558068108108748448">
-    <file name="ExceptionHolder_Editor.java">
-      <node id="6558068108108748448" at="20,79,21,63" concept="7" />
-      <node id="6558068108108748448" at="23,89,24,99" concept="6" />
-      <node id="6558068108108748448" at="24,99,25,48" concept="2" />
-      <node id="6558068108108748448" at="25,48,26,28" concept="2" />
-      <node id="6558068108108748448" at="26,28,27,34" concept="6" />
-      <node id="6558068108108748448" at="27,34,28,111" concept="2" />
-      <node id="6558068108108748448" at="28,111,29,40" concept="2" />
-      <node id="6558068108108748448" at="29,40,30,79" concept="2" />
-      <node id="6558068108108748448" at="30,79,31,81" concept="0" />
-      <node id="6558068108108748448" at="30,79,31,81" concept="2" />
-      <node id="6558068108108748448" at="31,81,32,82" concept="0" />
-      <node id="6558068108108748448" at="31,81,32,82" concept="2" />
-      <node id="6558068108108748448" at="32,82,33,22" concept="7" />
-      <node id="6558068108108761659" at="35,88,36,96" concept="6" />
-      <node id="6558068108108761659" at="36,96,37,47" concept="2" />
-      <node id="6558068108108761659" at="37,47,38,34" concept="2" />
-      <node id="6558068108108761659" at="38,34,39,22" concept="7" />
-      <node id="6558068108108763240" at="41,89,42,153" concept="6" />
-      <node id="6558068108108763240" at="42,153,43,22" concept="7" />
-      <node id="6558068108108748448" at="20,0,23,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6558068108108763240" at="41,0,45,0" concept="5" trace="createComponent_hbc894_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6558068108108761659" at="35,0,41,0" concept="5" trace="createConstant_hbc894_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6558068108108748448" at="23,0,35,0" concept="5" trace="createCollection_hbc894_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <scope id="6558068108108748448" at="20,79,21,63" />
-      <scope id="6558068108108748448" at="30,79,31,81" />
-      <scope id="6558068108108748448" at="31,81,32,82" />
-      <scope id="6558068108108763240" at="41,89,43,22">
-        <var name="editorCell" id="6558068108108763240" />
-      </scope>
-      <scope id="6558068108108748448" at="20,0,23,0">
-        <var name="editorContext" id="6558068108108748448" />
-        <var name="node" id="6558068108108748448" />
-      </scope>
-      <scope id="6558068108108761659" at="35,88,39,22">
-        <var name="editorCell" id="6558068108108761659" />
-      </scope>
-      <scope id="6558068108108763240" at="41,0,45,0">
-        <var name="editorContext" id="6558068108108763240" />
-        <var name="node" id="6558068108108763240" />
-      </scope>
-      <scope id="6558068108108761659" at="35,0,41,0">
-        <var name="editorContext" id="6558068108108761659" />
-        <var name="node" id="6558068108108761659" />
-      </scope>
-      <scope id="6558068108108748448" at="23,89,33,22">
-        <var name="editorCell" id="6558068108108748448" />
-        <var name="style" id="6558068108108748448" />
-      </scope>
-      <scope id="6558068108108748448" at="23,0,35,0">
-        <var name="editorContext" id="6558068108108748448" />
-        <var name="node" id="6558068108108748448" />
-      </scope>
-      <unit id="6558068108108748448" at="19,0,46,0" name="jetbrains.mps.console.blCommand.editor.ExceptionHolder_Editor" />
-    </file>
-  </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/7656298970875048514">
-    <file name="AbstractPrintExpression_Actions.java">
-      <node id="7656298970875048514" at="15,95,16,130" concept="2" />
-      <node id="7656298970875048514" at="16,130,17,136" concept="2" />
-      <node id="7656298970875048514" at="20,0,21,0" concept="3" trace="myNode" />
-      <node id="7656298970875048514" at="21,63,22,25" concept="2" />
-      <node id="7656298970875048514" at="24,54,25,56" concept="2" />
-      <node id="7656298970875141821" at="27,75,28,213" concept="2" />
-      <node id="7656298970875048514" at="32,0,33,0" concept="3" trace="myNode" />
-      <node id="7656298970875048514" at="33,66,34,25" concept="2" />
-      <node id="7656298970875048514" at="36,54,37,56" concept="2" />
-      <node id="7656298970875141821" at="39,75,40,213" concept="2" />
-      <node id="7656298970875048514" at="21,0,24,0" concept="1" trace="AbstractPrintExpression_Actions_DELETE#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7656298970875048514" at="24,0,27,0" concept="5" trace="execute#(Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="7656298970875048514" at="27,0,30,0" concept="5" trace="execute_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7656298970875048514" at="33,0,36,0" concept="1" trace="AbstractPrintExpression_Actions_BACKSPACE#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7656298970875048514" at="36,0,39,0" concept="5" trace="execute#(Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="7656298970875048514" at="39,0,42,0" concept="5" trace="execute_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7656298970875048514" at="15,0,19,0" concept="9" trace="setCellActions#(Ljetbrains/mps/openapi/editor/cells/EditorCell;Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <scope id="7656298970875048514" at="21,63,22,25" />
-      <scope id="7656298970875048514" at="24,54,25,56" />
-      <scope id="7656298970875048758" at="27,75,28,213" />
-      <scope id="7656298970875048514" at="33,66,34,25" />
-      <scope id="7656298970875048514" at="36,54,37,56" />
-      <scope id="7656298970875048758" at="39,75,40,213" />
-      <scope id="7656298970875048514" at="15,95,17,136" />
-      <scope id="7656298970875048514" at="21,0,24,0">
-        <var name="node" id="7656298970875048514" />
-      </scope>
-      <scope id="7656298970875048514" at="24,0,27,0">
-        <var name="editorContext" id="7656298970875048514" />
-      </scope>
-      <scope id="7656298970875048514" at="27,0,30,0">
-        <var name="editorContext" id="7656298970875048514" />
-        <var name="node" id="7656298970875048514" />
-      </scope>
-      <scope id="7656298970875048514" at="33,0,36,0">
-        <var name="node" id="7656298970875048514" />
-      </scope>
-      <scope id="7656298970875048514" at="36,0,39,0">
-        <var name="editorContext" id="7656298970875048514" />
-      </scope>
-      <scope id="7656298970875048514" at="39,0,42,0">
-        <var name="editorContext" id="7656298970875048514" />
-        <var name="node" id="7656298970875048514" />
-      </scope>
-      <scope id="7656298970875048514" at="15,0,19,0">
-        <var name="context" id="7656298970875048514" />
-        <var name="editorCell" id="7656298970875048514" />
-        <var name="node" id="7656298970875048514" />
-      </scope>
-      <unit id="7656298970875048514" at="19,0,31,0" name="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Actions$AbstractPrintExpression_Actions_DELETE" />
-      <unit id="7656298970875048514" at="31,0,43,0" name="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Actions$AbstractPrintExpression_Actions_BACKSPACE" />
-      <unit id="7656298970875048514" at="14,0,44,0" name="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Actions" />
-    </file>
-  </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/7656298970878225878">
-    <file name="BLExpression_Editor.java">
-      <node id="7656298970878225878" at="18,79,19,63" concept="7" />
-      <node id="7656298970878225878" at="21,89,22,96" concept="6" />
-      <node id="7656298970878225878" at="22,96,23,48" concept="2" />
-      <node id="7656298970878225878" at="23,48,24,28" concept="2" />
-      <node id="7656298970878225878" at="24,28,25,79" concept="2" />
-      <node id="7656298970878225878" at="25,79,26,80" concept="0" />
-      <node id="7656298970878225878" at="25,79,26,80" concept="2" />
-      <node id="7656298970878225878" at="26,80,27,22" concept="7" />
-      <node id="7656298970878225878" at="29,87,30,258" concept="6" />
-      <node id="7656298970878225878" at="30,258,31,33" concept="7" />
-      <node id="7656298970878225878" at="34,124,35,49" concept="10" />
-      <node id="7656298970878225878" at="37,81,38,74" concept="6" />
-      <node id="7656298970878225878" at="38,74,39,41" concept="2" />
-      <node id="7656298970878225878" at="39,41,40,24" concept="7" />
-      <node id="7656298970878225878" at="42,69,43,137" concept="2" />
-      <node id="7656298970878225878" at="44,41,45,41" concept="2" />
-      <node id="7656298970878225878" at="46,7,47,84" concept="2" />
-      <node id="7656298970878225878" at="52,44,53,54" concept="6" />
-      <node id="7656298970878225878" at="53,54,54,47" concept="2" />
-      <node id="7656298970878225878" at="54,47,55,40" concept="2" />
-      <node id="7656298970878225878" at="55,40,56,24" concept="7" />
-      <node id="7656298970878225878" at="59,40,60,31" concept="7" />
-      <node id="7656298970878225878" at="18,0,21,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7656298970878225878" at="34,0,37,0" concept="1" trace="expressionSingleRoleHandler_f3ggz9_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="7656298970878225878" at="43,137,46,7" concept="4" />
-      <node id="7656298970878225878" at="59,0,62,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="7656298970878225878" at="29,0,33,0" concept="5" trace="createRefNode_f3ggz9_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7656298970878225878" at="37,0,42,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7656298970878225878" at="42,0,49,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="7656298970878225878" at="51,0,58,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7656298970878225878" at="21,0,29,0" concept="5" trace="createCollection_f3ggz9_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <scope id="7656298970878225878" at="18,79,19,63" />
-      <scope id="7656298970878225878" at="25,79,26,80" />
-      <scope id="7656298970878225878" at="34,124,35,49" />
-      <scope id="7656298970878225878" at="44,41,45,41" />
-      <scope id="7656298970878225878" at="59,40,60,31" />
-      <scope id="7656298970878225878" at="29,87,31,33">
-        <var name="provider" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="18,0,21,0">
-        <var name="editorContext" id="7656298970878225878" />
-        <var name="node" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="34,0,37,0">
-        <var name="containmentLink" id="7656298970878225878" />
-        <var name="context" id="7656298970878225878" />
-        <var name="ownerNode" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="37,81,40,24">
-        <var name="editorCell" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="59,0,62,0" />
-      <scope id="7656298970878225878" at="29,0,33,0">
-        <var name="editorContext" id="7656298970878225878" />
-        <var name="node" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="52,44,56,24">
-        <var name="editorCell" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="37,0,42,0">
-        <var name="child" id="7656298970878225878" />
-        <var name="editorContext" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="42,69,47,84" />
-      <scope id="7656298970878225878" at="21,89,27,22">
-        <var name="editorCell" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="42,0,49,0">
-        <var name="child" id="7656298970878225878" />
-        <var name="editorCell" id="7656298970878225878" />
-      </scope>
-      <scope id="7656298970878225878" at="51,0,58,0" />
-      <scope id="7656298970878225878" at="21,0,29,0">
-        <var name="editorContext" id="7656298970878225878" />
-        <var name="node" id="7656298970878225878" />
-      </scope>
-      <unit id="7656298970878225878" at="33,0,64,0" name="jetbrains.mps.console.blCommand.editor.BLExpression_Editor$expressionSingleRoleHandler_f3ggz9_a0" />
-      <unit id="7656298970878225878" at="17,0,65,0" name="jetbrains.mps.console.blCommand.editor.BLExpression_Editor" />
+      <unit id="472307078068901889" at="21,0,42,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameterScopeValue_Actions$QueryParameterScopeValue_Actions_DELETE" />
+      <unit id="472307078068901889" at="42,0,63,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameterScopeValue_Actions$QueryParameterScopeValue_Actions_BACKSPACE" />
+      <unit id="472307078068901889" at="16,0,64,0" name="jetbrains.mps.lang.smodel.query.editor.QueryParameterScopeValue_Actions" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/7738379549905408562">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/7738379549905408562">
     <file name="UsagesExpression_Editor.java">
       <node id="7738379549905408562" at="22,79,23,63" concept="7" />
       <node id="7738379549905408562" at="25,89,26,96" concept="6" />
@@ -2289,11 +1791,11 @@
         <var name="editorContext" id="7738379549905408562" />
         <var name="node" id="7738379549905408562" />
       </scope>
-      <unit id="7738379549905408562" at="53,0,83,0" name="jetbrains.mps.console.blCommand.editor.UsagesExpression_Editor$nodeSingleRoleHandler_ikz501_c0" />
-      <unit id="7738379549905408562" at="21,0,93,0" name="jetbrains.mps.console.blCommand.editor.UsagesExpression_Editor" />
+      <unit id="7738379549905408562" at="53,0,83,0" name="jetbrains.mps.lang.smodel.query.editor.UsagesExpression_Editor$nodeSingleRoleHandler_ikz501_c0" />
+      <unit id="7738379549905408562" at="21,0,93,0" name="jetbrains.mps.lang.smodel.query.editor.UsagesExpression_Editor" />
     </file>
   </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/7738379549910147461">
+  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)/7738379549910147461">
     <file name="InstancesExpression_Editor.java">
       <node id="7738379549910147461" at="22,79,23,63" concept="7" />
       <node id="7738379549910147461" at="25,89,26,96" concept="6" />
@@ -2421,174 +1923,8 @@
         <var name="editorContext" id="7738379549910147461" />
         <var name="node" id="7738379549910147461" />
       </scope>
-      <unit id="7738379549910147461" at="53,0,83,0" name="jetbrains.mps.console.blCommand.editor.InstancesExpression_Editor$conceptArgSingleRoleHandler_le77e3_c0" />
-      <unit id="7738379549910147461" at="21,0,93,0" name="jetbrains.mps.console.blCommand.editor.InstancesExpression_Editor" />
-    </file>
-  </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/7820875636626932805">
-    <file name="AbstractPrintExpression_Editor.java">
-      <node id="7820875636626932805" at="22,79,23,63" concept="7" />
-      <node id="7820875636626932805" at="25,89,26,96" concept="6" />
-      <node id="7820875636626932805" at="26,96,27,48" concept="2" />
-      <node id="7820875636626932805" at="27,48,28,28" concept="2" />
-      <node id="7820875636626932805" at="28,28,29,79" concept="2" />
-      <node id="7820875636626932805" at="29,79,30,82" concept="0" />
-      <node id="7820875636626932805" at="29,79,30,82" concept="2" />
-      <node id="7820875636626932805" at="30,82,31,80" concept="0" />
-      <node id="7820875636626932805" at="30,82,31,80" concept="2" />
-      <node id="7820875636626932805" at="31,80,32,22" concept="7" />
-      <node id="7820875636626932805" at="34,89,35,131" concept="6" />
-      <node id="7820875636626932805" at="35,131,36,84" concept="2" />
-      <node id="7820875636626932805" at="36,84,37,229" concept="2" />
-      <node id="7820875636626932805" at="37,229,38,22" concept="7" />
-      <node id="7284872370240936100" at="43,47,44,81" concept="7" />
-      <node id="7820875636626932805" at="47,87,48,261" concept="6" />
-      <node id="7820875636626932805" at="48,261,49,33" concept="7" />
-      <node id="7820875636626932805" at="52,120,53,49" concept="10" />
-      <node id="7820875636626932805" at="55,81,56,74" concept="6" />
-      <node id="7820875636626932805" at="56,74,57,41" concept="2" />
-      <node id="7820875636626932805" at="57,41,58,24" concept="7" />
-      <node id="7820875636626932805" at="60,69,61,137" concept="2" />
-      <node id="7820875636626932805" at="62,41,63,37" concept="2" />
-      <node id="7820875636626932805" at="69,44,70,54" concept="6" />
-      <node id="7820875636626932805" at="70,54,71,43" concept="2" />
-      <node id="7820875636626932805" at="71,43,72,40" concept="2" />
-      <node id="7820875636626932805" at="72,40,73,24" concept="7" />
-      <node id="7820875636626932805" at="76,40,77,27" concept="7" />
-      <node id="7284872370240936100" at="41,0,43,0" concept="1" trace="ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0#()V" />
-      <node id="7820875636626932805" at="22,0,25,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7284872370240936100" at="43,0,46,0" concept="5" trace="getReplacementConceptName#()Ljava/lang/String;" />
-      <node id="7820875636626932805" at="52,0,55,0" concept="1" trace="objectSingleRoleHandler_9ckmec_b0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="7820875636626932805" at="61,137,64,7" concept="4" />
-      <node id="7820875636626932805" at="76,0,79,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="7820875636626932805" at="47,0,51,0" concept="5" trace="createRefNode_9ckmec_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7820875636626932805" at="55,0,60,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7820875636626932805" at="34,0,40,0" concept="5" trace="createComponent_9ckmec_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7820875636626932805" at="60,0,66,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="7820875636626932805" at="68,0,75,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="7820875636626932805" at="25,0,34,0" concept="5" trace="createCollection_9ckmec_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <scope id="7284872370240936100" at="41,71,41,71" />
-      <scope id="7820875636626932805" at="22,79,23,63" />
-      <scope id="7820875636626932805" at="29,79,30,82" />
-      <scope id="7820875636626932805" at="30,82,31,80" />
-      <scope id="7284872370240936100" at="43,47,44,81" />
-      <scope id="7820875636626932805" at="52,120,53,49" />
-      <scope id="7820875636626932805" at="62,41,63,37" />
-      <scope id="7820875636626932805" at="76,40,77,27" />
-      <scope id="7284872370240936100" at="41,0,43,0" />
-      <scope id="7820875636626932805" at="47,87,49,33">
-        <var name="provider" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="22,0,25,0">
-        <var name="editorContext" id="7820875636626932805" />
-        <var name="node" id="7820875636626932805" />
-      </scope>
-      <scope id="7284872370240936100" at="43,0,46,0" />
-      <scope id="7820875636626932805" at="52,0,55,0">
-        <var name="containmentLink" id="7820875636626932805" />
-        <var name="context" id="7820875636626932805" />
-        <var name="ownerNode" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="55,81,58,24">
-        <var name="editorCell" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="76,0,79,0" />
-      <scope id="7820875636626932805" at="34,89,38,22">
-        <var name="editorCell" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="47,0,51,0">
-        <var name="editorContext" id="7820875636626932805" />
-        <var name="node" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="60,69,64,7" />
-      <scope id="7820875636626932805" at="69,44,73,24">
-        <var name="editorCell" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="55,0,60,0">
-        <var name="child" id="7820875636626932805" />
-        <var name="editorContext" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="34,0,40,0">
-        <var name="editorContext" id="7820875636626932805" />
-        <var name="node" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="60,0,66,0">
-        <var name="child" id="7820875636626932805" />
-        <var name="editorCell" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="25,89,32,22">
-        <var name="editorCell" id="7820875636626932805" />
-      </scope>
-      <scope id="7820875636626932805" at="68,0,75,0" />
-      <scope id="7820875636626932805" at="25,0,34,0">
-        <var name="editorContext" id="7820875636626932805" />
-        <var name="node" id="7820875636626932805" />
-      </scope>
-      <unit id="7284872370240936100" at="40,0,47,0" name="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Editor$ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0" />
-      <unit id="7820875636626932805" at="51,0,81,0" name="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Editor$objectSingleRoleHandler_9ckmec_b0" />
-      <unit id="7820875636626932805" at="21,0,82,0" name="jetbrains.mps.console.blCommand.editor.AbstractPrintExpression_Editor" />
-    </file>
-  </root>
-  <root nodeRef="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)/963101385307642090">
-    <file name="BLExpression_Actions.java">
-      <node id="963101385307642090" at="17,95,18,108" concept="2" />
-      <node id="963101385307642090" at="18,108,19,114" concept="2" />
-      <node id="963101385307642090" at="22,0,23,0" concept="3" trace="myNode" />
-      <node id="963101385307642090" at="23,52,24,25" concept="2" />
-      <node id="963101385307642090" at="26,54,27,56" concept="2" />
-      <node id="963101385307663766" at="29,75,30,241" concept="6" />
-      <node id="963101385308010106" at="30,241,31,385" concept="2" />
-      <node id="963101385308074676" at="31,385,32,510" concept="2" />
-      <node id="963101385308310191" at="32,510,33,850" concept="2" />
-      <node id="963101385307664028" at="33,850,34,58" concept="2" />
-      <node id="963101385307642090" at="38,0,39,0" concept="3" trace="myNode" />
-      <node id="963101385307642090" at="39,55,40,25" concept="2" />
-      <node id="963101385307642090" at="42,54,43,56" concept="2" />
-      <node id="6891027939994644155" at="45,75,46,39" concept="2" />
-      <node id="963101385307642090" at="23,0,26,0" concept="1" trace="BLExpression_Actions_INSERT#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="963101385307642090" at="26,0,29,0" concept="5" trace="execute#(Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="963101385307642090" at="39,0,42,0" concept="1" trace="BLExpression_Actions_BACKSPACE#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="963101385307642090" at="42,0,45,0" concept="5" trace="execute#(Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="963101385307642090" at="45,0,48,0" concept="5" trace="execute_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="963101385307642090" at="17,0,21,0" concept="9" trace="setCellActions#(Ljetbrains/mps/openapi/editor/cells/EditorCell;Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="963101385307642090" at="29,0,36,0" concept="5" trace="execute_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <scope id="963101385307642090" at="23,52,24,25" />
-      <scope id="963101385307642090" at="26,54,27,56" />
-      <scope id="963101385307642090" at="39,55,40,25" />
-      <scope id="963101385307642090" at="42,54,43,56" />
-      <scope id="6891027939994643975" at="45,75,46,39" />
-      <scope id="963101385307642090" at="17,95,19,114" />
-      <scope id="963101385307642090" at="23,0,26,0">
-        <var name="node" id="963101385307642090" />
-      </scope>
-      <scope id="963101385307642090" at="26,0,29,0">
-        <var name="editorContext" id="963101385307642090" />
-      </scope>
-      <scope id="963101385307642090" at="39,0,42,0">
-        <var name="node" id="963101385307642090" />
-      </scope>
-      <scope id="963101385307642090" at="42,0,45,0">
-        <var name="editorContext" id="963101385307642090" />
-      </scope>
-      <scope id="963101385307642090" at="45,0,48,0">
-        <var name="editorContext" id="963101385307642090" />
-        <var name="node" id="963101385307642090" />
-      </scope>
-      <scope id="963101385307642090" at="17,0,21,0">
-        <var name="context" id="963101385307642090" />
-        <var name="editorCell" id="963101385307642090" />
-        <var name="node" id="963101385307642090" />
-      </scope>
-      <scope id="963101385307643996" at="29,75,34,58">
-        <var name="blCommand" id="963101385307663769" />
-      </scope>
-      <scope id="963101385307642090" at="29,0,36,0">
-        <var name="editorContext" id="963101385307642090" />
-        <var name="node" id="963101385307642090" />
-      </scope>
-      <unit id="963101385307642090" at="37,0,49,0" name="jetbrains.mps.console.blCommand.editor.BLExpression_Actions$BLExpression_Actions_BACKSPACE" />
-      <unit id="963101385307642090" at="21,0,37,0" name="jetbrains.mps.console.blCommand.editor.BLExpression_Actions$BLExpression_Actions_INSERT" />
-      <unit id="963101385307642090" at="16,0,50,0" name="jetbrains.mps.console.blCommand.editor.BLExpression_Actions" />
+      <unit id="7738379549910147461" at="53,0,83,0" name="jetbrains.mps.lang.smodel.query.editor.InstancesExpression_Editor$conceptArgSingleRoleHandler_le77e3_c0" />
+      <unit id="7738379549910147461" at="21,0,93,0" name="jetbrains.mps.lang.smodel.query.editor.InstancesExpression_Editor" />
     </file>
   </root>
 </debug-info>
diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java
new file mode 100644
index 000000000000..5bed3964d6c0
--- /dev/null
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java
@@ -0,0 +1,90 @@
+package jetbrains.mps.lang.smodel.query.structure;
+
+/*Generated by MPS */
+
+import jetbrains.mps.smodel.runtime.BaseStructureAspectDescriptor;
+import jetbrains.mps.smodel.runtime.ConceptDescriptor;
+import jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder;
+import jetbrains.mps.smodel.adapter.ids.MetaIdFactory;
+import java.util.Collection;
+import java.util.Arrays;
+import org.jetbrains.annotations.Nullable;
+
+public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
+
+  /*package*/ final ConceptDescriptor myConceptCustomScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.CustomScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759611770126L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"scope"}, new boolean[]{false}).alias("custom", "? extends SearchScope").create();
+  /*package*/ final ConceptDescriptor myConceptExpressionHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).interface_().parents("jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create();
+  /*package*/ final ConceptDescriptor myConceptGlobalScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.GlobalScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("global", "").create();
+  /*package*/ final ConceptDescriptor myConceptHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.HelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).interface_().create();
+  /*package*/ final ConceptDescriptor myConceptInstancesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.InstancesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(7738379549910147342L, "conceptArg", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x118f285e4f7L), false, false, false)).children(new String[]{"conceptArg"}, new boolean[]{false}).alias("#instances", "instances of a concept in scope").create();
+  /*package*/ final ConceptDescriptor myConceptModelScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModelScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759608408143L, "model", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"model"}, new boolean[]{true}).alias("models", "").create();
+  /*package*/ final ConceptDescriptor myConceptModelsExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModelsExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675beab2dL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#models", "all models in scope").create();
+  /*package*/ final ConceptDescriptor myConceptModulesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModulesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675cc2262L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#modules", "all modules in scope").create();
+  /*package*/ final ConceptDescriptor myConceptModulesScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModulesScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759607928680L, "module", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"module"}, new boolean[]{true}).alias("modules", "").create();
+  /*package*/ final ConceptDescriptor myConceptNodesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.NodesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#nodes", "all nodes in scope").create();
+  /*package*/ final ConceptDescriptor myConceptOperationHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create();
+  /*package*/ final ConceptDescriptor myConceptQueryExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004132279624L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L), false, false, false)).children(new String[]{"parameter"}, new boolean[]{false}).abstract_().create();
+  /*package*/ final ConceptDescriptor myConceptQueryParameter = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create();
+  /*package*/ final ConceptDescriptor myConceptQueryParameterIncludeReadOnly = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.lang.smodel.query.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("r/o+", "include read only").create();
+  /*package*/ final ConceptDescriptor myConceptQueryParameterList = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameterList", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004141421222L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L), true, true, false)).children(new String[]{"parameter"}, new boolean[]{true}).alias("< .. >", "").create();
+  /*package*/ final ConceptDescriptor myConceptQueryParameterScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.lang.smodel.query.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004134707081L, "value", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL), false, false, false)).children(new String[]{"value"}, new boolean[]{false}).alias("scope", "used search scope").create();
+  /*package*/ final ConceptDescriptor myConceptReferencesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#references", "all references in scope").create();
+  /*package*/ final ConceptDescriptor myConceptScopeParameter = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ScopeParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create();
+  /*package*/ final ConceptDescriptor myConceptUsagesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.UsagesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963816172L, "node", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"node"}, new boolean[]{false}).alias("#usages", "direct references to a node in scope").create();
+  /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.WithStatement", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create();
+
+  @Override
+  public Collection<ConceptDescriptor> getDescriptors() {
+    return Arrays.asList(myConceptCustomScope, myConceptExpressionHelpProvider, myConceptGlobalScope, myConceptHelpProvider, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptOperationHelpProvider, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptUsagesExpression, myConceptWithStatement);
+  }
+
+  @Override
+  @Nullable
+  public ConceptDescriptor getDescriptor(String conceptFqName) {
+    switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0y, conceptFqName)) {
+      case 0:
+        return myConceptCustomScope;
+      case 1:
+        return myConceptExpressionHelpProvider;
+      case 2:
+        return myConceptGlobalScope;
+      case 3:
+        return myConceptHelpProvider;
+      case 4:
+        return myConceptInstancesExpression;
+      case 5:
+        return myConceptModelScope;
+      case 6:
+        return myConceptModelsExpression;
+      case 7:
+        return myConceptModulesExpression;
+      case 8:
+        return myConceptModulesScope;
+      case 9:
+        return myConceptNodesExpression;
+      case 10:
+        return myConceptOperationHelpProvider;
+      case 11:
+        return myConceptQueryExpression;
+      case 12:
+        return myConceptQueryParameter;
+      case 13:
+        return myConceptQueryParameterIncludeReadOnly;
+      case 14:
+        return myConceptQueryParameterList;
+      case 15:
+        return myConceptQueryParameterScope;
+      case 16:
+        return myConceptReferencesExpression;
+      case 17:
+        return myConceptScopeParameter;
+      case 18:
+        return myConceptUsagesExpression;
+      case 19:
+        return myConceptWithStatement;
+      default:
+        return null;
+    }
+  }
+  private static String[] stringSwitchCases_1htk8d_a0a0y = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.HelpProvider", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"};
+}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info
similarity index 58%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info
index 4b69df4dddfb..82a285c78b60 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info
@@ -2,7 +2,7 @@
 <debug-info>
   <root>
     <file name="StructureAspectDescriptor.java">
-      <unit at="13,0,124,0" name="jetbrains.mps.console.blCommand.structure.StructureAspectDescriptor" />
+      <unit at="13,0,91,0" name="jetbrains.mps.lang.smodel.query.structure.StructureAspectDescriptor" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/trace.info
similarity index 69%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/trace.info
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/trace.info
index f58065bb5187..f97bab381259 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/trace.info
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/trace.info
@@ -2,7 +2,7 @@
 <debug-info>
   <root>
     <file name="Language.java">
-      <unit at="22,0,72,0" name="jetbrains.mps.console.blCommand.Language" />
+      <unit at="22,0,72,0" name="jetbrains.mps.lang.smodel.query.Language" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java
similarity index 61%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java
index 12bb9a68fa37..b6f8eca610d8 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -8,10 +8,6 @@
 
 public class TypesystemDescriptor extends BaseHelginsDescriptor {
   public TypesystemDescriptor() {
-    {
-      InferenceRule_Runtime inferenceRule = new typeof_AbstractPrintExpression_InferenceRule();
-      this.myInferenceRules.add(inferenceRule);
-    }
     {
       InferenceRule_Runtime inferenceRule = new typeof_CustomScope_InferenceRule();
       this.myInferenceRules.add(inferenceRule);
@@ -40,30 +36,6 @@ public TypesystemDescriptor() {
       InferenceRule_Runtime inferenceRule = new typeof_NodesExpresiion_InferenceRule();
       this.myInferenceRules.add(inferenceRule);
     }
-    {
-      InferenceRule_Runtime inferenceRule = new typeof_PrintExpression_InferenceRule();
-      this.myInferenceRules.add(inferenceRule);
-    }
-    {
-      InferenceRule_Runtime inferenceRule = new typeof_PrintNodeExpression_InferenceRule();
-      this.myInferenceRules.add(inferenceRule);
-    }
-    {
-      InferenceRule_Runtime inferenceRule = new typeof_PrintNodeReferenceExpression_InferenceRule();
-      this.myInferenceRules.add(inferenceRule);
-    }
-    {
-      InferenceRule_Runtime inferenceRule = new typeof_PrintSequenceExpression_InferenceRule();
-      this.myInferenceRules.add(inferenceRule);
-    }
-    {
-      InferenceRule_Runtime inferenceRule = new typeof_PrintTextExpression_InferenceRule();
-      this.myInferenceRules.add(inferenceRule);
-    }
-    {
-      InferenceRule_Runtime inferenceRule = new typeof_ProjectExpression_InferenceRule();
-      this.myInferenceRules.add(inferenceRule);
-    }
     {
       InferenceRule_Runtime inferenceRule = new typeof_ReferencesExpression_InferenceRule();
       this.myInferenceRules.add(inferenceRule);
@@ -72,10 +44,6 @@ public TypesystemDescriptor() {
       InferenceRule_Runtime inferenceRule = new typeof_ScopeProvider_InferenceRule();
       this.myInferenceRules.add(inferenceRule);
     }
-    {
-      InferenceRule_Runtime inferenceRule = new typeof_ShowExpression_InferenceRule();
-      this.myInferenceRules.add(inferenceRule);
-    }
     {
       InferenceRule_Runtime inferenceRule = new typeof_UsagesExpression_InferenceRule();
       this.myInferenceRules.add(inferenceRule);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java
similarity index 82%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java
index bc874ec2499c..bbe4cfa90de6 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -9,6 +9,7 @@
 import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus;
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
 import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import org.jetbrains.mps.openapi.language.SConcept;
 import jetbrains.mps.internal.collections.runtime.Sequence;
 import jetbrains.mps.internal.collections.runtime.ISelector;
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
@@ -26,16 +27,16 @@ public check_QueryDuplicatedParameters_NonTypesystemRule() {
   }
   public void applyRule(final SNode queryParameterList, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     final Iterable<SNode> parameters = SLinkOperations.getChildren(queryParameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"));
-    Iterable<SNode> parameterConcepts = Sequence.fromIterable(parameters).select(new ISelector<SNode, SNode>() {
-      public SNode select(SNode it) {
-        return SNodeOperations.getConceptDeclaration(it);
+    Iterable<SConcept> parameterConcepts = Sequence.fromIterable(parameters).select(new ISelector<SNode, SConcept>() {
+      public SConcept select(SNode it) {
+        return SNodeOperations.getConcept(it);
       }
     }).distinct();
-    Iterable<? extends Iterable<SNode>> groupedByConcepts = Sequence.fromIterable(parameterConcepts).select(new ISelector<SNode, ISequence<SNode>>() {
-      public ISequence<SNode> select(final SNode c) {
+    Iterable<? extends Iterable<SNode>> groupedByConcepts = Sequence.fromIterable(parameterConcepts).select(new ISelector<SConcept, ISequence<SNode>>() {
+      public ISequence<SNode> select(final SConcept c) {
         return Sequence.fromIterable(parameters).where(new IWhereFilter<SNode>() {
           public boolean accept(SNode p) {
-            return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConceptDeclaration(p)), SNodeOperations.asSConcept(c));
+            return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(p)), SNodeOperations.asSConcept(c));
           }
         });
       }
@@ -46,14 +47,14 @@ public boolean accept(SNode p) {
         for (SNode other : Sequence.fromIterable(group).tail(Sequence.fromIterable(group).count() - 1)) {
           {
             MessageTarget errorTarget = new NodeMessageTarget();
-            IErrorReporter _reporter_2309309498 = typeCheckingContext.reportTypeError(other, "Duplicated parameter: " + SPropertyOperations.getString(SNodeOperations.getConceptDeclaration(Sequence.fromIterable(group).first()), MetaAdapterFactory.getProperty(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0x1103553c5ffL, 0x46ab0ad5826c74caL, "conceptAlias")), "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "2284201910212797905", null, errorTarget);
+            IErrorReporter _reporter_2309309498 = typeCheckingContext.reportTypeError(other, "Duplicated parameter: " + SPropertyOperations.getString(SNodeOperations.getConceptDeclaration(Sequence.fromIterable(group).first()), MetaAdapterFactory.getProperty(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0x1103553c5ffL, 0x46ab0ad5826c74caL, "conceptAlias")), "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "2284201910212797905", null, errorTarget);
           }
         }
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info
similarity index 55%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info
index b8b153e13f8e..504e1419e8a1 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info
@@ -12,10 +12,10 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
   <root>
     <file name="TypesystemDescriptor.java">
-      <unit at="9,0,89,0" name="jetbrains.mps.console.blCommand.typesystem.TypesystemDescriptor" />
+      <unit at="9,0,57,0" name="jetbrains.mps.lang.smodel.query.typesystem.TypesystemDescriptor" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/3492877759608191530">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/3492877759608191530">
     <file name="typeof_ModuleScopeLiteral_InferenceRule.java">
       <node id="3492877759608999063" at="25,9,26,50" concept="6" />
       <node id="3492877759608999063" at="26,50,27,212" concept="6" />
@@ -71,10 +71,10 @@
         <var name="status" id="3492877759608191530" />
         <var name="typeCheckingContext" id="3492877759608191530" />
       </scope>
-      <unit id="3492877759608191530" at="19,0,50,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_ModuleScopeLiteral_InferenceRule" />
+      <unit id="3492877759608191530" at="19,0,50,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModuleScopeLiteral_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/3492877759608409443">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/3492877759608409443">
     <file name="typeof_ModelScopeLiteral_InferenceRule.java">
       <node id="3492877759611330834" at="24,9,25,50" concept="6" />
       <node id="3492877759611330834" at="25,50,26,212" concept="6" />
@@ -129,10 +129,10 @@
         <var name="status" id="3492877759608409443" />
         <var name="typeCheckingContext" id="3492877759608409443" />
       </scope>
-      <unit id="3492877759608409443" at="18,0,48,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_ModelScopeLiteral_InferenceRule" />
+      <unit id="3492877759608409443" at="18,0,48,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModelScopeLiteral_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/3492877759611770298">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/3492877759611770298">
     <file name="typeof_CustomScope_InferenceRule.java">
       <node id="3492877759611777799" at="23,7,24,214" concept="6" />
       <node id="3492877759611777799" at="24,214,25,210" concept="6" />
@@ -183,10 +183,10 @@
         <var name="status" id="3492877759611770298" />
         <var name="typeCheckingContext" id="3492877759611770298" />
       </scope>
-      <unit id="3492877759611770298" at="18,0,47,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_CustomScope_InferenceRule" />
+      <unit id="3492877759611770298" at="18,0,47,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_CustomScope_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/4234138103881612631">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/4234138103881612631">
     <file name="typeof_ScopeProvider_InferenceRule.java">
       <node id="4234138103881642865" at="22,5,23,214" concept="6" />
       <node id="4234138103881642865" at="23,214,24,208" concept="6" />
@@ -300,88 +300,88 @@
         <var name="quotedNode_9" id="4234138103881643314" />
       </scope>
       <scope id="4234138103881643314" at="37,0,73,0" />
-      <unit id="4234138103881612631" at="18,0,74,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_ScopeProvider_InferenceRule" />
+      <unit id="4234138103881612631" at="18,0,74,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_ScopeProvider_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/4307205004145151167">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/4307205004145151167">
     <file name="check_QueryDuplicatedParameters_NonTypesystemRule.java">
-      <node id="4307205004145330194" at="27,131,28,223" concept="6" />
-      <node id="4307205004145277367" at="30,37,31,57" concept="7" />
-      <node id="4307205004145781772" at="37,42,38,149" concept="7" />
-      <node id="4307205004145898696" at="42,7,43,0" concept="8" />
-      <node id="2284201910212797905" at="47,11,48,64" concept="6" />
-      <node id="2284201910212797905" at="48,64,49,483" concept="6" />
-      <node id="4307205004145151167" at="55,50,56,168" concept="7" />
-      <node id="4307205004145151167" at="58,68,59,102" concept="0" />
-      <node id="4307205004145151167" at="58,68,59,102" concept="7" />
-      <node id="4307205004145151167" at="61,30,62,17" concept="7" />
-      <node id="4307205004145151167" at="25,0,27,0" concept="1" trace="check_QueryDuplicatedParameters_NonTypesystemRule#()V" />
-      <node id="4307205004145276652" at="30,0,33,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4307205004145781770" at="37,0,40,0" concept="5" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
-      <node id="4307205004145151167" at="55,0,58,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="4307205004145151167" at="58,0,61,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="4307205004145151167" at="61,0,64,0" concept="5" trace="overrides#()Z" />
-      <node id="2284201910212797905" at="46,105,50,11" concept="0" />
-      <node id="4307205004145290005" at="28,223,33,18" concept="6" />
-      <node id="4307205004145781766" at="35,53,40,11" concept="7" />
-      <node id="2284201910212811255" at="45,53,51,9" concept="3" />
-      <node id="4307205004145779983" at="35,0,42,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/internal/collections/runtime/ISequence;" />
-      <node id="2284201910212748726" at="44,76,52,7" concept="4" />
-      <node id="4307205004145312475" at="33,18,42,7" concept="6" />
-      <node id="4307205004145898592" at="43,0,53,5" concept="3" />
-      <node id="4307205004145151167" at="27,0,55,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <scope id="4307205004145151167" at="25,62,25,62" />
-      <scope id="4307205004145276653" at="30,37,31,57" />
-      <scope id="4307205004145781771" at="37,42,38,149" />
-      <scope id="4307205004145151167" at="55,50,56,168" />
-      <scope id="4307205004145151167" at="58,68,59,102" />
-      <scope id="4307205004145151167" at="61,30,62,17" />
-      <scope id="4307205004145151167" at="25,0,27,0" />
-      <scope id="2284201910212797905" at="47,11,49,483">
+      <node id="4307205004145330194" at="28,131,29,223" concept="6" />
+      <node id="4307205004145277367" at="31,40,32,46" concept="7" />
+      <node id="4307205004145781772" at="38,42,39,138" concept="7" />
+      <node id="4307205004145898696" at="43,7,44,0" concept="8" />
+      <node id="2284201910212797905" at="48,11,49,64" concept="6" />
+      <node id="2284201910212797905" at="49,64,50,483" concept="6" />
+      <node id="4307205004145151167" at="56,50,57,168" concept="7" />
+      <node id="4307205004145151167" at="59,68,60,102" concept="0" />
+      <node id="4307205004145151167" at="59,68,60,102" concept="7" />
+      <node id="4307205004145151167" at="62,30,63,17" concept="7" />
+      <node id="4307205004145151167" at="26,0,28,0" concept="1" trace="check_QueryDuplicatedParameters_NonTypesystemRule#()V" />
+      <node id="4307205004145276652" at="31,0,34,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/language/SConcept;" />
+      <node id="4307205004145781770" at="38,0,41,0" concept="5" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
+      <node id="4307205004145151167" at="56,0,59,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="4307205004145151167" at="59,0,62,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="4307205004145151167" at="62,0,65,0" concept="5" trace="overrides#()Z" />
+      <node id="2284201910212797905" at="47,105,51,11" concept="0" />
+      <node id="4307205004145290005" at="29,223,34,18" concept="6" />
+      <node id="4307205004145781766" at="36,56,41,11" concept="7" />
+      <node id="2284201910212811255" at="46,53,52,9" concept="3" />
+      <node id="4307205004145779983" at="36,0,43,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/language/SConcept;)Ljetbrains/mps/internal/collections/runtime/ISequence;" />
+      <node id="2284201910212748726" at="45,76,53,7" concept="4" />
+      <node id="4307205004145312475" at="34,18,43,7" concept="6" />
+      <node id="4307205004145898592" at="44,0,54,5" concept="3" />
+      <node id="4307205004145151167" at="28,0,56,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <scope id="4307205004145151167" at="26,62,26,62" />
+      <scope id="4307205004145276653" at="31,40,32,46" />
+      <scope id="4307205004145781771" at="38,42,39,138" />
+      <scope id="4307205004145151167" at="56,50,57,168" />
+      <scope id="4307205004145151167" at="59,68,60,102" />
+      <scope id="4307205004145151167" at="62,30,63,17" />
+      <scope id="4307205004145151167" at="26,0,28,0" />
+      <scope id="2284201910212797905" at="48,11,50,483">
         <var name="_reporter_2309309498" id="2284201910212797905" />
         <var name="errorTarget" id="2284201910212797905" />
       </scope>
-      <scope id="4307205004145276652" at="30,0,33,0">
+      <scope id="4307205004145276652" at="31,0,34,0">
         <var name="it" id="4307205004145276652" />
       </scope>
-      <scope id="4307205004145781770" at="37,0,40,0">
+      <scope id="4307205004145781770" at="38,0,41,0">
         <var name="p" id="4307205004145781770" />
       </scope>
-      <scope id="4307205004145151167" at="55,0,58,0" />
-      <scope id="4307205004145151167" at="58,0,61,0">
+      <scope id="4307205004145151167" at="56,0,59,0" />
+      <scope id="4307205004145151167" at="59,0,62,0">
         <var name="argument" id="4307205004145151167" />
       </scope>
-      <scope id="4307205004145151167" at="61,0,64,0" />
-      <scope id="2284201910212811261" at="46,105,50,11" />
-      <scope id="4307205004145779984" at="35,53,40,11" />
-      <scope id="2284201910212748729" at="45,53,51,9" />
-      <scope id="2284201910212811255" at="45,53,51,9">
+      <scope id="4307205004145151167" at="62,0,65,0" />
+      <scope id="2284201910212811261" at="47,105,51,11" />
+      <scope id="4307205004145779984" at="36,56,41,11" />
+      <scope id="2284201910212748729" at="46,53,52,9" />
+      <scope id="2284201910212811255" at="46,53,52,9">
         <var name="other" id="2284201910212811257" />
       </scope>
-      <scope id="4307205004145779983" at="35,0,42,0">
+      <scope id="4307205004145779983" at="36,0,43,0">
         <var name="c" id="4307205004145779983" />
       </scope>
-      <scope id="4307205004145898598" at="44,76,52,7" />
-      <scope id="4307205004145898592" at="43,0,53,5">
+      <scope id="4307205004145898598" at="45,76,53,7" />
+      <scope id="4307205004145898592" at="44,0,54,5">
         <var name="group" id="4307205004145898594" />
       </scope>
-      <scope id="4307205004145151168" at="27,131,53,5">
+      <scope id="4307205004145151168" at="28,131,54,5">
         <var name="groupedByConcepts" id="4307205004145312478" />
         <var name="parameterConcepts" id="4307205004145290008" />
         <var name="parameters" id="4307205004145330197" />
       </scope>
-      <scope id="4307205004145151167" at="27,0,55,0">
+      <scope id="4307205004145151167" at="28,0,56,0">
         <var name="queryParameterList" id="4307205004145151167" />
         <var name="status" id="4307205004145151167" />
         <var name="typeCheckingContext" id="4307205004145151167" />
       </scope>
-      <unit id="4307205004145276652" at="29,85,33,5" name="jetbrains.mps.console.blCommand.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule$1" />
-      <unit id="4307205004145781770" at="36,59,40,9" name="jetbrains.mps.console.blCommand.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule$3" />
-      <unit id="4307205004145779983" at="34,112,42,5" name="jetbrains.mps.console.blCommand.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule$2" />
-      <unit id="4307205004145151167" at="24,0,65,0" name="jetbrains.mps.console.blCommand.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule" />
+      <unit id="4307205004145276652" at="30,88,34,5" name="jetbrains.mps.lang.smodel.query.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule$1" />
+      <unit id="4307205004145781770" at="37,59,41,9" name="jetbrains.mps.lang.smodel.query.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule$3" />
+      <unit id="4307205004145779983" at="35,112,43,5" name="jetbrains.mps.lang.smodel.query.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule$2" />
+      <unit id="4307205004145151167" at="25,0,66,0" name="jetbrains.mps.lang.smodel.query.typesystem.check_QueryDuplicatedParameters_NonTypesystemRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/4593895459761134312">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/4593895459761134312">
     <file name="typeof_NodesExpresiion_InferenceRule.java">
       <node id="6322385757205373104" at="20,5,21,57" concept="6" />
       <node id="6322385757205373104" at="21,57,22,208" concept="6" />
@@ -436,63 +436,10 @@
         <var name="quotedNode_2" id="6322385757205373106" />
       </scope>
       <scope id="6322385757205373106" at="35,0,44,0" />
-      <unit id="4593895459761134312" at="16,0,45,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_NodesExpresiion_InferenceRule" />
+      <unit id="4593895459761134312" at="16,0,45,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_NodesExpresiion_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/5510759644748858626">
-    <file name="typeof_PrintNodeExpression_InferenceRule.java">
-      <node id="5510759644748858657" at="22,7,23,223" concept="6" />
-      <node id="5510759644748858657" at="23,223,24,210" concept="6" />
-      <node id="5510759644748858657" at="24,210,25,310" concept="2" />
-      <node id="5510759644748858626" at="29,50,30,169" concept="7" />
-      <node id="5510759644748858626" at="32,68,33,102" concept="0" />
-      <node id="5510759644748858626" at="32,68,33,102" concept="7" />
-      <node id="5510759644748858626" at="35,30,36,17" concept="7" />
-      <node id="5510759644748858659" at="38,61,39,63" concept="6" />
-      <node id="5510759644748858659" at="39,63,40,30" concept="6" />
-      <node id="5510759644748858659" at="40,30,41,221" concept="0" />
-      <node id="5510759644748858659" at="40,30,41,221" concept="0" />
-      <node id="5510759644748858659" at="40,30,41,221" concept="2" />
-      <node id="5510759644748858659" at="41,221,42,24" concept="7" />
-      <node id="5510759644748858626" at="18,0,20,0" concept="1" trace="typeof_PrintNodeExpression_InferenceRule#()V" />
-      <node id="5510759644748858626" at="29,0,32,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="5510759644748858626" at="32,0,35,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="5510759644748858626" at="35,0,38,0" concept="5" trace="overrides#()Z" />
-      <node id="5510759644748858657" at="21,59,26,7" concept="0" />
-      <node id="5510759644748858659" at="38,0,44,0" concept="9" trace="_quotation_createNode_j9pmav_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5510759644748858657" at="20,132,27,5" concept="4" />
-      <node id="5510759644748858626" at="20,0,29,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <scope id="5510759644748858626" at="18,53,18,53" />
-      <scope id="5510759644748858626" at="29,50,30,169" />
-      <scope id="5510759644748858626" at="32,68,33,102" />
-      <scope id="5510759644748858626" at="35,30,36,17" />
-      <scope id="5510759644748858659" at="40,30,41,221" />
-      <scope id="5510759644748858626" at="18,0,20,0" />
-      <scope id="5510759644748858657" at="22,7,25,310">
-        <var name="_info_12389875345" id="5510759644748858657" />
-        <var name="_nodeToCheck_1029348928467" id="5510759644748858657" />
-      </scope>
-      <scope id="5510759644748858626" at="29,0,32,0" />
-      <scope id="5510759644748858626" at="32,0,35,0">
-        <var name="argument" id="5510759644748858626" />
-      </scope>
-      <scope id="5510759644748858626" at="35,0,38,0" />
-      <scope id="5510759644748858659" at="38,61,42,24">
-        <var name="facade" id="5510759644748858659" />
-        <var name="quotedNode_1" id="5510759644748858659" />
-      </scope>
-      <scope id="5510759644748858657" at="21,59,26,7" />
-      <scope id="5510759644748858659" at="38,0,44,0" />
-      <scope id="5510759644748858627" at="20,132,27,5" />
-      <scope id="5510759644748858626" at="20,0,29,0">
-        <var name="printNodeExpression" id="5510759644748858626" />
-        <var name="status" id="5510759644748858626" />
-        <var name="typeCheckingContext" id="5510759644748858626" />
-      </scope>
-      <unit id="5510759644748858626" at="17,0,45,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_PrintNodeExpression_InferenceRule" />
-    </file>
-  </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/6322385757205242475">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/6322385757205242475">
     <file name="typeof_ReferencesExpression_InferenceRule.java">
       <node id="6322385757205641653" at="20,5,21,62" concept="6" />
       <node id="6322385757205641653" at="21,62,22,208" concept="6" />
@@ -547,63 +494,10 @@
         <var name="quotedNode_2" id="6322385757205641655" />
       </scope>
       <scope id="6322385757205641655" at="35,0,44,0" />
-      <unit id="6322385757205242475" at="16,0,45,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_ReferencesExpression_InferenceRule" />
-    </file>
-  </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/6852607286009511629">
-    <file name="typeof_PrintNodeReferenceExpression_InferenceRule.java">
-      <node id="6852607286009512877" at="22,7,23,232" concept="6" />
-      <node id="6852607286009512877" at="23,232,24,210" concept="6" />
-      <node id="6852607286009512877" at="24,210,25,310" concept="2" />
-      <node id="6852607286009511629" at="29,50,30,178" concept="7" />
-      <node id="6852607286009511629" at="32,68,33,102" concept="0" />
-      <node id="6852607286009511629" at="32,68,33,102" concept="7" />
-      <node id="6852607286009511629" at="35,30,36,17" concept="7" />
-      <node id="6852607286009512930" at="38,61,39,63" concept="6" />
-      <node id="6852607286009512930" at="39,63,40,30" concept="6" />
-      <node id="6852607286009512930" at="40,30,41,221" concept="0" />
-      <node id="6852607286009512930" at="40,30,41,221" concept="0" />
-      <node id="6852607286009512930" at="40,30,41,221" concept="2" />
-      <node id="6852607286009512930" at="41,221,42,24" concept="7" />
-      <node id="6852607286009511629" at="18,0,20,0" concept="1" trace="typeof_PrintNodeReferenceExpression_InferenceRule#()V" />
-      <node id="6852607286009511629" at="29,0,32,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="6852607286009511629" at="32,0,35,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="6852607286009511629" at="35,0,38,0" concept="5" trace="overrides#()Z" />
-      <node id="6852607286009512877" at="21,59,26,7" concept="0" />
-      <node id="6852607286009512930" at="38,0,44,0" concept="9" trace="_quotation_createNode_t5gmh8_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="6852607286009512877" at="20,141,27,5" concept="4" />
-      <node id="6852607286009511629" at="20,0,29,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <scope id="6852607286009511629" at="18,62,18,62" />
-      <scope id="6852607286009511629" at="29,50,30,178" />
-      <scope id="6852607286009511629" at="32,68,33,102" />
-      <scope id="6852607286009511629" at="35,30,36,17" />
-      <scope id="6852607286009512930" at="40,30,41,221" />
-      <scope id="6852607286009511629" at="18,0,20,0" />
-      <scope id="6852607286009512877" at="22,7,25,310">
-        <var name="_info_12389875345" id="6852607286009512877" />
-        <var name="_nodeToCheck_1029348928467" id="6852607286009512877" />
-      </scope>
-      <scope id="6852607286009511629" at="29,0,32,0" />
-      <scope id="6852607286009511629" at="32,0,35,0">
-        <var name="argument" id="6852607286009511629" />
-      </scope>
-      <scope id="6852607286009511629" at="35,0,38,0" />
-      <scope id="6852607286009512930" at="38,61,42,24">
-        <var name="facade" id="6852607286009512930" />
-        <var name="quotedNode_1" id="6852607286009512930" />
-      </scope>
-      <scope id="6852607286009512877" at="21,59,26,7" />
-      <scope id="6852607286009512930" at="38,0,44,0" />
-      <scope id="6852607286009511893" at="20,141,27,5" />
-      <scope id="6852607286009511629" at="20,0,29,0">
-        <var name="printNodeReferenceExpression" id="6852607286009511629" />
-        <var name="status" id="6852607286009511629" />
-        <var name="typeCheckingContext" id="6852607286009511629" />
-      </scope>
-      <unit id="6852607286009511629" at="17,0,45,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_PrintNodeReferenceExpression_InferenceRule" />
+      <unit id="6322385757205242475" at="16,0,45,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_ReferencesExpression_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/6864030874027864054">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/6864030874027864054">
     <file name="typeof_ModelsExpression_InferenceRule.java">
       <node id="6864030874027864625" at="20,5,21,58" concept="6" />
       <node id="6864030874027864625" at="21,58,22,208" concept="6" />
@@ -658,10 +552,10 @@
         <var name="quotedNode_2" id="6864030874027864700" />
       </scope>
       <scope id="6864030874027864700" at="35,0,44,0" />
-      <unit id="6864030874027864054" at="16,0,45,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_ModelsExpression_InferenceRule" />
+      <unit id="6864030874027864054" at="16,0,45,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModelsExpression_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/6864030874028745365">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/6864030874028745365">
     <file name="typeof_ModulesExpression_InferenceRule.java">
       <node id="6864030874028745824" at="21,5,22,59" concept="6" />
       <node id="6864030874028745824" at="22,59,23,208" concept="6" />
@@ -717,470 +611,10 @@
         <var name="quotedNode_2" id="6864030874028874457" />
       </scope>
       <scope id="6864030874028874457" at="36,0,46,0" />
-      <unit id="6864030874028745365" at="17,0,47,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_ModulesExpression_InferenceRule" />
-    </file>
-  </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/752693057587755448">
-    <file name="typeof_ProjectExpression_InferenceRule.java">
-      <node id="752693057587763729" at="21,5,22,59" concept="6" />
-      <node id="752693057587763729" at="22,59,23,207" concept="6" />
-      <node id="752693057587763729" at="23,207,24,284" concept="2" />
-      <node id="752693057587755448" at="27,50,28,166" concept="7" />
-      <node id="752693057587755448" at="30,68,31,102" concept="0" />
-      <node id="752693057587755448" at="30,68,31,102" concept="7" />
-      <node id="752693057587755448" at="33,30,34,17" concept="7" />
-      <node id="752693057587763859" at="36,61,37,63" concept="6" />
-      <node id="752693057587763859" at="37,63,38,30" concept="6" />
-      <node id="752693057587763859" at="38,30,39,227" concept="2" />
-      <node id="752693057587763859" at="39,227,40,453" concept="2" />
-      <node id="752693057587763859" at="40,453,41,24" concept="7" />
-      <node id="752693057587755448" at="18,0,20,0" concept="1" trace="typeof_ProjectExpression_InferenceRule#()V" />
-      <node id="752693057587763859" at="38,30,40,453" concept="0" />
-      <node id="752693057587763859" at="38,30,40,453" concept="0" />
-      <node id="752693057587755448" at="27,0,30,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="752693057587755448" at="30,0,33,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="752693057587755448" at="33,0,36,0" concept="5" trace="overrides#()Z" />
-      <node id="752693057587763729" at="20,130,25,5" concept="0" />
-      <node id="752693057587755448" at="20,0,27,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <node id="752693057587763859" at="36,0,43,0" concept="9" trace="_quotation_createNode_osiggc_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="752693057587755448" at="18,51,18,51" />
-      <scope id="752693057587755448" at="27,50,28,166" />
-      <scope id="752693057587755448" at="30,68,31,102" />
-      <scope id="752693057587755448" at="33,30,34,17" />
-      <scope id="752693057587755448" at="18,0,20,0" />
-      <scope id="752693057587763859" at="38,30,40,453" />
-      <scope id="752693057587763729" at="21,5,24,284">
-        <var name="_info_12389875345" id="752693057587763729" />
-        <var name="_nodeToCheck_1029348928467" id="752693057587763729" />
-      </scope>
-      <scope id="752693057587755448" at="27,0,30,0" />
-      <scope id="752693057587755448" at="30,0,33,0">
-        <var name="argument" id="752693057587755448" />
-      </scope>
-      <scope id="752693057587755448" at="33,0,36,0" />
-      <scope id="752693057587755709" at="20,130,25,5" />
-      <scope id="752693057587763859" at="36,61,41,24">
-        <var name="facade" id="752693057587763859" />
-        <var name="quotedNode_1" id="752693057587763859" />
-      </scope>
-      <scope id="752693057587755448" at="20,0,27,0">
-        <var name="projectExpression" id="752693057587755448" />
-        <var name="status" id="752693057587755448" />
-        <var name="typeCheckingContext" id="752693057587755448" />
-      </scope>
-      <scope id="752693057587763859" at="36,0,43,0" />
-      <unit id="752693057587755448" at="17,0,44,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_ProjectExpression_InferenceRule" />
-    </file>
-  </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/7600370246417176062">
-    <file name="typeof_ShowExpression_InferenceRule.java">
-      <node id="7600370246417176611" at="22,5,23,56" concept="6" />
-      <node id="7600370246417176611" at="23,56,24,208" concept="6" />
-      <node id="7600370246417176611" at="24,208,25,285" concept="2" />
-      <node id="7600370246423284446" at="28,7,29,218" concept="6" />
-      <node id="7600370246423284446" at="29,218,30,210" concept="6" />
-      <node id="7600370246423284446" at="30,210,31,309" concept="2" />
-      <node id="7600370246417176062" at="35,50,36,164" concept="7" />
-      <node id="7600370246417176062" at="38,68,39,102" concept="0" />
-      <node id="7600370246417176062" at="38,68,39,102" concept="7" />
-      <node id="7600370246417176062" at="41,30,42,17" concept="7" />
-      <node id="7600370246417176684" at="44,61,45,63" concept="6" />
-      <node id="7600370246417176684" at="45,63,46,30" concept="6" />
-      <node id="7600370246417176684" at="46,30,47,220" concept="0" />
-      <node id="7600370246417176684" at="46,30,47,220" concept="0" />
-      <node id="7600370246417176684" at="46,30,47,220" concept="2" />
-      <node id="7600370246417176684" at="47,220,48,24" concept="7" />
-      <node id="7600370246423285041" at="50,61,51,63" concept="6" />
-      <node id="7600370246423285041" at="51,63,52,30" concept="6" />
-      <node id="7600370246423285041" at="52,30,53,30" concept="6" />
-      <node id="7600370246423285041" at="53,30,54,30" concept="6" />
-      <node id="7600370246423285041" at="54,30,55,30" concept="6" />
-      <node id="7600370246423285041" at="55,30,56,30" concept="6" />
-      <node id="7600370246423285041" at="56,30,57,30" concept="6" />
-      <node id="7600370246423285041" at="57,30,58,30" concept="6" />
-      <node id="7600370246423285041" at="58,30,59,30" concept="6" />
-      <node id="7600370246423285041" at="59,30,60,30" concept="6" />
-      <node id="7600370246423285041" at="60,30,61,224" concept="2" />
-      <node id="7600370246423285041" at="61,224,62,237" concept="2" />
-      <node id="7600370246423285041" at="62,237,63,221" concept="2" />
-      <node id="7600370246423285041" at="63,221,64,168" concept="2" />
-      <node id="7600370246423285041" at="64,168,65,165" concept="2" />
-      <node id="7600370246423285041" at="65,165,66,237" concept="2" />
-      <node id="7600370246423285041" at="66,237,67,231" concept="2" />
-      <node id="7600370246423285041" at="67,231,68,168" concept="2" />
-      <node id="7600370246423285041" at="68,168,69,165" concept="2" />
-      <node id="7600370246423285041" at="69,165,70,237" concept="2" />
-      <node id="7600370246423285041" at="70,237,71,222" concept="2" />
-      <node id="7600370246423285041" at="71,222,72,168" concept="2" />
-      <node id="7600370246423285041" at="72,168,73,165" concept="2" />
-      <node id="7600370246423285041" at="73,165,74,237" concept="2" />
-      <node id="7600370246423285041" at="74,237,75,227" concept="2" />
-      <node id="7600370246423285041" at="75,227,76,467" concept="2" />
-      <node id="7600370246423285041" at="76,467,77,168" concept="2" />
-      <node id="7600370246423285041" at="77,168,78,165" concept="2" />
-      <node id="7600370246423285041" at="78,165,79,24" concept="7" />
-      <node id="7600370246417176062" at="19,0,21,0" concept="1" trace="typeof_ShowExpression_InferenceRule#()V" />
-      <node id="7600370246423285041" at="62,237,64,168" concept="0" />
-      <node id="7600370246423285041" at="62,237,64,168" concept="0" />
-      <node id="7600370246423285041" at="66,237,68,168" concept="0" />
-      <node id="7600370246423285041" at="66,237,68,168" concept="0" />
-      <node id="7600370246423285041" at="70,237,72,168" concept="0" />
-      <node id="7600370246423285041" at="70,237,72,168" concept="0" />
-      <node id="7600370246417176062" at="35,0,38,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="7600370246417176062" at="38,0,41,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="7600370246417176062" at="41,0,44,0" concept="5" trace="overrides#()Z" />
-      <node id="7600370246423285041" at="74,237,77,168" concept="0" />
-      <node id="7600370246423285041" at="74,237,77,168" concept="0" />
-      <node id="7600370246423285041" at="61,224,65,165" concept="0" />
-      <node id="7600370246423285041" at="61,224,65,165" concept="0" />
-      <node id="7600370246423285041" at="65,165,69,165" concept="0" />
-      <node id="7600370246423285041" at="65,165,69,165" concept="0" />
-      <node id="7600370246423285041" at="69,165,73,165" concept="0" />
-      <node id="7600370246423285041" at="69,165,73,165" concept="0" />
-      <node id="7600370246417176611" at="21,127,26,5" concept="0" />
-      <node id="7600370246423284446" at="27,59,32,7" concept="0" />
-      <node id="7600370246423285041" at="73,165,78,165" concept="0" />
-      <node id="7600370246423285041" at="73,165,78,165" concept="0" />
-      <node id="7600370246417176684" at="44,0,50,0" concept="9" trace="_quotation_createNode_jy8svg_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246423284446" at="26,5,33,5" concept="4" />
-      <node id="7600370246417176062" at="21,0,35,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <node id="7600370246423285041" at="60,30,78,165" concept="0" />
-      <node id="7600370246423285041" at="60,30,78,165" concept="0" />
-      <node id="7600370246423285041" at="50,0,81,0" concept="9" trace="_quotation_createNode_jy8svg_a0b0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="7600370246417176062" at="19,48,19,48" />
-      <scope id="7600370246417176062" at="35,50,36,164" />
-      <scope id="7600370246417176062" at="38,68,39,102" />
-      <scope id="7600370246417176062" at="41,30,42,17" />
-      <scope id="7600370246417176684" at="46,30,47,220" />
-      <scope id="7600370246417176062" at="19,0,21,0" />
-      <scope id="7600370246423285041" at="62,237,64,168" />
-      <scope id="7600370246423285041" at="66,237,68,168" />
-      <scope id="7600370246423285041" at="70,237,72,168" />
-      <scope id="7600370246417176611" at="22,5,25,285">
-        <var name="_info_12389875345" id="7600370246417176611" />
-        <var name="_nodeToCheck_1029348928467" id="7600370246417176611" />
-      </scope>
-      <scope id="7600370246423284446" at="28,7,31,309">
-        <var name="_info_12389875345" id="7600370246423284446" />
-        <var name="_nodeToCheck_1029348928467" id="7600370246423284446" />
-      </scope>
-      <scope id="7600370246417176062" at="35,0,38,0" />
-      <scope id="7600370246417176062" at="38,0,41,0">
-        <var name="argument" id="7600370246417176062" />
-      </scope>
-      <scope id="7600370246417176062" at="41,0,44,0" />
-      <scope id="7600370246423285041" at="74,237,77,168" />
-      <scope id="7600370246417176684" at="44,61,48,24">
-        <var name="facade" id="7600370246417176684" />
-        <var name="quotedNode_1" id="7600370246417176684" />
-      </scope>
-      <scope id="7600370246423285041" at="61,224,65,165" />
-      <scope id="7600370246423285041" at="65,165,69,165" />
-      <scope id="7600370246423285041" at="69,165,73,165" />
-      <scope id="7600370246423284446" at="27,59,32,7" />
-      <scope id="7600370246423285041" at="73,165,78,165" />
-      <scope id="7600370246417176684" at="44,0,50,0" />
-      <scope id="7600370246417176063" at="21,127,33,5" />
-      <scope id="7600370246417176062" at="21,0,35,0">
-        <var name="showExpression" id="7600370246417176062" />
-        <var name="status" id="7600370246417176062" />
-        <var name="typeCheckingContext" id="7600370246417176062" />
-      </scope>
-      <scope id="7600370246423285041" at="60,30,78,165" />
-      <scope id="7600370246423285041" at="50,61,79,24">
-        <var name="facade" id="7600370246423285041" />
-        <var name="quotedNode_1" id="7600370246423285041" />
-        <var name="quotedNode_2" id="7600370246423285041" />
-        <var name="quotedNode_3" id="7600370246423285041" />
-        <var name="quotedNode_4" id="7600370246423285041" />
-        <var name="quotedNode_5" id="7600370246423285041" />
-        <var name="quotedNode_6" id="7600370246423285041" />
-        <var name="quotedNode_7" id="7600370246423285041" />
-        <var name="quotedNode_8" id="7600370246423285041" />
-        <var name="quotedNode_9" id="7600370246423285041" />
-      </scope>
-      <scope id="7600370246423285041" at="50,0,81,0" />
-      <unit id="7600370246417176062" at="18,0,82,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_ShowExpression_InferenceRule" />
-    </file>
-  </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/7600370246417590543">
-    <file name="typeof_PrintExpression_InferenceRule.java">
-      <node id="7600370246421664444" at="22,5,23,217" concept="6" />
-      <node id="7600370246421664444" at="23,217,24,208" concept="6" />
-      <node id="7600370246421664444" at="24,208,25,308" concept="2" />
-      <node id="7600370246417590543" at="28,50,29,165" concept="7" />
-      <node id="7600370246417590543" at="31,68,32,102" concept="0" />
-      <node id="7600370246417590543" at="31,68,32,102" concept="7" />
-      <node id="7600370246417590543" at="34,30,35,17" concept="7" />
-      <node id="7600370246421664670" at="37,61,38,63" concept="6" />
-      <node id="7600370246421664670" at="38,63,39,30" concept="6" />
-      <node id="7600370246421664670" at="39,30,40,30" concept="6" />
-      <node id="7600370246421664670" at="40,30,41,30" concept="6" />
-      <node id="7600370246421664670" at="41,30,42,224" concept="2" />
-      <node id="7600370246421664670" at="42,224,43,227" concept="2" />
-      <node id="7600370246421664670" at="43,227,44,435" concept="2" />
-      <node id="7600370246421664670" at="44,435,45,165" concept="2" />
-      <node id="7600370246421664670" at="45,165,46,220" concept="2" />
-      <node id="7600370246421664670" at="46,220,47,165" concept="2" />
-      <node id="7600370246421664670" at="47,165,48,24" concept="7" />
-      <node id="7600370246417590543" at="19,0,21,0" concept="1" trace="typeof_PrintExpression_InferenceRule#()V" />
-      <node id="7600370246421664670" at="45,165,47,165" concept="0" />
-      <node id="7600370246421664670" at="45,165,47,165" concept="0" />
-      <node id="7600370246417590543" at="28,0,31,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="7600370246417590543" at="31,0,34,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="7600370246417590543" at="34,0,37,0" concept="5" trace="overrides#()Z" />
-      <node id="7600370246421664670" at="42,224,45,165" concept="0" />
-      <node id="7600370246421664670" at="42,224,45,165" concept="0" />
-      <node id="7600370246421664444" at="21,128,26,5" concept="0" />
-      <node id="7600370246421664670" at="41,30,47,165" concept="0" />
-      <node id="7600370246421664670" at="41,30,47,165" concept="0" />
-      <node id="7600370246417590543" at="21,0,28,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <node id="7600370246421664670" at="37,0,50,0" concept="9" trace="_quotation_createNode_nk4iqe_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="7600370246417590543" at="19,49,19,49" />
-      <scope id="7600370246417590543" at="28,50,29,165" />
-      <scope id="7600370246417590543" at="31,68,32,102" />
-      <scope id="7600370246417590543" at="34,30,35,17" />
-      <scope id="7600370246417590543" at="19,0,21,0" />
-      <scope id="7600370246421664670" at="45,165,47,165" />
-      <scope id="7600370246421664444" at="22,5,25,308">
-        <var name="_info_12389875345" id="7600370246421664444" />
-        <var name="_nodeToCheck_1029348928467" id="7600370246421664444" />
-      </scope>
-      <scope id="7600370246417590543" at="28,0,31,0" />
-      <scope id="7600370246417590543" at="31,0,34,0">
-        <var name="argument" id="7600370246417590543" />
-      </scope>
-      <scope id="7600370246417590543" at="34,0,37,0" />
-      <scope id="7600370246421664670" at="42,224,45,165" />
-      <scope id="7600370246417590544" at="21,128,26,5" />
-      <scope id="7600370246421664670" at="41,30,47,165" />
-      <scope id="7600370246417590543" at="21,0,28,0">
-        <var name="printExpression" id="7600370246417590543" />
-        <var name="status" id="7600370246417590543" />
-        <var name="typeCheckingContext" id="7600370246417590543" />
-      </scope>
-      <scope id="7600370246421664670" at="37,61,48,24">
-        <var name="facade" id="7600370246421664670" />
-        <var name="quotedNode_1" id="7600370246421664670" />
-        <var name="quotedNode_2" id="7600370246421664670" />
-        <var name="quotedNode_3" id="7600370246421664670" />
-      </scope>
-      <scope id="7600370246421664670" at="37,0,50,0" />
-      <unit id="7600370246417590543" at="18,0,51,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_PrintExpression_InferenceRule" />
-    </file>
-  </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/7600370246417604400">
-    <file name="typeof_PrintTextExpression_InferenceRule.java">
-      <node id="7600370246421665039" at="22,5,23,221" concept="6" />
-      <node id="7600370246421665039" at="23,221,24,208" concept="6" />
-      <node id="7600370246421665039" at="24,208,25,308" concept="2" />
-      <node id="7600370246417604400" at="28,50,29,169" concept="7" />
-      <node id="7600370246417604400" at="31,68,32,102" concept="0" />
-      <node id="7600370246417604400" at="31,68,32,102" concept="7" />
-      <node id="7600370246417604400" at="34,30,35,17" concept="7" />
-      <node id="7600370246421665267" at="37,61,38,63" concept="6" />
-      <node id="7600370246421665267" at="38,63,39,30" concept="6" />
-      <node id="7600370246421665267" at="39,30,40,227" concept="2" />
-      <node id="7600370246421665267" at="40,227,41,435" concept="2" />
-      <node id="7600370246421665267" at="41,435,42,24" concept="7" />
-      <node id="7600370246417604400" at="19,0,21,0" concept="1" trace="typeof_PrintTextExpression_InferenceRule#()V" />
-      <node id="7600370246421665267" at="39,30,41,435" concept="0" />
-      <node id="7600370246421665267" at="39,30,41,435" concept="0" />
-      <node id="7600370246417604400" at="28,0,31,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="7600370246417604400" at="31,0,34,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="7600370246417604400" at="34,0,37,0" concept="5" trace="overrides#()Z" />
-      <node id="7600370246421665039" at="21,132,26,5" concept="0" />
-      <node id="7600370246417604400" at="21,0,28,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <node id="7600370246421665267" at="37,0,44,0" concept="9" trace="_quotation_createNode_tqzol9_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="7600370246417604400" at="19,53,19,53" />
-      <scope id="7600370246417604400" at="28,50,29,169" />
-      <scope id="7600370246417604400" at="31,68,32,102" />
-      <scope id="7600370246417604400" at="34,30,35,17" />
-      <scope id="7600370246417604400" at="19,0,21,0" />
-      <scope id="7600370246421665267" at="39,30,41,435" />
-      <scope id="7600370246421665039" at="22,5,25,308">
-        <var name="_info_12389875345" id="7600370246421665039" />
-        <var name="_nodeToCheck_1029348928467" id="7600370246421665039" />
-      </scope>
-      <scope id="7600370246417604400" at="28,0,31,0" />
-      <scope id="7600370246417604400" at="31,0,34,0">
-        <var name="argument" id="7600370246417604400" />
-      </scope>
-      <scope id="7600370246417604400" at="34,0,37,0" />
-      <scope id="7600370246417604401" at="21,132,26,5" />
-      <scope id="7600370246421665267" at="37,61,42,24">
-        <var name="facade" id="7600370246421665267" />
-        <var name="quotedNode_1" id="7600370246421665267" />
-      </scope>
-      <scope id="7600370246417604400" at="21,0,28,0">
-        <var name="printTextExpression" id="7600370246417604400" />
-        <var name="status" id="7600370246417604400" />
-        <var name="typeCheckingContext" id="7600370246417604400" />
-      </scope>
-      <scope id="7600370246421665267" at="37,0,44,0" />
-      <unit id="7600370246417604400" at="18,0,45,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_PrintTextExpression_InferenceRule" />
-    </file>
-  </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/7600370246423000773">
-    <file name="typeof_PrintSequenceExpression_InferenceRule.java">
-      <node id="3856122757887347236" at="22,5,23,225" concept="6" />
-      <node id="3856122757887347236" at="23,225,24,208" concept="6" />
-      <node id="3856122757887347236" at="24,208,25,308" concept="2" />
-      <node id="7600370246423000773" at="28,50,29,173" concept="7" />
-      <node id="7600370246423000773" at="31,68,32,102" concept="0" />
-      <node id="7600370246423000773" at="31,68,32,102" concept="7" />
-      <node id="7600370246423000773" at="34,30,35,17" concept="7" />
-      <node id="3856122757887347239" at="37,61,38,63" concept="6" />
-      <node id="3856122757887347239" at="38,63,39,30" concept="6" />
-      <node id="3856122757887347239" at="39,30,40,30" concept="6" />
-      <node id="3856122757887347239" at="40,30,41,30" concept="6" />
-      <node id="3856122757887347239" at="41,30,42,30" concept="6" />
-      <node id="3856122757887347239" at="42,30,43,30" concept="6" />
-      <node id="3856122757887347239" at="43,30,44,30" concept="6" />
-      <node id="3856122757887347239" at="44,30,45,30" concept="6" />
-      <node id="3856122757887347239" at="45,30,46,30" concept="6" />
-      <node id="3856122757887347239" at="46,30,47,30" concept="6" />
-      <node id="3856122757887347239" at="47,30,48,224" concept="2" />
-      <node id="3856122757887347239" at="48,224,49,237" concept="2" />
-      <node id="3856122757887347239" at="49,237,50,221" concept="2" />
-      <node id="3856122757887347239" at="50,221,51,168" concept="2" />
-      <node id="3856122757887347239" at="51,168,52,165" concept="2" />
-      <node id="3856122757887347239" at="52,165,53,237" concept="2" />
-      <node id="3856122757887347239" at="53,237,54,231" concept="2" />
-      <node id="3856122757887347239" at="54,231,55,168" concept="2" />
-      <node id="3856122757887347239" at="55,168,56,165" concept="2" />
-      <node id="3856122757887347239" at="56,165,57,237" concept="2" />
-      <node id="3856122757887347239" at="57,237,58,222" concept="2" />
-      <node id="3856122757887347239" at="58,222,59,168" concept="2" />
-      <node id="3856122757887347239" at="59,168,60,165" concept="2" />
-      <node id="3856122757887347239" at="60,165,61,237" concept="2" />
-      <node id="3856122757887347239" at="61,237,62,227" concept="2" />
-      <node id="3856122757887347239" at="62,227,63,467" concept="2" />
-      <node id="3856122757887347239" at="63,467,64,168" concept="2" />
-      <node id="3856122757887347239" at="64,168,65,165" concept="2" />
-      <node id="3856122757887347239" at="65,165,66,24" concept="7" />
-      <node id="7600370246423000773" at="19,0,21,0" concept="1" trace="typeof_PrintSequenceExpression_InferenceRule#()V" />
-      <node id="3856122757887347239" at="49,237,51,168" concept="0" />
-      <node id="3856122757887347239" at="49,237,51,168" concept="0" />
-      <node id="3856122757887347239" at="53,237,55,168" concept="0" />
-      <node id="3856122757887347239" at="53,237,55,168" concept="0" />
-      <node id="3856122757887347239" at="57,237,59,168" concept="0" />
-      <node id="3856122757887347239" at="57,237,59,168" concept="0" />
-      <node id="7600370246423000773" at="28,0,31,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="7600370246423000773" at="31,0,34,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="7600370246423000773" at="34,0,37,0" concept="5" trace="overrides#()Z" />
-      <node id="3856122757887347239" at="61,237,64,168" concept="0" />
-      <node id="3856122757887347239" at="61,237,64,168" concept="0" />
-      <node id="3856122757887347239" at="48,224,52,165" concept="0" />
-      <node id="3856122757887347239" at="48,224,52,165" concept="0" />
-      <node id="3856122757887347239" at="52,165,56,165" concept="0" />
-      <node id="3856122757887347239" at="52,165,56,165" concept="0" />
-      <node id="3856122757887347239" at="56,165,60,165" concept="0" />
-      <node id="3856122757887347239" at="56,165,60,165" concept="0" />
-      <node id="3856122757887347236" at="21,136,26,5" concept="0" />
-      <node id="3856122757887347239" at="60,165,65,165" concept="0" />
-      <node id="3856122757887347239" at="60,165,65,165" concept="0" />
-      <node id="7600370246423000773" at="21,0,28,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <node id="3856122757887347239" at="47,30,65,165" concept="0" />
-      <node id="3856122757887347239" at="47,30,65,165" concept="0" />
-      <node id="3856122757887347239" at="37,0,68,0" concept="9" trace="_quotation_createNode_u62o5j_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="7600370246423000773" at="19,57,19,57" />
-      <scope id="7600370246423000773" at="28,50,29,173" />
-      <scope id="7600370246423000773" at="31,68,32,102" />
-      <scope id="7600370246423000773" at="34,30,35,17" />
-      <scope id="7600370246423000773" at="19,0,21,0" />
-      <scope id="3856122757887347239" at="49,237,51,168" />
-      <scope id="3856122757887347239" at="53,237,55,168" />
-      <scope id="3856122757887347239" at="57,237,59,168" />
-      <scope id="3856122757887347236" at="22,5,25,308">
-        <var name="_info_12389875345" id="3856122757887347236" />
-        <var name="_nodeToCheck_1029348928467" id="3856122757887347236" />
-      </scope>
-      <scope id="7600370246423000773" at="28,0,31,0" />
-      <scope id="7600370246423000773" at="31,0,34,0">
-        <var name="argument" id="7600370246423000773" />
-      </scope>
-      <scope id="7600370246423000773" at="34,0,37,0" />
-      <scope id="3856122757887347239" at="61,237,64,168" />
-      <scope id="3856122757887347239" at="48,224,52,165" />
-      <scope id="3856122757887347239" at="52,165,56,165" />
-      <scope id="3856122757887347239" at="56,165,60,165" />
-      <scope id="7600370246423000774" at="21,136,26,5" />
-      <scope id="3856122757887347239" at="60,165,65,165" />
-      <scope id="7600370246423000773" at="21,0,28,0">
-        <var name="printSequenceExpression" id="7600370246423000773" />
-        <var name="status" id="7600370246423000773" />
-        <var name="typeCheckingContext" id="7600370246423000773" />
-      </scope>
-      <scope id="3856122757887347239" at="47,30,65,165" />
-      <scope id="3856122757887347239" at="37,61,66,24">
-        <var name="facade" id="3856122757887347239" />
-        <var name="quotedNode_1" id="3856122757887347239" />
-        <var name="quotedNode_2" id="3856122757887347239" />
-        <var name="quotedNode_3" id="3856122757887347239" />
-        <var name="quotedNode_4" id="3856122757887347239" />
-        <var name="quotedNode_5" id="3856122757887347239" />
-        <var name="quotedNode_6" id="3856122757887347239" />
-        <var name="quotedNode_7" id="3856122757887347239" />
-        <var name="quotedNode_8" id="3856122757887347239" />
-        <var name="quotedNode_9" id="3856122757887347239" />
-      </scope>
-      <scope id="3856122757887347239" at="37,0,68,0" />
-      <unit id="7600370246423000773" at="18,0,69,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_PrintSequenceExpression_InferenceRule" />
-    </file>
-  </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/7656298970878398390">
-    <file name="typeof_AbstractPrintExpression_InferenceRule.java">
-      <node id="7656298970878399354" at="20,5,21,65" concept="6" />
-      <node id="7656298970878399354" at="21,65,22,208" concept="6" />
-      <node id="7656298970878399354" at="22,208,23,285" concept="2" />
-      <node id="7656298970878398390" at="26,50,27,173" concept="7" />
-      <node id="7656298970878398390" at="29,68,30,102" concept="0" />
-      <node id="7656298970878398390" at="29,68,30,102" concept="7" />
-      <node id="7656298970878398390" at="32,30,33,17" concept="7" />
-      <node id="7656298970878399419" at="35,61,36,63" concept="6" />
-      <node id="7656298970878399419" at="36,63,37,30" concept="6" />
-      <node id="7656298970878399419" at="37,30,38,220" concept="0" />
-      <node id="7656298970878399419" at="37,30,38,220" concept="0" />
-      <node id="7656298970878399419" at="37,30,38,220" concept="2" />
-      <node id="7656298970878399419" at="38,220,39,24" concept="7" />
-      <node id="7656298970878398390" at="17,0,19,0" concept="1" trace="typeof_AbstractPrintExpression_InferenceRule#()V" />
-      <node id="7656298970878398390" at="26,0,29,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
-      <node id="7656298970878398390" at="29,0,32,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
-      <node id="7656298970878398390" at="32,0,35,0" concept="5" trace="overrides#()Z" />
-      <node id="7656298970878399354" at="19,136,24,5" concept="0" />
-      <node id="7656298970878399419" at="35,0,41,0" concept="9" trace="_quotation_createNode_5i9h05_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7656298970878398390" at="19,0,26,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
-      <scope id="7656298970878398390" at="17,57,17,57" />
-      <scope id="7656298970878398390" at="26,50,27,173" />
-      <scope id="7656298970878398390" at="29,68,30,102" />
-      <scope id="7656298970878398390" at="32,30,33,17" />
-      <scope id="7656298970878399419" at="37,30,38,220" />
-      <scope id="7656298970878398390" at="17,0,19,0" />
-      <scope id="7656298970878399354" at="20,5,23,285">
-        <var name="_info_12389875345" id="7656298970878399354" />
-        <var name="_nodeToCheck_1029348928467" id="7656298970878399354" />
-      </scope>
-      <scope id="7656298970878398390" at="26,0,29,0" />
-      <scope id="7656298970878398390" at="29,0,32,0">
-        <var name="argument" id="7656298970878398390" />
-      </scope>
-      <scope id="7656298970878398390" at="32,0,35,0" />
-      <scope id="7656298970878399419" at="35,61,39,24">
-        <var name="facade" id="7656298970878399419" />
-        <var name="quotedNode_1" id="7656298970878399419" />
-      </scope>
-      <scope id="7656298970878398391" at="19,136,24,5" />
-      <scope id="7656298970878399419" at="35,0,41,0" />
-      <scope id="7656298970878398390" at="19,0,26,0">
-        <var name="abstractPrintExpression" id="7656298970878398390" />
-        <var name="status" id="7656298970878398390" />
-        <var name="typeCheckingContext" id="7656298970878398390" />
-      </scope>
-      <unit id="7656298970878398390" at="16,0,42,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_AbstractPrintExpression_InferenceRule" />
+      <unit id="6864030874028745365" at="17,0,47,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_ModulesExpression_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/7738379549905488001">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/7738379549905488001">
     <file name="typeof_UsagesExpression_InferenceRule.java">
       <node id="7738379549905488875" at="21,5,22,46" concept="6" />
       <node id="7738379549905488875" at="22,46,23,208" concept="6" />
@@ -1258,10 +692,10 @@
         <var name="status" id="7738379549905488001" />
         <var name="typeCheckingContext" id="7738379549905488001" />
       </scope>
-      <unit id="7738379549905488001" at="17,0,59,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_UsagesExpression_InferenceRule" />
+      <unit id="7738379549905488001" at="17,0,59,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_UsagesExpression_InferenceRule" />
     </file>
   </root>
-  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)/7738379549910147904">
+  <root nodeRef="r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)/7738379549910147904">
     <file name="typeof_InstancesExpression_InferenceRule.java">
       <node id="7057947030084340457" at="23,5,24,225" concept="6" />
       <node id="7057947030084340457" at="24,225,25,208" concept="6" />
@@ -1449,8 +883,8 @@
         <var name="status" id="7738379549910147904" />
         <var name="typeCheckingContext" id="7738379549910147904" />
       </scope>
-      <unit id="6864030874024291258" at="37,67,56,9" name="jetbrains.mps.console.blCommand.typesystem.typeof_InstancesExpression_InferenceRule$1" />
-      <unit id="7738379549910147904" at="19,0,120,0" name="jetbrains.mps.console.blCommand.typesystem.typeof_InstancesExpression_InferenceRule" />
+      <unit id="6864030874024291258" at="37,67,56,9" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_InstancesExpression_InferenceRule$1" />
+      <unit id="7738379549910147904" at="19,0,120,0" name="jetbrains.mps.lang.smodel.query.typesystem.typeof_InstancesExpression_InferenceRule" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_CustomScope_InferenceRule.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_CustomScope_InferenceRule.java
index e12fedae5eb8..3b482aaba144 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_CustomScope_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -22,13 +22,13 @@ public void applyRule(final SNode customScope, final TypeCheckingContext typeChe
     if (!(typeCheckingContext.isSingleTypeComputation())) {
       {
         SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(customScope, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope"));
-        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759611777799", 0, null);
-        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759611770308", true), (SNode) _quotation_createNode_c5uzhx_a0a0b(), true, true, _info_12389875345);
+        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759611777799", 0, null);
+        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759611770308", true), (SNode) _quotation_createNode_c5uzhx_a0a0b(), true, true, _info_12389875345);
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, "jetbrains.mps.console.blCommand.structure.CustomScope");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, "jetbrains.mps.lang.smodel.query.structure.CustomScope");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_InstancesExpression_InferenceRule.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_InstancesExpression_InferenceRule.java
index 50a1935772d7..4fe30339ef40 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_InstancesExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -22,18 +22,18 @@ public typeof_InstancesExpression_InferenceRule() {
   public void applyRule(final SNode instancesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"));
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7057947030084340457", 0, null);
-      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7057947030084340460", true), (SNode) _quotation_createNode_dwt96n_a0a0b(), false, true, _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7057947030084340457", 0, null);
+      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7057947030084340460", true), (SNode) _quotation_createNode_dwt96n_a0a0b(), false, true, _info_12389875345);
     }
 
     {
       SNode _nodeToCheck_1029348928467 = instancesExpression;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "473081947984804985", 0, null);
-      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "473081947984804988", true), (SNode) _quotation_createNode_dwt96n_a0c0b(), false, true, _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "473081947984804985", 0, null);
+      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "473081947984804988", true), (SNode) _quotation_createNode_dwt96n_a0c0b(), false, true, _info_12389875345);
     }
     if (SNodeOperations.isInstanceOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x11885c0d945L, "jetbrains.mps.lang.smodel.structure.PoundExpression"))) {
       {
-        final SNode conceptParameterType = typeCheckingContext.typeOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024291279", true);
+        final SNode conceptParameterType = typeCheckingContext.typeOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024291279", true);
         typeCheckingContext.whenConcrete(conceptParameterType, new Runnable() {
           public void run() {
             if (SNodeOperations.isInstanceOf(typeCheckingContext.getExpandedNode(conceptParameterType), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, "jetbrains.mps.lang.smodel.structure.SConceptType"))) {
@@ -41,30 +41,30 @@ public void run() {
               if (SLinkOperations.getTarget(conceptType, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, 0x5cab42cd97571cefL, "conceptDeclaraton")) == null) {
                 {
                   SNode _nodeToCheck_1029348928467 = instancesExpression;
-                  EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024608968", 0, null);
-                  typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024608970", true), (SNode) _quotation_createNode_dwt96n_a0a0b0a0a0d0b(), _info_12389875345);
+                  EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024608968", 0, null);
+                  typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024608970", true), (SNode) _quotation_createNode_dwt96n_a0a0b0a0a0d0b(), _info_12389875345);
                 }
               } else {
                 {
                   SNode _nodeToCheck_1029348928467 = instancesExpression;
-                  EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024291267", 0, null);
-                  typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024291269", true), (SNode) _quotation_createNode_dwt96n_a0a0a1a0a0a3a1(SLinkOperations.getTarget(conceptType, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, 0x5cab42cd97571cefL, "conceptDeclaraton"))), _info_12389875345);
+                  EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024291267", 0, null);
+                  typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024291269", true), (SNode) _quotation_createNode_dwt96n_a0a0a1a0a0a3a1(SLinkOperations.getTarget(conceptType, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, 0x5cab42cd97571cefL, "conceptDeclaraton"))), _info_12389875345);
                 }
               }
             }
           }
-        }, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024291258", false, false);
+        }, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024291258", false, false);
       }
     } else if (SNodeOperations.isInstanceOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"))) {
       {
         SNode _nodeToCheck_1029348928467 = instancesExpression;
-        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4693937538539160493", 0, null);
-        typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4693937538539160495", true), (SNode) _quotation_createNode_dwt96n_a0a0a3a1(SLinkOperations.getTarget(SNodeOperations.cast(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference")), MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"))), _info_12389875345);
+        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "4693937538539160493", 0, null);
+        typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "4693937538539160495", true), (SNode) _quotation_createNode_dwt96n_a0a0a3a1(SLinkOperations.getTarget(SNodeOperations.cast(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference")), MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"))), _info_12389875345);
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelScopeLiteral_InferenceRule.java
similarity index 90%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelScopeLiteral_InferenceRule.java
index 67a77fad520f..96cb833af6b8 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelScopeLiteral_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -23,14 +23,14 @@ public void applyRule(final SNode modelScopeLiteral, final TypeCheckingContext t
       if (!(typeCheckingContext.isSingleTypeComputation())) {
         {
           SNode _nodeToCheck_1029348928467 = elem;
-          EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759611330834", 0, null);
-          typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759611330836", true), (SNode) _quotation_createNode_hadfae_a0a0a0b(), true, true, _info_12389875345);
+          EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759611330834", 0, null);
+          typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759611330836", true), (SNode) _quotation_createNode_hadfae_a0a0a0b(), true, true, _info_12389875345);
         }
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, "jetbrains.mps.console.blCommand.structure.ModelScope");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, "jetbrains.mps.lang.smodel.query.structure.ModelScope");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelsExpression_InferenceRule.java
similarity index 90%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelsExpression_InferenceRule.java
index cf2ef19cbb5b..2a92317f0435 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelsExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -19,12 +19,12 @@ public typeof_ModelsExpression_InferenceRule() {
   public void applyRule(final SNode modelsExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = modelsExpression;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874027864625", 0, null);
-      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874027864139", true), (SNode) _quotation_createNode_i8e9pf_a0a0b(), _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874027864625", 0, null);
+      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874027864139", true), (SNode) _quotation_createNode_i8e9pf_a0a0b(), _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675beab2dL, "jetbrains.mps.console.blCommand.structure.ModelsExpression");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675beab2dL, "jetbrains.mps.lang.smodel.query.structure.ModelsExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java
index 7f92902ccddb..a3865380ba38 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -24,14 +24,14 @@ public void applyRule(final SNode moduleScopeLiteral, final TypeCheckingContext
       if (!(typeCheckingContext.isSingleTypeComputation())) {
         {
           SNode _nodeToCheck_1029348928467 = elem;
-          EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759608999063", 0, null);
-          typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759608999069", true), (SNode) _quotation_createNode_51ub11_a0a0a0b(), true, true, _info_12389875345);
+          EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759608999063", 0, null);
+          typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759608999069", true), (SNode) _quotation_createNode_51ub11_a0a0a0b(), true, true, _info_12389875345);
         }
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, "jetbrains.mps.console.blCommand.structure.ModulesScope");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, "jetbrains.mps.lang.smodel.query.structure.ModulesScope");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModulesExpression_InferenceRule.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModulesExpression_InferenceRule.java
index b769937ee775..997f99519c6a 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModulesExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -20,12 +20,12 @@ public typeof_ModulesExpression_InferenceRule() {
   public void applyRule(final SNode modulesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = modulesExpression;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874028745824", 0, null);
-      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874028745375", true), (SNode) _quotation_createNode_2y0lxf_a0a0b(), _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874028745824", 0, null);
+      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874028745375", true), (SNode) _quotation_createNode_2y0lxf_a0a0b(), _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675cc2262L, "jetbrains.mps.console.blCommand.structure.ModulesExpression");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675cc2262L, "jetbrains.mps.lang.smodel.query.structure.ModulesExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_NodesExpresiion_InferenceRule.java
similarity index 90%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_NodesExpresiion_InferenceRule.java
index 96f02372239f..a43dea28aef2 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_NodesExpresiion_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -19,12 +19,12 @@ public typeof_NodesExpresiion_InferenceRule() {
   public void applyRule(final SNode nodesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = nodesExpression;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6322385757205373104", 0, null);
-      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6322385757205373115", true), (SNode) _quotation_createNode_4xyjb1_a0a0b(), _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6322385757205373104", 0, null);
+      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6322385757205373115", true), (SNode) _quotation_createNode_4xyjb1_a0a0b(), _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL, "jetbrains.mps.console.blCommand.structure.NodesExpression");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL, "jetbrains.mps.lang.smodel.query.structure.NodesExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ReferencesExpression_InferenceRule.java
similarity index 90%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ReferencesExpression_InferenceRule.java
index ed0d9f0b7c4b..957b7011d72f 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ReferencesExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -19,12 +19,12 @@ public typeof_ReferencesExpression_InferenceRule() {
   public void applyRule(final SNode referencesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = referencesExpression;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6322385757205641653", 0, null);
-      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6322385757205641659", true), (SNode) _quotation_createNode_bx15pu_a0a0b(), _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6322385757205641653", 0, null);
+      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6322385757205641659", true), (SNode) _quotation_createNode_bx15pu_a0a0b(), _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL, "jetbrains.mps.console.blCommand.structure.ReferencesExpression");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL, "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ScopeProvider_InferenceRule.java
similarity index 96%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ScopeProvider_InferenceRule.java
index f5e618f5d435..a8c2cb30905a 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ScopeProvider_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -21,12 +21,12 @@ public typeof_ScopeProvider_InferenceRule() {
   public void applyRule(final SNode scopeProvider, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(scopeProvider, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"));
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4234138103881642865", 0, null);
-      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4234138103881614549", true), (SNode) _quotation_createNode_jkxe46_a0a0b(), false, false, _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "4234138103881642865", 0, null);
+      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "4234138103881614549", true), (SNode) _quotation_createNode_jkxe46_a0a0b(), false, false, _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, "jetbrains.mps.console.blCommand.structure.WithStatement");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, "jetbrains.mps.lang.smodel.query.structure.WithStatement");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_UsagesExpression_InferenceRule.java
similarity index 90%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java
rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_UsagesExpression_InferenceRule.java
index a927dd43b139..611e6a9fc0ed 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java
+++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_UsagesExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.lang.smodel.query.typesystem;
 
 /*Generated by MPS */
 
@@ -20,19 +20,19 @@ public typeof_UsagesExpression_InferenceRule() {
   public void applyRule(final SNode expr, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = expr;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7738379549905488875", 0, null);
-      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7738379549905488404", true), (SNode) _quotation_createNode_qth3vr_a0a0b(), _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7738379549905488875", 0, null);
+      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7738379549905488404", true), (SNode) _quotation_createNode_qth3vr_a0a0b(), _info_12389875345);
     }
     if (!(typeCheckingContext.isSingleTypeComputation())) {
       {
         SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(expr, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node"));
-        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "473081947995054364", 0, null);
-        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "473081947995054370", true), (SNode) _quotation_createNode_qth3vr_a0b0b(), true, true, _info_12389875345);
+        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "473081947995054364", 0, null);
+        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "473081947995054370", true), (SNode) _quotation_createNode_qth3vr_a0b0b(), true, true, _info_12389875345);
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, "jetbrains.mps.console.blCommand.structure.UsagesExpression");
+    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, "jetbrains.mps.lang.smodel.query.structure.UsagesExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl b/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl
index 9e3d6ae32751..8891e6785b80 100644
--- a/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl
+++ b/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl
@@ -153,7 +153,7 @@
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language id="96ee7a94-411d-4cf8-9b94-96cad7e52411" fqName="jetbrains.mps.baseLanguage.jdk7" version="0" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/languageDesign/smodel/languageModels/migration.mps b/languages/languageDesign/smodel/languageModels/migration.mps
index c15f834b35ce..9cddb7a6ce00 100644
--- a/languages/languageDesign/smodel/languageModels/migration.mps
+++ b/languages/languageDesign/smodel/languageModels/migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -108,9 +108,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
         <property id="6478870542308703667" name="caption" index="3tTeZt" />
         <reference id="6478870542308703669" name="decl" index="3tTeZr" />
@@ -210,9 +207,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="Migrate_ModelNodesOperation_concept" />
     <node concept="3Tm1VV" id="2JFJZufO6pq" role="1B3o_S" />
-    <node concept="30mAcN" id="2JFJZufO6pr" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="2JFJZufO6ps" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated b/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated
index c915b26a7ec6..8a2123e00d27 100644
--- a/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated
+++ b/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="41selepwgdk213syxdc40wsoh5f2cmx" />
+<dependencies version="2" modelHash="-7dxd4mi1hybg3f9bqnwxhp8ak724mmj" />
 
diff --git a/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/migration/generated b/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/migration/generated
index 006633facf7b..36a031d703af 100644
--- a/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/migration/generated
+++ b/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="cej928jppxh1x8aobf8zeoay7zp4tpq" />
+<dependencies version="2" modelHash="cdkrnymzcmtb4sh8zzrp38nvmvxoopk" />
 
diff --git a/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl b/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl
index 3e11defef3e0..adc54ba37597 100644
--- a/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl
+++ b/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl
@@ -89,7 +89,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated b/languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated
index efddc2df3eca..82d54803913b 100644
--- a/languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated
+++ b/languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-8t6utbzcetnwxru3qq1l9byqx5aesif" />
+<dependencies version="2" modelHash="2gb2ed3hju6xp4f6xhv1ymx1oyrkjbd" />
 
diff --git a/languages/languageDesign/traceable.operations/jetbrains.mps.lang.traceable.operations.mpl b/languages/languageDesign/traceable.operations/jetbrains.mps.lang.traceable.operations.mpl
index 5dbcf9e71b53..a9f369304bd4 100644
--- a/languages/languageDesign/traceable.operations/jetbrains.mps.lang.traceable.operations.mpl
+++ b/languages/languageDesign/traceable.operations/jetbrains.mps.lang.traceable.operations.mpl
@@ -68,7 +68,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/languages/languageDesign/traceable.operations/languageModels/migration.mps b/languages/languageDesign/traceable.operations/languageModels/migration.mps
index cc33fc258f43..7057efb65c4d 100644
--- a/languages/languageDesign/traceable.operations/languageModels/migration.mps
+++ b/languages/languageDesign/traceable.operations/languageModels/migration.mps
@@ -11,8 +11,8 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpf3" ref="r:00000000-0000-4000-0000-011c895902f3(jetbrains.mps.lang.generator.generationContext.structure)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" implicit="true" />
     <import index="lyxe" ref="r:1e4195e3-e1e5-4a37-8e8b-eab96753b17f(jetbrains.mps.lang.traceable.operations.structure)" implicit="true" />
+    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -76,9 +76,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -154,9 +151,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="ReplaceNodeOperationsWithGenContextOp" />
     <node concept="3Tm1VV" id="7Uml8TvjNgl" role="1B3o_S" />
-    <node concept="30mAcN" id="7Uml8TvjNgm" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="7Uml8TvjNgn" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/generated b/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/generated
index e54a34865710..7e2bb98aecd6 100644
--- a/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/generated
+++ b/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-g53999bs6f2fod9rj5lkec3pda0c77" />
+<dependencies version="2" modelHash="63dikd6qffedfwrkxby5377tnrpsf0d" />
 
diff --git a/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/migration/generated b/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/migration/generated
index 2ff00df7472b..7835bd8f06e2 100644
--- a/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/migration/generated
+++ b/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-bz895vr4ca74kk55ytckso2i9omd2x3" />
+<dependencies version="2" modelHash="-bpwjwkcnpqq5f2bl19peb5ycplz3xg" />
 
diff --git a/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps b/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps
index 66065c1f801e..2ddf14576bf3 100644
--- a/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps
+++ b/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps
@@ -5,13 +5,15 @@
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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="0" />
-    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.console.blCommand" version="0" />
+    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
+    <use id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base" version="0" />
+    <use id="a5e4de53-46a3-44da-aab3-68fdf1c34ed0" name="jetbrains.mps.console.ideCommands" version="0" />
   </languages>
   <imports>
     <import index="afa5" ref="r:cfccec82-df72-4483-9807-88776b4673ab(jetbrains.mps.ide.make.actions)" />
@@ -150,6 +152,11 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="a5e4de53-46a3-44da-aab3-68fdf1c34ed0" name="jetbrains.mps.console.ideCommands">
+      <concept id="8483375838963816351" name="jetbrains.mps.console.ideCommands.structure.ShowExpression" flags="ng" index="24aHrZ">
+        <child id="7600370246423275637" name="object" index="iY1wd" />
+      </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" />
       <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
@@ -205,26 +212,19 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.console.blCommand">
-      <concept id="8483375838963816351" name="jetbrains.mps.console.blCommand.structure.ShowExpression" flags="ng" index="24aHrZ">
-        <child id="7600370246423275637" name="object" index="iY1wd" />
-      </concept>
-      <concept id="7656298970878093785" name="jetbrains.mps.console.blCommand.structure.BLExpression" flags="ng" index="f80E0">
-        <child id="7656298970878093890" name="expression" index="f80$r" />
-      </concept>
-      <concept id="7738379549910147341" name="jetbrains.mps.console.blCommand.structure.InstancesExpression" flags="ng" index="qVDSY">
+    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query">
+      <concept id="7738379549910147341" name="jetbrains.mps.lang.smodel.query.structure.InstancesExpression" flags="ng" index="qVDSY">
         <child id="7738379549910147342" name="conceptArg" index="qVDSX" />
       </concept>
-      <concept id="4307205004131544317" name="jetbrains.mps.console.blCommand.structure.QueryExpression" flags="ng" index="1dNuzs">
+      <concept id="4307205004131544317" name="jetbrains.mps.lang.smodel.query.structure.QueryExpression" flags="ng" index="1dNuzs">
         <child id="4307205004132279624" name="parameter" index="1dOa5D" />
       </concept>
-      <concept id="4307205004132277753" name="jetbrains.mps.console.blCommand.structure.QueryParameterList" flags="ng" index="1dO9Bo">
+      <concept id="4307205004132277753" name="jetbrains.mps.lang.smodel.query.structure.QueryParameterList" flags="ng" index="1dO9Bo">
         <child id="4307205004141421222" name="parameter" index="1dp2q7" />
       </concept>
-      <concept id="4307205004132412719" name="jetbrains.mps.console.blCommand.structure.QueryParameterScope" flags="ng" index="1dRE$e">
+      <concept id="4307205004132412719" name="jetbrains.mps.lang.smodel.query.structure.QueryParameterScope" flags="ng" index="1dRE$e">
         <child id="4307205004134707081" name="value" index="1dZqIC" />
       </concept>
-      <concept id="4307205004134636962" name="jetbrains.mps.console.blCommand.structure.ProjectScope" flags="ng" index="1dZ9A3" />
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -238,6 +238,12 @@
       </concept>
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
+    <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base">
+      <concept id="7656298970878093785" name="jetbrains.mps.console.base.structure.BLExpression" flags="ng" index="f80E0">
+        <child id="7656298970878093890" name="expression" index="f80$r" />
+      </concept>
+      <concept id="4307205004134636962" name="" flags="ng" index="1dZ9A3" />
+    </language>
   </registry>
   <node concept="sE7Ow" id="2UTM4$6j1gf">
     <property role="TrG5h" value="ShowGenerationPlan" />
diff --git a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated
index 88492b72f5b0..4bfec6a910cc 100644
--- a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated
+++ b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="5mlckdp85dkmh0wn42yl84y5p3pcpea" />
+<dependencies version="2" modelHash="7xhhdgu6rhzx1yl8lsesxq276mzreyx" />
 
diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java
index b688110c8934..49dbea9e614b 100644
--- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java
+++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java
@@ -81,16 +81,16 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) {
     SNode quotedNode_12 = null;
     SNode quotedNode_13 = null;
     SNode quotedNode_14 = null;
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression"), null, null, false);
-    quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.console.blCommand.structure.ShowExpression"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false);
+    quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, "jetbrains.mps.console.ideCommands.structure.ShowExpression"), null, null, false);
     quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false);
-    quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"), null, null, false);
+    quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false);
     quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false);
     SNodeAccessUtil.setReferenceTarget(quotedNode_7, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1);
     quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_7);
-    quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"), null, null, false);
-    quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"), null, null, false);
-    quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.console.blCommand.structure.ProjectScope"), null, null, false);
+    quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false);
+    quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false);
+    quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x3bc64421763adda2L, "jetbrains.mps.console.base.structure.ProjectScope"), null, null, false);
     quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_13);
     quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_10);
     quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_8);
@@ -107,8 +107,8 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) {
     quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_12);
     quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_9);
     quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_6);
-    quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_4);
-    quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3);
+    quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_4);
+    quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3);
     return quotedNode_2;
   }
 }
diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java
index dfe42435397c..6829dc2ee535 100644
--- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java
+++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java
@@ -87,13 +87,13 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) {
     SNode quotedNode_19 = null;
     SNode quotedNode_20 = null;
     SNode quotedNode_21 = null;
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false);
     quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false);
     quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false);
-    quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"), null, null, false);
-    quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"), null, null, false);
-    quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"), null, null, false);
-    quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.console.blCommand.structure.ProjectScope"), null, null, false);
+    quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false);
+    quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false);
+    quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false);
+    quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x3bc64421763adda2L, "jetbrains.mps.console.base.structure.ProjectScope"), null, null, false);
     quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_18);
     quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_14);
     quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_9);
@@ -131,7 +131,7 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) {
     quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_13);
     quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_8);
     quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_5);
-    quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3);
+    quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3);
     return quotedNode_2;
   }
 }
diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info
index 881585cdc89f..681a1bbe1a00 100644
--- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info
+++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info
@@ -48,17 +48,17 @@
       <node id="7752629037606952417" at="80,31,81,31" concept="6" />
       <node id="7752629037606952417" at="81,31,82,31" concept="6" />
       <node id="7752629037606952417" at="82,31,83,31" concept="6" />
-      <node id="7752629037606952417" at="83,31,84,235" concept="2" />
-      <node id="7752629037606952417" at="84,235,85,237" concept="2" />
-      <node id="7752629037606952417" at="85,237,86,226" concept="2" />
+      <node id="7752629037606952417" at="83,31,84,230" concept="2" />
+      <node id="7752629037606952417" at="84,230,85,239" concept="2" />
+      <node id="7752629037606952417" at="85,239,86,226" concept="2" />
       <node id="7752629037606952417" at="86,226,87,242" concept="2" />
       <node id="7752629037606952417" at="87,242,88,232" concept="2" />
       <node id="7752629037606952417" at="88,232,89,207" concept="2" />
       <node id="7752629037606952417" at="89,207,90,177" concept="2" />
       <node id="7752629037606952417" at="90,177,91,241" concept="2" />
       <node id="7752629037606952417" at="91,241,92,243" concept="2" />
-      <node id="7752629037606952417" at="92,243,93,236" concept="2" />
-      <node id="7752629037606952417" at="93,236,94,174" concept="2" />
+      <node id="7752629037606952417" at="92,243,93,231" concept="2" />
+      <node id="7752629037606952417" at="93,231,94,174" concept="2" />
       <node id="7752629037606952417" at="94,174,95,177" concept="2" />
       <node id="7752629037606952417" at="95,177,96,176" concept="2" />
       <node id="7752629037606952417" at="96,176,97,164" concept="2" />
@@ -107,10 +107,10 @@
       <node id="7752629037606952417" at="97,164,109,166" concept="0" />
       <node id="7752629037606952417" at="97,164,109,166" concept="0" />
       <node id="3355341743769121285" at="37,0,61,0" concept="5" trace="collectActionData#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)Z" />
-      <node id="7752629037606952417" at="85,237,110,173" concept="0" />
-      <node id="7752629037606952417" at="85,237,110,173" concept="0" />
-      <node id="7752629037606952417" at="84,235,111,177" concept="0" />
-      <node id="7752629037606952417" at="84,235,111,177" concept="0" />
+      <node id="7752629037606952417" at="85,239,110,173" concept="0" />
+      <node id="7752629037606952417" at="85,239,110,173" concept="0" />
+      <node id="7752629037606952417" at="84,230,111,177" concept="0" />
+      <node id="7752629037606952417" at="84,230,111,177" concept="0" />
       <node id="7752629037606952417" at="83,31,111,177" concept="0" />
       <node id="7752629037606952417" at="83,31,111,177" concept="0" />
       <node id="7752629037606952417" at="69,0,114,0" concept="10" trace="_quotation_createNode_flklsf_a0c0a#(Ljava/lang/Object;)Lorg/jetbrains/mps/openapi/model/SNode;" />
@@ -152,8 +152,8 @@
         <var name="_params" id="3355341743769121285" />
         <var name="event" id="3355341743769121285" />
       </scope>
-      <scope id="7752629037606952417" at="85,237,110,173" />
-      <scope id="7752629037606952417" at="84,235,111,177" />
+      <scope id="7752629037606952417" at="85,239,110,173" />
+      <scope id="7752629037606952417" at="84,230,111,177" />
       <scope id="7752629037606952417" at="83,31,111,177" />
       <scope id="7752629037606952417" at="69,79,112,24">
         <var name="facade" id="7752629037606952417" />
@@ -240,14 +240,14 @@
       <node id="3362819150777211506" at="86,31,87,31" concept="6" />
       <node id="3362819150777211506" at="87,31,88,31" concept="6" />
       <node id="3362819150777211506" at="88,31,89,31" concept="6" />
-      <node id="3362819150777211506" at="89,31,90,235" concept="2" />
-      <node id="3362819150777211506" at="90,235,91,226" concept="2" />
+      <node id="3362819150777211506" at="89,31,90,230" concept="2" />
+      <node id="3362819150777211506" at="90,230,91,226" concept="2" />
       <node id="3362819150777211506" at="91,226,92,226" concept="2" />
       <node id="3362819150777211506" at="92,226,93,242" concept="2" />
       <node id="3362819150777211506" at="93,242,94,241" concept="2" />
       <node id="3362819150777211506" at="94,241,95,243" concept="2" />
-      <node id="3362819150777211506" at="95,243,96,236" concept="2" />
-      <node id="3362819150777211506" at="96,236,97,174" concept="2" />
+      <node id="3362819150777211506" at="95,243,96,231" concept="2" />
+      <node id="3362819150777211506" at="96,231,97,174" concept="2" />
       <node id="3362819150777211506" at="97,174,98,177" concept="2" />
       <node id="3362819150777211506" at="98,177,99,176" concept="2" />
       <node id="3362819150777211506" at="99,176,100,233" concept="2" />
@@ -332,8 +332,8 @@
       <node id="3362819150777199432" at="37,0,61,0" concept="5" trace="collectActionData#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)Z" />
       <node id="3362819150777211506" at="91,226,121,164" concept="0" />
       <node id="3362819150777211506" at="91,226,121,164" concept="0" />
-      <node id="3362819150777211506" at="90,235,134,177" concept="0" />
-      <node id="3362819150777211506" at="90,235,134,177" concept="0" />
+      <node id="3362819150777211506" at="90,230,134,177" concept="0" />
+      <node id="3362819150777211506" at="90,230,134,177" concept="0" />
       <node id="3362819150777211506" at="89,31,134,177" concept="0" />
       <node id="3362819150777211506" at="89,31,134,177" concept="0" />
       <node id="3362819150777211506" at="68,0,137,0" concept="10" trace="_quotation_createNode_nwjg5s_a0b0a#(Ljava/lang/Object;)Lorg/jetbrains/mps/openapi/model/SNode;" />
@@ -382,7 +382,7 @@
         <var name="event" id="3362819150777199432" />
       </scope>
       <scope id="3362819150777211506" at="91,226,121,164" />
-      <scope id="3362819150777211506" at="90,235,134,177" />
+      <scope id="3362819150777211506" at="90,230,134,177" />
       <scope id="3362819150777211506" at="89,31,134,177" />
       <scope id="3362819150777211506" at="68,79,135,24">
         <var name="facade" id="3362819150777211506" />
diff --git a/plugins/console/console.iml b/plugins/console/console.iml
index f362d83469fb..3d71f8830d3b 100644
--- a/plugins/console/console.iml
+++ b/plugins/console/console.iml
@@ -23,6 +23,8 @@
     <orderEntry type="module" module-name="make-runtime" />
     <orderEntry type="library" name="Idea-plaform" level="project" />
     <orderEntry type="library" name="Annotations" level="project" />
+    <orderEntry type="module" module-name="mps-core" />
+    <orderEntry type="module" module-name="generator-engine" />
+    <orderEntry type="module" module-name="smodelquery-runtime" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/plugins/console/jetbrains.mps.console.actions.msd b/plugins/console/jetbrains.mps.console.actions.msd
index f8e8864305fd..3a1eddae9318 100644
--- a/plugins/console/jetbrains.mps.console.actions.msd
+++ b/plugins/console/jetbrains.mps.console.actions.msd
@@ -24,7 +24,7 @@
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" fqName="jetbrains.mps.console.base" version="0" />
-    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" fqName="jetbrains.mps.console.blCommand" version="0" />
+    <language id="a5e4de53-46a3-44da-aab3-68fdf1c34ed0" fqName="jetbrains.mps.console.ideCommands" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
@@ -32,6 +32,7 @@
     <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" fqName="jetbrains.mps.lang.plugin.standalone" version="0" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
+    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" fqName="jetbrains.mps.lang.smodel.query" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
 </solution>
diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies
index 8d5bc13116d7..d47f4271d4de 100644
--- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies
+++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies
@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
   <dependency className="jetbrains.mps.console.base.generator.template.main.QueriesGenerated" file="QueriesGenerated.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Object" />
+    <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.generator.runtime.Generated" />
+    <classNode dependClassName="jetbrains.mps.generator.template.BaseMappingRuleContext" />
+    <classNode dependClassName="jetbrains.mps.generator.template.PropertyMacroContext" />
+    <classNode dependClassName="jetbrains.mps.generator.template.ReferenceMacroContext" />
     <classNode dependClassName="jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext" />
+    <classNode dependClassName="jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.HUtil" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeChecker" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
   </dependency>
 </dependenciesRoot>
 
diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated
index 9e060da4d789..f8e6212c6b02 100644
--- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated
+++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="e84no333864fy0coqwt2s15111tzall" />
+<dependencies version="2" modelHash="-d6qgewq5n9pcsdvwfc0nporzrxpcegh" />
 
diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java
index 3ac9ef962473..9741b0e97d8e 100644
--- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java
+++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java
@@ -3,14 +3,366 @@
 /*Generated by MPS */
 
 import jetbrains.mps.generator.runtime.Generated;
-import org.jetbrains.mps.openapi.model.SNode;
-import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext;
+import jetbrains.mps.generator.template.BaseMappingRuleContext;
+import jetbrains.mps.typesystem.inference.TypeChecker;
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
 import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.typesystem.runtime.HUtil;
+import jetbrains.mps.internal.collections.runtime.ListSequence;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.generator.template.PropertyMacroContext;
+import jetbrains.mps.smodel.behaviour.BehaviorReflection;
+import jetbrains.mps.generator.template.ReferenceMacroContext;
+import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext;
+import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext;
+import org.jetbrains.mps.openapi.persistence.PersistenceFacade;
+import jetbrains.mps.smodel.SModelUtil_new;
+import jetbrains.mps.smodel.SReference;
 
 @Generated
 public class QueriesGenerated {
+  public static boolean baseMappingRule_Condition_3395429865810138642(final BaseMappingRuleContext _context) {
+    return TypeChecker.getInstance().getSubtypingManager().isSubtype(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), _quotation_createNode_x583g4_b0a0a0());
+  }
+  public static boolean baseMappingRule_Condition_7600370246419375459(final BaseMappingRuleContext _context) {
+    return TypeChecker.getInstance().getSubtypingManager().isSubtype(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), _quotation_createNode_x583g4_b0a0a1());
+  }
+  public static boolean baseMappingRule_Condition_7600370246421231722(final BaseMappingRuleContext _context) {
+    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
+    return TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a0b0c()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a0b0c_0()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a1a2()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0b0c());
+  }
+  public static boolean baseMappingRule_Condition_3856122757887589572(final BaseMappingRuleContext _context) {
+    SNode functionType = TypeChecker.getInstance().getRuntimeSupport().coerce_(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), HUtil.createMatchingPatternByConcept(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174a4d19ffL, "jetbrains.mps.baseLanguage.closures.structure.FunctionType")), false);
+    return functionType != null;
+  }
+  public static boolean baseMappingRule_Condition_3786816536599965790(final BaseMappingRuleContext _context) {
+    return ListSequence.fromList(SNodeOperations.getNodeDescendants(_context.getNode(), MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L, "jetbrains.mps.console.base.structure.PrintExpression"), false, new SAbstractConcept[]{})).isEmpty();
+  }
+  public static Object propertyMacro_GetPropertyValue_6690111761723079789(final PropertyMacroContext _context) {
+    return "closure : " + BehaviorReflection.invokeVirtual(String.class, TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), "virtual_getPresentation_1213877396640", new Object[]{});
+  }
+  public static Object propertyMacro_GetPropertyValue_9010839353952736697(final PropertyMacroContext _context) {
+    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a6())) {
+      return "nodes";
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a6())) {
+      return "references";
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a6())) {
+      return "models";
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a6())) {
+      return "modules";
+    }
+    return null;
+  }
+  public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) {
+    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a7())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844631948");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a7())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844631948");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a7())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844632137");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a7())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844632254");
+    }
+    return null;
+  }
+  public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) {
+    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a8())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263258755");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a8())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263262593");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a8())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263265578");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a8())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263268620");
+    }
+    return null;
+  }
   public static SNode sourceNodeQuery_1583916890562946186(final SourceSubstituteMacroNodeContext _context) {
     return SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command"));
   }
+  public static SNode sourceNodeQuery_7600370246429485751(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"));
+  }
+  public static SNode sourceNodeQuery_3395429865810287239(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+  }
+  public static SNode sourceNodeQuery_9010839353951768772(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+  }
+  public static SNode sourceNodeQuery_7600370246429334103(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+  }
+  public static SNode sourceNodeQuery_7600370246419387223(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+  }
+  public static SNode sourceNodeQuery_6134217374019005717(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+  }
+  public static SNode sourceNodeQuery_4598452390226163566(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+  }
+  public static SNode sourceNodeQuery_3501374812261883521(final SourceSubstituteMacroNodeContext _context) {
+    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a71())) {
+      return _quotation_createNode_x583g4_a0a1a71();
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a71())) {
+      return _quotation_createNode_x583g4_a0a2a71();
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a71())) {
+      return _quotation_createNode_x583g4_a0a3a71();
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a71())) {
+      return _quotation_createNode_x583g4_a0a4a71();
+    }
+    return null;
+  }
+  public static SNode sourceNodeQuery_9010839353952788840(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+  }
+  public static SNode sourceNodeQuery_5510759644748879578(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+  }
+  public static Iterable<SNode> sourceNodesQuery_5336086527852932024(final SourceSubstituteMacroNodesContext _context) {
+    return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"));
+  }
+  private static SNode _quotation_createNode_x583g4_b0a0a0() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a0a1() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a0a0b0c() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a0a0b0c_0() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a0a1a2() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a0b0c() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a1a6() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a2a6() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a3a6() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a4a6() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a1a7() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a2a7() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a3a7() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a4a7() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a1a8() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a2a8() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a3a8() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a4a8() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_a0a1a71() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference")));
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a1a71() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_a0a2a71() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference")));
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a2a71() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_a0a3a71() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SModelReference")));
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a3a71() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_a0a4a71() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModuleReference")));
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a4a71() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
 }
diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info
index ae346e39e466..8abadb78e15f 100644
--- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info
+++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info
@@ -1,15 +1,641 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <debug-info>
+  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
   <root>
     <file name="QueriesGenerated.java">
-      <unit at="11,0,17,0" name="jetbrains.mps.console.base.generator.template.main.QueriesGenerated" />
+      <unit at="24,0,369,0" name="jetbrains.mps.console.base.generator.template.main.QueriesGenerated" />
+    </file>
+  </root>
+  <root nodeRef="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)/4417779018064685310">
+    <file name="QueriesGenerated.java">
+      <node id="4598452390226163568" at="115,108,116,190" concept="4" />
+      <scope id="4598452390226163567" at="115,108,116,190" />
     </file>
   </root>
   <root nodeRef="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)/5336086527852743855">
     <file name="QueriesGenerated.java">
-      <node id="1583916890562946188" at="13,108,14,356" concept="0" />
-      <scope id="1583916890562946187" at="13,108,14,356" />
+      <node id="1583916890562946188" at="94,108,95,356" concept="4" />
+      <scope id="1583916890562946187" at="94,108,95,356" />
+    </file>
+  </root>
+  <root nodeRef="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)/5336086527852812352">
+    <file name="QueriesGenerated.java">
+      <node id="5336086527852935536" at="140,120,141,341" concept="4" />
+      <scope id="5336086527852932032" at="140,120,141,341" />
+    </file>
+  </root>
+  <root nodeRef="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)/5510759644748861143">
+    <file name="QueriesGenerated.java">
+      <node id="6134217374019005719" at="112,108,113,190" concept="4" />
+      <scope id="6134217374019005718" at="112,108,113,190" />
+    </file>
+  </root>
+  <root nodeRef="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)/7600370246415688284">
+    <file name="QueriesGenerated.java">
+      <node id="3395429865810173269" at="26,110,27,325" concept="4" />
+      <node id="7600370246421450740" at="29,110,30,325" concept="4" />
+      <node id="3786816536600308992" at="32,110,33,233" concept="3" />
+      <node id="7600370246421235139" at="33,233,34,443" concept="4" />
+      <node id="3492877759612498559" at="36,110,37,492" concept="3" />
+      <node id="6690111761722806259" at="37,492,38,32" concept="4" />
+      <node id="3786816536599975944" at="40,110,41,282" concept="4" />
+      <node id="6690111761723080555" at="43,112,44,347" concept="4" />
+      <node id="3395429865810287246" at="100,108,101,190" concept="4" />
+      <node id="9010839353951768774" at="103,108,104,190" concept="4" />
+      <node id="7600370246429334110" at="106,108,107,190" concept="4" />
+      <node id="7600370246419387225" at="109,108,110,190" concept="4" />
+      <node id="3395429865810173271" at="143,62,144,63" concept="3" />
+      <node id="3395429865810173271" at="144,63,145,30" concept="3" />
+      <node id="3395429865810173271" at="145,30,146,220" concept="0" />
+      <node id="3395429865810173271" at="145,30,146,220" concept="0" />
+      <node id="3395429865810173271" at="145,30,146,220" concept="1" />
+      <node id="3395429865810173271" at="146,220,147,24" concept="4" />
+      <node id="7600370246421453722" at="149,62,150,63" concept="3" />
+      <node id="7600370246421453722" at="150,63,151,30" concept="3" />
+      <node id="7600370246421453722" at="151,30,152,221" concept="0" />
+      <node id="7600370246421453722" at="151,30,152,221" concept="0" />
+      <node id="7600370246421453722" at="151,30,152,221" concept="1" />
+      <node id="7600370246421453722" at="152,221,153,24" concept="4" />
+      <node id="7600370246421477153" at="155,65,156,63" concept="3" />
+      <node id="7600370246421477153" at="156,63,157,30" concept="3" />
+      <node id="7600370246421477153" at="157,30,158,30" concept="3" />
+      <node id="7600370246421477153" at="158,30,159,237" concept="1" />
+      <node id="7600370246421477153" at="159,237,160,221" concept="1" />
+      <node id="7600370246421477153" at="160,221,161,168" concept="1" />
+      <node id="7600370246421477153" at="161,168,162,24" concept="4" />
+      <node id="7600370246421963074" at="164,67,165,63" concept="3" />
+      <node id="7600370246421963074" at="165,63,166,30" concept="3" />
+      <node id="7600370246421963074" at="166,30,167,30" concept="3" />
+      <node id="7600370246421963074" at="167,30,168,237" concept="1" />
+      <node id="7600370246421963074" at="168,237,169,231" concept="1" />
+      <node id="7600370246421963074" at="169,231,170,168" concept="1" />
+      <node id="7600370246421963074" at="170,168,171,24" concept="4" />
+      <node id="7600370246422041067" at="173,64,174,63" concept="3" />
+      <node id="7600370246422041067" at="174,63,175,30" concept="3" />
+      <node id="7600370246422041067" at="175,30,176,30" concept="3" />
+      <node id="7600370246422041067" at="176,30,177,237" concept="1" />
+      <node id="7600370246422041067" at="177,237,178,222" concept="1" />
+      <node id="7600370246422041067" at="178,222,179,168" concept="1" />
+      <node id="7600370246422041067" at="179,168,180,24" concept="4" />
+      <node id="7600370246422074415" at="182,63,183,63" concept="3" />
+      <node id="7600370246422074415" at="183,63,184,30" concept="3" />
+      <node id="7600370246422074415" at="184,30,185,30" concept="3" />
+      <node id="7600370246422074415" at="185,30,186,237" concept="1" />
+      <node id="7600370246422074415" at="186,237,187,227" concept="1" />
+      <node id="7600370246422074415" at="187,227,188,467" concept="1" />
+      <node id="7600370246422074415" at="188,467,189,168" concept="1" />
+      <node id="7600370246422074415" at="189,168,190,24" concept="4" />
+      <node id="7600370246421477153" at="159,237,161,168" concept="0" />
+      <node id="7600370246421477153" at="159,237,161,168" concept="0" />
+      <node id="7600370246421963074" at="168,237,170,168" concept="0" />
+      <node id="7600370246421963074" at="168,237,170,168" concept="0" />
+      <node id="7600370246422041067" at="177,237,179,168" concept="0" />
+      <node id="7600370246422041067" at="177,237,179,168" concept="0" />
+      <node id="7600370246421477153" at="158,30,161,168" concept="0" />
+      <node id="7600370246421477153" at="158,30,161,168" concept="0" />
+      <node id="7600370246421963074" at="167,30,170,168" concept="0" />
+      <node id="7600370246421963074" at="167,30,170,168" concept="0" />
+      <node id="7600370246422041067" at="176,30,179,168" concept="0" />
+      <node id="7600370246422041067" at="176,30,179,168" concept="0" />
+      <node id="7600370246422074415" at="186,237,189,168" concept="0" />
+      <node id="7600370246422074415" at="186,237,189,168" concept="0" />
+      <node id="7600370246422074415" at="185,30,189,168" concept="0" />
+      <node id="7600370246422074415" at="185,30,189,168" concept="0" />
+      <node id="3395429865810173271" at="143,0,149,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7600370246421453722" at="149,0,155,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a1#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7600370246421477153" at="155,0,164,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a0b0c#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7600370246421963074" at="164,0,173,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a0b0c_0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7600370246422041067" at="173,0,182,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a1a2#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7600370246422074415" at="182,0,192,0" concept="5" trace="_quotation_createNode_x583g4_b0a0b0c#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="3395429865810138643" at="26,110,27,325" />
+      <scope id="7600370246419375460" at="29,110,30,325" />
+      <scope id="3786816536599965791" at="40,110,41,282" />
+      <scope id="6690111761723079790" at="43,112,44,347" />
+      <scope id="3395429865810287240" at="100,108,101,190" />
+      <scope id="9010839353951768773" at="103,108,104,190" />
+      <scope id="7600370246429334104" at="106,108,107,190" />
+      <scope id="7600370246419387224" at="109,108,110,190" />
+      <scope id="3395429865810173271" at="145,30,146,220" />
+      <scope id="7600370246421453722" at="151,30,152,221" />
+      <scope id="7600370246421231723" at="32,110,34,443">
+        <var name="type" id="3786816536600308995" />
+      </scope>
+      <scope id="3856122757887589573" at="36,110,38,32">
+        <var name="functionType" id="3492877759612498562" />
+      </scope>
+      <scope id="7600370246421477153" at="159,237,161,168" />
+      <scope id="7600370246421963074" at="168,237,170,168" />
+      <scope id="7600370246422041067" at="177,237,179,168" />
+      <scope id="7600370246421477153" at="158,30,161,168" />
+      <scope id="7600370246421963074" at="167,30,170,168" />
+      <scope id="7600370246422041067" at="176,30,179,168" />
+      <scope id="7600370246422074415" at="186,237,189,168" />
+      <scope id="3395429865810173271" at="143,62,147,24">
+        <var name="facade" id="3395429865810173271" />
+        <var name="quotedNode_1" id="3395429865810173271" />
+      </scope>
+      <scope id="7600370246421453722" at="149,62,153,24">
+        <var name="facade" id="7600370246421453722" />
+        <var name="quotedNode_1" id="7600370246421453722" />
+      </scope>
+      <scope id="7600370246422074415" at="185,30,189,168" />
+      <scope id="3395429865810173271" at="143,0,149,0" />
+      <scope id="7600370246421453722" at="149,0,155,0" />
+      <scope id="7600370246421477153" at="155,65,162,24">
+        <var name="facade" id="7600370246421477153" />
+        <var name="quotedNode_1" id="7600370246421477153" />
+        <var name="quotedNode_2" id="7600370246421477153" />
+      </scope>
+      <scope id="7600370246421963074" at="164,67,171,24">
+        <var name="facade" id="7600370246421963074" />
+        <var name="quotedNode_1" id="7600370246421963074" />
+        <var name="quotedNode_2" id="7600370246421963074" />
+      </scope>
+      <scope id="7600370246422041067" at="173,64,180,24">
+        <var name="facade" id="7600370246422041067" />
+        <var name="quotedNode_1" id="7600370246422041067" />
+        <var name="quotedNode_2" id="7600370246422041067" />
+      </scope>
+      <scope id="7600370246422074415" at="182,63,190,24">
+        <var name="facade" id="7600370246422074415" />
+        <var name="quotedNode_1" id="7600370246422074415" />
+        <var name="quotedNode_2" id="7600370246422074415" />
+      </scope>
+      <scope id="7600370246421477153" at="155,0,164,0" />
+      <scope id="7600370246421963074" at="164,0,173,0" />
+      <scope id="7600370246422041067" at="173,0,182,0" />
+      <scope id="7600370246422074415" at="182,0,192,0" />
+    </file>
+  </root>
+  <root nodeRef="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)/7600370246423001816">
+    <file name="QueriesGenerated.java">
+      <node id="9010839353952736699" at="46,112,47,233" concept="3" />
+      <node id="9010839353952736709" at="48,113,49,21" concept="4" />
+      <node id="9010839353952736718" at="51,113,52,26" concept="4" />
+      <node id="9010839353952736727" at="54,113,55,22" concept="4" />
+      <node id="9010839353952736736" at="57,113,58,23" concept="4" />
+      <node id="9010839353952736743" at="59,5,60,16" concept="4" />
+      <node id="1597470200014435809" at="62,109,63,233" concept="3" />
+      <node id="1597470200014435819" at="64,113,65,130" concept="4" />
+      <node id="1597470200014435829" at="67,113,68,130" concept="4" />
+      <node id="1597470200014435839" at="70,113,71,130" concept="4" />
+      <node id="1597470200014435849" at="73,113,74,130" concept="4" />
+      <node id="1597470200014435857" at="75,5,76,16" concept="4" />
+      <node id="3501374812263557030" at="78,109,79,233" concept="3" />
+      <node id="3501374812263557040" at="80,113,81,130" concept="4" />
+      <node id="3501374812263557050" at="83,113,84,130" concept="4" />
+      <node id="3501374812263557060" at="86,113,87,130" concept="4" />
+      <node id="3501374812263557070" at="89,113,90,130" concept="4" />
+      <node id="3501374812263557078" at="91,5,92,16" concept="4" />
+      <node id="3501374812260750913" at="118,108,119,233" concept="3" />
+      <node id="3501374812260750923" at="120,114,121,52" concept="4" />
+      <node id="3501374812260750933" at="123,114,124,52" concept="4" />
+      <node id="3501374812260750943" at="126,114,127,52" concept="4" />
+      <node id="3501374812260750953" at="129,114,130,52" concept="4" />
+      <node id="3501374812260750961" at="131,5,132,16" concept="4" />
+      <node id="9010839353952788842" at="134,108,135,190" concept="4" />
+      <node id="9010839353952736713" at="192,62,193,63" concept="3" />
+      <node id="9010839353952736713" at="193,63,194,30" concept="3" />
+      <node id="9010839353952736713" at="194,30,195,30" concept="3" />
+      <node id="9010839353952736713" at="195,30,196,237" concept="1" />
+      <node id="9010839353952736713" at="196,237,197,221" concept="1" />
+      <node id="9010839353952736713" at="197,221,198,168" concept="1" />
+      <node id="9010839353952736713" at="198,168,199,24" concept="4" />
+      <node id="9010839353952736722" at="201,62,202,63" concept="3" />
+      <node id="9010839353952736722" at="202,63,203,30" concept="3" />
+      <node id="9010839353952736722" at="203,30,204,30" concept="3" />
+      <node id="9010839353952736722" at="204,30,205,237" concept="1" />
+      <node id="9010839353952736722" at="205,237,206,231" concept="1" />
+      <node id="9010839353952736722" at="206,231,207,168" concept="1" />
+      <node id="9010839353952736722" at="207,168,208,24" concept="4" />
+      <node id="9010839353952736731" at="210,62,211,63" concept="3" />
+      <node id="9010839353952736731" at="211,63,212,30" concept="3" />
+      <node id="9010839353952736731" at="212,30,213,30" concept="3" />
+      <node id="9010839353952736731" at="213,30,214,237" concept="1" />
+      <node id="9010839353952736731" at="214,237,215,222" concept="1" />
+      <node id="9010839353952736731" at="215,222,216,168" concept="1" />
+      <node id="9010839353952736731" at="216,168,217,24" concept="4" />
+      <node id="9010839353952736740" at="219,62,220,63" concept="3" />
+      <node id="9010839353952736740" at="220,63,221,30" concept="3" />
+      <node id="9010839353952736740" at="221,30,222,30" concept="3" />
+      <node id="9010839353952736740" at="222,30,223,237" concept="1" />
+      <node id="9010839353952736740" at="223,237,224,227" concept="1" />
+      <node id="9010839353952736740" at="224,227,225,467" concept="1" />
+      <node id="9010839353952736740" at="225,467,226,168" concept="1" />
+      <node id="9010839353952736740" at="226,168,227,24" concept="4" />
+      <node id="1597470200014435824" at="229,62,230,63" concept="3" />
+      <node id="1597470200014435824" at="230,63,231,30" concept="3" />
+      <node id="1597470200014435824" at="231,30,232,30" concept="3" />
+      <node id="1597470200014435824" at="232,30,233,237" concept="1" />
+      <node id="1597470200014435824" at="233,237,234,221" concept="1" />
+      <node id="1597470200014435824" at="234,221,235,168" concept="1" />
+      <node id="1597470200014435824" at="235,168,236,24" concept="4" />
+      <node id="1597470200014435834" at="238,62,239,63" concept="3" />
+      <node id="1597470200014435834" at="239,63,240,30" concept="3" />
+      <node id="1597470200014435834" at="240,30,241,30" concept="3" />
+      <node id="1597470200014435834" at="241,30,242,237" concept="1" />
+      <node id="1597470200014435834" at="242,237,243,231" concept="1" />
+      <node id="1597470200014435834" at="243,231,244,168" concept="1" />
+      <node id="1597470200014435834" at="244,168,245,24" concept="4" />
+      <node id="1597470200014435844" at="247,62,248,63" concept="3" />
+      <node id="1597470200014435844" at="248,63,249,30" concept="3" />
+      <node id="1597470200014435844" at="249,30,250,30" concept="3" />
+      <node id="1597470200014435844" at="250,30,251,237" concept="1" />
+      <node id="1597470200014435844" at="251,237,252,222" concept="1" />
+      <node id="1597470200014435844" at="252,222,253,168" concept="1" />
+      <node id="1597470200014435844" at="253,168,254,24" concept="4" />
+      <node id="1597470200014435854" at="256,62,257,63" concept="3" />
+      <node id="1597470200014435854" at="257,63,258,30" concept="3" />
+      <node id="1597470200014435854" at="258,30,259,30" concept="3" />
+      <node id="1597470200014435854" at="259,30,260,237" concept="1" />
+      <node id="1597470200014435854" at="260,237,261,227" concept="1" />
+      <node id="1597470200014435854" at="261,227,262,467" concept="1" />
+      <node id="1597470200014435854" at="262,467,263,168" concept="1" />
+      <node id="1597470200014435854" at="263,168,264,24" concept="4" />
+      <node id="3501374812263557045" at="266,62,267,63" concept="3" />
+      <node id="3501374812263557045" at="267,63,268,30" concept="3" />
+      <node id="3501374812263557045" at="268,30,269,30" concept="3" />
+      <node id="3501374812263557045" at="269,30,270,237" concept="1" />
+      <node id="3501374812263557045" at="270,237,271,221" concept="1" />
+      <node id="3501374812263557045" at="271,221,272,168" concept="1" />
+      <node id="3501374812263557045" at="272,168,273,24" concept="4" />
+      <node id="3501374812263557055" at="275,62,276,63" concept="3" />
+      <node id="3501374812263557055" at="276,63,277,30" concept="3" />
+      <node id="3501374812263557055" at="277,30,278,30" concept="3" />
+      <node id="3501374812263557055" at="278,30,279,237" concept="1" />
+      <node id="3501374812263557055" at="279,237,280,231" concept="1" />
+      <node id="3501374812263557055" at="280,231,281,168" concept="1" />
+      <node id="3501374812263557055" at="281,168,282,24" concept="4" />
+      <node id="3501374812263557065" at="284,62,285,63" concept="3" />
+      <node id="3501374812263557065" at="285,63,286,30" concept="3" />
+      <node id="3501374812263557065" at="286,30,287,30" concept="3" />
+      <node id="3501374812263557065" at="287,30,288,237" concept="1" />
+      <node id="3501374812263557065" at="288,237,289,222" concept="1" />
+      <node id="3501374812263557065" at="289,222,290,168" concept="1" />
+      <node id="3501374812263557065" at="290,168,291,24" concept="4" />
+      <node id="3501374812263557075" at="293,62,294,63" concept="3" />
+      <node id="3501374812263557075" at="294,63,295,30" concept="3" />
+      <node id="3501374812263557075" at="295,30,296,30" concept="3" />
+      <node id="3501374812263557075" at="296,30,297,237" concept="1" />
+      <node id="3501374812263557075" at="297,237,298,227" concept="1" />
+      <node id="3501374812263557075" at="298,227,299,467" concept="1" />
+      <node id="3501374812263557075" at="299,467,300,168" concept="1" />
+      <node id="3501374812263557075" at="300,168,301,24" concept="4" />
+      <node id="3501374812260844593" at="303,63,304,63" concept="3" />
+      <node id="3501374812260844593" at="304,63,305,30" concept="3" />
+      <node id="3501374812260844593" at="305,30,306,227" concept="1" />
+      <node id="3501374812260844593" at="306,227,307,473" concept="1" />
+      <node id="3501374812260844593" at="307,473,308,24" concept="4" />
+      <node id="3501374812260750928" at="310,63,311,63" concept="3" />
+      <node id="3501374812260750928" at="311,63,312,30" concept="3" />
+      <node id="3501374812260750928" at="312,30,313,30" concept="3" />
+      <node id="3501374812260750928" at="313,30,314,237" concept="1" />
+      <node id="3501374812260750928" at="314,237,315,221" concept="1" />
+      <node id="3501374812260750928" at="315,221,316,168" concept="1" />
+      <node id="3501374812260750928" at="316,168,317,24" concept="4" />
+      <node id="3501374812261036436" at="319,63,320,63" concept="3" />
+      <node id="3501374812261036436" at="320,63,321,30" concept="3" />
+      <node id="3501374812261036436" at="321,30,322,227" concept="1" />
+      <node id="3501374812261036436" at="322,227,323,473" concept="1" />
+      <node id="3501374812261036436" at="323,473,324,24" concept="4" />
+      <node id="3501374812260750938" at="326,63,327,63" concept="3" />
+      <node id="3501374812260750938" at="327,63,328,30" concept="3" />
+      <node id="3501374812260750938" at="328,30,329,30" concept="3" />
+      <node id="3501374812260750938" at="329,30,330,237" concept="1" />
+      <node id="3501374812260750938" at="330,237,331,231" concept="1" />
+      <node id="3501374812260750938" at="331,231,332,168" concept="1" />
+      <node id="3501374812260750938" at="332,168,333,24" concept="4" />
+      <node id="3501374812261085488" at="335,63,336,63" concept="3" />
+      <node id="3501374812261085488" at="336,63,337,30" concept="3" />
+      <node id="3501374812261085488" at="337,30,338,227" concept="1" />
+      <node id="3501374812261085488" at="338,227,339,474" concept="1" />
+      <node id="3501374812261085488" at="339,474,340,24" concept="4" />
+      <node id="3501374812260750948" at="342,63,343,63" concept="3" />
+      <node id="3501374812260750948" at="343,63,344,30" concept="3" />
+      <node id="3501374812260750948" at="344,30,345,30" concept="3" />
+      <node id="3501374812260750948" at="345,30,346,237" concept="1" />
+      <node id="3501374812260750948" at="346,237,347,222" concept="1" />
+      <node id="3501374812260750948" at="347,222,348,168" concept="1" />
+      <node id="3501374812260750948" at="348,168,349,24" concept="4" />
+      <node id="3501374812261134552" at="351,63,352,63" concept="3" />
+      <node id="3501374812261134552" at="352,63,353,30" concept="3" />
+      <node id="3501374812261134552" at="353,30,354,227" concept="1" />
+      <node id="3501374812261134552" at="354,227,355,476" concept="1" />
+      <node id="3501374812261134552" at="355,476,356,24" concept="4" />
+      <node id="3501374812260750958" at="358,63,359,63" concept="3" />
+      <node id="3501374812260750958" at="359,63,360,30" concept="3" />
+      <node id="3501374812260750958" at="360,30,361,30" concept="3" />
+      <node id="3501374812260750958" at="361,30,362,237" concept="1" />
+      <node id="3501374812260750958" at="362,237,363,227" concept="1" />
+      <node id="3501374812260750958" at="363,227,364,467" concept="1" />
+      <node id="3501374812260750958" at="364,467,365,168" concept="1" />
+      <node id="3501374812260750958" at="365,168,366,24" concept="4" />
+      <node id="9010839353952736713" at="196,237,198,168" concept="0" />
+      <node id="9010839353952736713" at="196,237,198,168" concept="0" />
+      <node id="9010839353952736722" at="205,237,207,168" concept="0" />
+      <node id="9010839353952736722" at="205,237,207,168" concept="0" />
+      <node id="9010839353952736731" at="214,237,216,168" concept="0" />
+      <node id="9010839353952736731" at="214,237,216,168" concept="0" />
+      <node id="1597470200014435824" at="233,237,235,168" concept="0" />
+      <node id="1597470200014435824" at="233,237,235,168" concept="0" />
+      <node id="1597470200014435834" at="242,237,244,168" concept="0" />
+      <node id="1597470200014435834" at="242,237,244,168" concept="0" />
+      <node id="1597470200014435844" at="251,237,253,168" concept="0" />
+      <node id="1597470200014435844" at="251,237,253,168" concept="0" />
+      <node id="3501374812263557045" at="270,237,272,168" concept="0" />
+      <node id="3501374812263557045" at="270,237,272,168" concept="0" />
+      <node id="3501374812263557055" at="279,237,281,168" concept="0" />
+      <node id="3501374812263557055" at="279,237,281,168" concept="0" />
+      <node id="3501374812263557065" at="288,237,290,168" concept="0" />
+      <node id="3501374812263557065" at="288,237,290,168" concept="0" />
+      <node id="3501374812260844593" at="305,30,307,473" concept="0" />
+      <node id="3501374812260844593" at="305,30,307,473" concept="0" />
+      <node id="3501374812260750928" at="314,237,316,168" concept="0" />
+      <node id="3501374812260750928" at="314,237,316,168" concept="0" />
+      <node id="3501374812261036436" at="321,30,323,473" concept="0" />
+      <node id="3501374812261036436" at="321,30,323,473" concept="0" />
+      <node id="3501374812260750938" at="330,237,332,168" concept="0" />
+      <node id="3501374812260750938" at="330,237,332,168" concept="0" />
+      <node id="3501374812261085488" at="337,30,339,474" concept="0" />
+      <node id="3501374812261085488" at="337,30,339,474" concept="0" />
+      <node id="3501374812260750948" at="346,237,348,168" concept="0" />
+      <node id="3501374812260750948" at="346,237,348,168" concept="0" />
+      <node id="3501374812261134552" at="353,30,355,476" concept="0" />
+      <node id="3501374812261134552" at="353,30,355,476" concept="0" />
+      <node id="9010839353952736707" at="47,233,50,5" concept="2" />
+      <node id="9010839353952736716" at="50,5,53,5" concept="2" />
+      <node id="9010839353952736725" at="53,5,56,5" concept="2" />
+      <node id="9010839353952736734" at="56,5,59,5" concept="2" />
+      <node id="1597470200014435817" at="63,233,66,5" concept="2" />
+      <node id="1597470200014435827" at="66,5,69,5" concept="2" />
+      <node id="1597470200014435837" at="69,5,72,5" concept="2" />
+      <node id="1597470200014435847" at="72,5,75,5" concept="2" />
+      <node id="3501374812263557038" at="79,233,82,5" concept="2" />
+      <node id="3501374812263557048" at="82,5,85,5" concept="2" />
+      <node id="3501374812263557058" at="85,5,88,5" concept="2" />
+      <node id="3501374812263557068" at="88,5,91,5" concept="2" />
+      <node id="3501374812260750921" at="119,233,122,5" concept="2" />
+      <node id="3501374812260750931" at="122,5,125,5" concept="2" />
+      <node id="3501374812260750941" at="125,5,128,5" concept="2" />
+      <node id="3501374812260750951" at="128,5,131,5" concept="2" />
+      <node id="9010839353952736713" at="195,30,198,168" concept="0" />
+      <node id="9010839353952736713" at="195,30,198,168" concept="0" />
+      <node id="9010839353952736722" at="204,30,207,168" concept="0" />
+      <node id="9010839353952736722" at="204,30,207,168" concept="0" />
+      <node id="9010839353952736731" at="213,30,216,168" concept="0" />
+      <node id="9010839353952736731" at="213,30,216,168" concept="0" />
+      <node id="9010839353952736740" at="223,237,226,168" concept="0" />
+      <node id="9010839353952736740" at="223,237,226,168" concept="0" />
+      <node id="1597470200014435824" at="232,30,235,168" concept="0" />
+      <node id="1597470200014435824" at="232,30,235,168" concept="0" />
+      <node id="1597470200014435834" at="241,30,244,168" concept="0" />
+      <node id="1597470200014435834" at="241,30,244,168" concept="0" />
+      <node id="1597470200014435844" at="250,30,253,168" concept="0" />
+      <node id="1597470200014435844" at="250,30,253,168" concept="0" />
+      <node id="1597470200014435854" at="260,237,263,168" concept="0" />
+      <node id="1597470200014435854" at="260,237,263,168" concept="0" />
+      <node id="3501374812263557045" at="269,30,272,168" concept="0" />
+      <node id="3501374812263557045" at="269,30,272,168" concept="0" />
+      <node id="3501374812263557055" at="278,30,281,168" concept="0" />
+      <node id="3501374812263557055" at="278,30,281,168" concept="0" />
+      <node id="3501374812263557065" at="287,30,290,168" concept="0" />
+      <node id="3501374812263557065" at="287,30,290,168" concept="0" />
+      <node id="3501374812263557075" at="297,237,300,168" concept="0" />
+      <node id="3501374812263557075" at="297,237,300,168" concept="0" />
+      <node id="3501374812260750928" at="313,30,316,168" concept="0" />
+      <node id="3501374812260750928" at="313,30,316,168" concept="0" />
+      <node id="3501374812260750938" at="329,30,332,168" concept="0" />
+      <node id="3501374812260750938" at="329,30,332,168" concept="0" />
+      <node id="3501374812260750948" at="345,30,348,168" concept="0" />
+      <node id="3501374812260750948" at="345,30,348,168" concept="0" />
+      <node id="3501374812260750958" at="362,237,365,168" concept="0" />
+      <node id="3501374812260750958" at="362,237,365,168" concept="0" />
+      <node id="9010839353952736740" at="222,30,226,168" concept="0" />
+      <node id="9010839353952736740" at="222,30,226,168" concept="0" />
+      <node id="1597470200014435854" at="259,30,263,168" concept="0" />
+      <node id="1597470200014435854" at="259,30,263,168" concept="0" />
+      <node id="3501374812263557075" at="296,30,300,168" concept="0" />
+      <node id="3501374812263557075" at="296,30,300,168" concept="0" />
+      <node id="3501374812260750958" at="361,30,365,168" concept="0" />
+      <node id="3501374812260750958" at="361,30,365,168" concept="0" />
+      <node id="3501374812260844593" at="303,0,310,0" concept="5" trace="_quotation_createNode_x583g4_a0a1a71#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812261036436" at="319,0,326,0" concept="5" trace="_quotation_createNode_x583g4_a0a2a71#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812261085488" at="335,0,342,0" concept="5" trace="_quotation_createNode_x583g4_a0a3a71#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812261134552" at="351,0,358,0" concept="5" trace="_quotation_createNode_x583g4_a0a4a71#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="9010839353952736713" at="192,0,201,0" concept="5" trace="_quotation_createNode_x583g4_b0a1a6#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="9010839353952736722" at="201,0,210,0" concept="5" trace="_quotation_createNode_x583g4_b0a2a6#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="9010839353952736731" at="210,0,219,0" concept="5" trace="_quotation_createNode_x583g4_b0a3a6#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1597470200014435824" at="229,0,238,0" concept="5" trace="_quotation_createNode_x583g4_b0a1a7#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1597470200014435834" at="238,0,247,0" concept="5" trace="_quotation_createNode_x583g4_b0a2a7#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1597470200014435844" at="247,0,256,0" concept="5" trace="_quotation_createNode_x583g4_b0a3a7#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812263557045" at="266,0,275,0" concept="5" trace="_quotation_createNode_x583g4_b0a1a8#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812263557055" at="275,0,284,0" concept="5" trace="_quotation_createNode_x583g4_b0a2a8#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812263557065" at="284,0,293,0" concept="5" trace="_quotation_createNode_x583g4_b0a3a8#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812260750928" at="310,0,319,0" concept="5" trace="_quotation_createNode_x583g4_b0a1a71#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812260750938" at="326,0,335,0" concept="5" trace="_quotation_createNode_x583g4_b0a2a71#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812260750948" at="342,0,351,0" concept="5" trace="_quotation_createNode_x583g4_b0a3a71#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="9010839353952736740" at="219,0,229,0" concept="5" trace="_quotation_createNode_x583g4_b0a4a6#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1597470200014435854" at="256,0,266,0" concept="5" trace="_quotation_createNode_x583g4_b0a4a7#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812263557075" at="293,0,303,0" concept="5" trace="_quotation_createNode_x583g4_b0a4a8#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3501374812260750958" at="358,0,368,0" concept="5" trace="_quotation_createNode_x583g4_b0a4a71#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="9010839353952736708" at="48,113,49,21" />
+      <scope id="9010839353952736717" at="51,113,52,26" />
+      <scope id="9010839353952736726" at="54,113,55,22" />
+      <scope id="9010839353952736735" at="57,113,58,23" />
+      <scope id="1597470200014435818" at="64,113,65,130" />
+      <scope id="1597470200014435828" at="67,113,68,130" />
+      <scope id="1597470200014435838" at="70,113,71,130" />
+      <scope id="1597470200014435848" at="73,113,74,130" />
+      <scope id="3501374812263557039" at="80,113,81,130" />
+      <scope id="3501374812263557049" at="83,113,84,130" />
+      <scope id="3501374812263557059" at="86,113,87,130" />
+      <scope id="3501374812263557069" at="89,113,90,130" />
+      <scope id="3501374812260750922" at="120,114,121,52" />
+      <scope id="3501374812260750932" at="123,114,124,52" />
+      <scope id="3501374812260750942" at="126,114,127,52" />
+      <scope id="3501374812260750952" at="129,114,130,52" />
+      <scope id="9010839353952788841" at="134,108,135,190" />
+      <scope id="9010839353952736713" at="196,237,198,168" />
+      <scope id="9010839353952736722" at="205,237,207,168" />
+      <scope id="9010839353952736731" at="214,237,216,168" />
+      <scope id="1597470200014435824" at="233,237,235,168" />
+      <scope id="1597470200014435834" at="242,237,244,168" />
+      <scope id="1597470200014435844" at="251,237,253,168" />
+      <scope id="3501374812263557045" at="270,237,272,168" />
+      <scope id="3501374812263557055" at="279,237,281,168" />
+      <scope id="3501374812263557065" at="288,237,290,168" />
+      <scope id="3501374812260844593" at="305,30,307,473" />
+      <scope id="3501374812260750928" at="314,237,316,168" />
+      <scope id="3501374812261036436" at="321,30,323,473" />
+      <scope id="3501374812260750938" at="330,237,332,168" />
+      <scope id="3501374812261085488" at="337,30,339,474" />
+      <scope id="3501374812260750948" at="346,237,348,168" />
+      <scope id="3501374812261134552" at="353,30,355,476" />
+      <scope id="9010839353952736713" at="195,30,198,168" />
+      <scope id="9010839353952736722" at="204,30,207,168" />
+      <scope id="9010839353952736731" at="213,30,216,168" />
+      <scope id="9010839353952736740" at="223,237,226,168" />
+      <scope id="1597470200014435824" at="232,30,235,168" />
+      <scope id="1597470200014435834" at="241,30,244,168" />
+      <scope id="1597470200014435844" at="250,30,253,168" />
+      <scope id="1597470200014435854" at="260,237,263,168" />
+      <scope id="3501374812263557045" at="269,30,272,168" />
+      <scope id="3501374812263557055" at="278,30,281,168" />
+      <scope id="3501374812263557065" at="287,30,290,168" />
+      <scope id="3501374812263557075" at="297,237,300,168" />
+      <scope id="3501374812260750928" at="313,30,316,168" />
+      <scope id="3501374812260750938" at="329,30,332,168" />
+      <scope id="3501374812260750948" at="345,30,348,168" />
+      <scope id="3501374812260750958" at="362,237,365,168" />
+      <scope id="9010839353952736740" at="222,30,226,168" />
+      <scope id="1597470200014435854" at="259,30,263,168" />
+      <scope id="3501374812263557075" at="296,30,300,168" />
+      <scope id="3501374812260750958" at="361,30,365,168" />
+      <scope id="3501374812260844593" at="303,63,308,24">
+        <var name="facade" id="3501374812260844593" />
+        <var name="quotedNode_1" id="3501374812260844593" />
+      </scope>
+      <scope id="3501374812261036436" at="319,63,324,24">
+        <var name="facade" id="3501374812261036436" />
+        <var name="quotedNode_1" id="3501374812261036436" />
+      </scope>
+      <scope id="3501374812261085488" at="335,63,340,24">
+        <var name="facade" id="3501374812261085488" />
+        <var name="quotedNode_1" id="3501374812261085488" />
+      </scope>
+      <scope id="3501374812261134552" at="351,63,356,24">
+        <var name="facade" id="3501374812261134552" />
+        <var name="quotedNode_1" id="3501374812261134552" />
+      </scope>
+      <scope id="9010839353952736713" at="192,62,199,24">
+        <var name="facade" id="9010839353952736713" />
+        <var name="quotedNode_1" id="9010839353952736713" />
+        <var name="quotedNode_2" id="9010839353952736713" />
+      </scope>
+      <scope id="9010839353952736722" at="201,62,208,24">
+        <var name="facade" id="9010839353952736722" />
+        <var name="quotedNode_1" id="9010839353952736722" />
+        <var name="quotedNode_2" id="9010839353952736722" />
+      </scope>
+      <scope id="9010839353952736731" at="210,62,217,24">
+        <var name="facade" id="9010839353952736731" />
+        <var name="quotedNode_1" id="9010839353952736731" />
+        <var name="quotedNode_2" id="9010839353952736731" />
+      </scope>
+      <scope id="1597470200014435824" at="229,62,236,24">
+        <var name="facade" id="1597470200014435824" />
+        <var name="quotedNode_1" id="1597470200014435824" />
+        <var name="quotedNode_2" id="1597470200014435824" />
+      </scope>
+      <scope id="1597470200014435834" at="238,62,245,24">
+        <var name="facade" id="1597470200014435834" />
+        <var name="quotedNode_1" id="1597470200014435834" />
+        <var name="quotedNode_2" id="1597470200014435834" />
+      </scope>
+      <scope id="1597470200014435844" at="247,62,254,24">
+        <var name="facade" id="1597470200014435844" />
+        <var name="quotedNode_1" id="1597470200014435844" />
+        <var name="quotedNode_2" id="1597470200014435844" />
+      </scope>
+      <scope id="3501374812263557045" at="266,62,273,24">
+        <var name="facade" id="3501374812263557045" />
+        <var name="quotedNode_1" id="3501374812263557045" />
+        <var name="quotedNode_2" id="3501374812263557045" />
+      </scope>
+      <scope id="3501374812263557055" at="275,62,282,24">
+        <var name="facade" id="3501374812263557055" />
+        <var name="quotedNode_1" id="3501374812263557055" />
+        <var name="quotedNode_2" id="3501374812263557055" />
+      </scope>
+      <scope id="3501374812263557065" at="284,62,291,24">
+        <var name="facade" id="3501374812263557065" />
+        <var name="quotedNode_1" id="3501374812263557065" />
+        <var name="quotedNode_2" id="3501374812263557065" />
+      </scope>
+      <scope id="3501374812260844593" at="303,0,310,0" />
+      <scope id="3501374812260750928" at="310,63,317,24">
+        <var name="facade" id="3501374812260750928" />
+        <var name="quotedNode_1" id="3501374812260750928" />
+        <var name="quotedNode_2" id="3501374812260750928" />
+      </scope>
+      <scope id="3501374812261036436" at="319,0,326,0" />
+      <scope id="3501374812260750938" at="326,63,333,24">
+        <var name="facade" id="3501374812260750938" />
+        <var name="quotedNode_1" id="3501374812260750938" />
+        <var name="quotedNode_2" id="3501374812260750938" />
+      </scope>
+      <scope id="3501374812261085488" at="335,0,342,0" />
+      <scope id="3501374812260750948" at="342,63,349,24">
+        <var name="facade" id="3501374812260750948" />
+        <var name="quotedNode_1" id="3501374812260750948" />
+        <var name="quotedNode_2" id="3501374812260750948" />
+      </scope>
+      <scope id="3501374812261134552" at="351,0,358,0" />
+      <scope id="9010839353952736740" at="219,62,227,24">
+        <var name="facade" id="9010839353952736740" />
+        <var name="quotedNode_1" id="9010839353952736740" />
+        <var name="quotedNode_2" id="9010839353952736740" />
+      </scope>
+      <scope id="1597470200014435854" at="256,62,264,24">
+        <var name="facade" id="1597470200014435854" />
+        <var name="quotedNode_1" id="1597470200014435854" />
+        <var name="quotedNode_2" id="1597470200014435854" />
+      </scope>
+      <scope id="3501374812263557075" at="293,62,301,24">
+        <var name="facade" id="3501374812263557075" />
+        <var name="quotedNode_1" id="3501374812263557075" />
+        <var name="quotedNode_2" id="3501374812263557075" />
+      </scope>
+      <scope id="3501374812260750958" at="358,63,366,24">
+        <var name="facade" id="3501374812260750958" />
+        <var name="quotedNode_1" id="3501374812260750958" />
+        <var name="quotedNode_2" id="3501374812260750958" />
+      </scope>
+      <scope id="9010839353952736713" at="192,0,201,0" />
+      <scope id="9010839353952736722" at="201,0,210,0" />
+      <scope id="9010839353952736731" at="210,0,219,0" />
+      <scope id="1597470200014435824" at="229,0,238,0" />
+      <scope id="1597470200014435834" at="238,0,247,0" />
+      <scope id="1597470200014435844" at="247,0,256,0" />
+      <scope id="3501374812263557045" at="266,0,275,0" />
+      <scope id="3501374812263557055" at="275,0,284,0" />
+      <scope id="3501374812263557065" at="284,0,293,0" />
+      <scope id="3501374812260750928" at="310,0,319,0" />
+      <scope id="3501374812260750938" at="326,0,335,0" />
+      <scope id="3501374812260750948" at="342,0,351,0" />
+      <scope id="9010839353952736740" at="219,0,229,0" />
+      <scope id="1597470200014435854" at="256,0,266,0" />
+      <scope id="3501374812263557075" at="293,0,303,0" />
+      <scope id="3501374812260750958" at="358,0,368,0" />
+      <scope id="9010839353952736698" at="46,112,60,16">
+        <var name="type" id="9010839353952736700" />
+      </scope>
+      <scope id="1597470200014435808" at="62,109,76,16">
+        <var name="type" id="1597470200014435810" />
+      </scope>
+      <scope id="3501374812263511251" at="78,109,92,16">
+        <var name="type" id="3501374812263557031" />
+      </scope>
+      <scope id="3501374812261883522" at="118,108,132,16">
+        <var name="type" id="3501374812260750914" />
+      </scope>
+    </file>
+  </root>
+  <root nodeRef="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)/7656298970878362380">
+    <file name="QueriesGenerated.java">
+      <node id="7600370246429485753" at="97,108,98,194" concept="4" />
+      <scope id="7600370246429485752" at="97,108,98,194" />
+    </file>
+  </root>
+  <root nodeRef="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)/8365379837260462194">
+    <file name="QueriesGenerated.java">
+      <node id="5510759644748879580" at="137,108,138,190" concept="4" />
+      <scope id="5510759644748879579" at="137,108,138,190" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps
index 79367173f99e..f0cdc0aded70 100644
--- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps
+++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps
@@ -2,26 +2,81 @@
 <model ref="r:834d62e5-8e63-445b-ae58-4c325432808d(jetbrains.mps.console.base.generator.template.main@generator)">
   <persistence version="9" />
   <languages>
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
+    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
+    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="0" />
+    <use id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
     <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang()" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io()" />
+    <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
+    <import index="74y1" ref="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="urs3" ref="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="mte5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
+    <import index="kxzb" ref="r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
     <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">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
+      <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" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
+        <child id="1164879758292" name="body" index="SfCbr" />
+        <child id="1164903496223" name="catchClause" index="TEbGg" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
+        <child id="1164903359218" name="catchBody" index="TDEfX" />
+        <child id="1164903359217" name="throwable" index="TDEfY" />
+      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068431790191" name="jetbrains.mps.baseLanguage.structure.Expression" flags="nn" index="33vP2n" />
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -33,19 +88,50 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
+        <child id="1206060619838" name="condition" index="3eO9$A" />
+        <child id="1206060644605" name="statementList" index="3eOfB_" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -55,40 +141,199 @@
       <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
         <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
       </concept>
+      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
+        <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
+      </concept>
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
-        <property id="1184950341882" name="topPriorityGroup" index="3$yP7D" />
+        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
         <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
       </concept>
+      <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
+        <child id="1177093586806" name="templateNode" index="gfFT$" />
+      </concept>
+      <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
         <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
       </concept>
+      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+        <reference id="1722980698497626483" name="template" index="v9R2y" />
+      </concept>
+      <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">
         <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
+        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
+      </concept>
+      <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
+        <reference id="1168285871518" name="applicableConcept" index="3gUMe" />
+        <child id="1092060348987" name="contentNode" index="13RCb5" />
+      </concept>
+      <concept id="1195158154974" name="jetbrains.mps.lang.generator.structure.InlineSwitch_RuleConsequence" flags="lg" index="14YyZ8">
+        <child id="1195158241124" name="defaultConsequence" index="14YRTM" />
+        <child id="1195158408710" name="case" index="14ZwWg" />
+      </concept>
+      <concept id="1195158388553" name="jetbrains.mps.lang.generator.structure.InlineSwitch_Case" flags="ng" index="14ZrTv">
+        <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">
+        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
+      </concept>
+      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
+        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
       <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="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="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">
+        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
+      </concept>
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+      <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e">
+        <child id="1225797361612" name="parameter" index="1BdPVh" />
+      </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">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1176543928247" name="jetbrains.mps.lang.typesystem.structure.IsSubtypeExpression" flags="nn" index="3JuTUA">
+        <child id="1176543945045" name="subtypeExpression" index="3JuY14" />
+        <child id="1176543950311" name="supertypeExpression" index="3JuZjQ" />
+      </concept>
+      <concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
+      <concept id="1178870617262" name="jetbrains.mps.lang.typesystem.structure.CoerceExpression" flags="nn" index="1UaxmW">
+        <child id="1178870894644" name="pattern" index="1Ub_4A" />
+        <child id="1178870894645" name="nodeToCoerce" index="1Ub_4B" />
+      </concept>
+      <concept id="1178871491133" name="jetbrains.mps.lang.typesystem.structure.CoerceStrongExpression" flags="nn" index="1UdQGJ" />
+      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
+        <reference id="1174642800329" name="concept" index="1YaFvo" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <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="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="8758390115029295477" name="jetbrains.mps.lang.smodel.structure.SReferenceType" flags="in" index="2z4iKi" />
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
+      <concept id="597763930871270009" name="jetbrains.mps.lang.smodel.structure.ChildNodeRefExpression" flags="nn" index="3fl2lp">
+        <reference id="597763930871272016" name="targetNode" index="3fl3PK" />
+        <child id="597763930871272014" name="parent" index="3fl3PI" />
+      </concept>
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
+      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
+        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </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">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
+      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
+        <property id="1757699476691236117" name="propertyName" index="2qtEX9" />
+        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
+      </concept>
+      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
+        <property id="1757699476691236116" name="linkRole" index="2qtEX8" />
+        <property id="1341860900488019036" name="linkId" index="P3scX" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query">
+      <concept id="2822369470875160718" name="jetbrains.mps.lang.smodel.query.structure.NodesExpression" flags="ng" index="2Jgcaq" />
+      <concept id="4307205004131544317" name="jetbrains.mps.lang.smodel.query.structure.QueryExpression" flags="ng" index="1dNuzs">
+        <child id="4307205004132279624" name="parameter" index="1dOa5D" />
+      </concept>
+      <concept id="4307205004132277753" name="jetbrains.mps.lang.smodel.query.structure.QueryParameterList" flags="ng" index="1dO9Bo" />
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
+    </language>
+    <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base">
+      <concept id="7820875636626932768" name="jetbrains.mps.console.base.structure.AbstractPrintExpression" flags="ng" index="5bD3k">
+        <child id="8365379837260461921" name="object" index="2v23J2" />
+      </concept>
+      <concept id="7600370246423000655" name="jetbrains.mps.console.base.structure.PrintSequenceExpression" flags="ng" index="i14oR" />
+      <concept id="7600370246417552247" name="jetbrains.mps.console.base.structure.PrintExpression" flags="ng" index="ikQcf" />
+      <concept id="8365379837260459177" name="jetbrains.mps.console.base.structure.PrintTextExpression" flags="ng" index="2v220a" />
+      <concept id="5464054275389846505" name="jetbrains.mps.console.base.structure.BLCommand" flags="ng" index="2HLcI0">
+        <child id="1769790395579689573" name="body" index="3RSQip" />
+      </concept>
+      <concept id="6852607286009511388" name="jetbrains.mps.console.base.structure.PrintNodeReferenceExpression" flags="ng" index="14Kevp" />
+      <concept id="5510759644748856153" name="jetbrains.mps.console.base.structure.PrintNodeExpression" flags="ng" index="1nExRE" />
+    </language>
   </registry>
   <node concept="bUwia" id="4Cd_ANvqasl">
     <property role="TrG5h" value="main" />
-    <property role="3$yP7D" value="true" />
+    <node concept="3aamgX" id="6D0CP__pcce" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
+      <node concept="j$656" id="6D0CP__pccf" role="1lVwrX">
+        <ref role="v9R2y" node="6D0CP__pccc" resolve="reduce_BLExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="4Cd_ANvqxwW" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:4Jke6BA4ffD" resolve="BLCommand" />
+      <node concept="j$656" id="4Cd_ANvqxxX" role="1lVwrX">
+        <ref role="v9R2y" node="4Cd_ANvqxx0" resolve="reduce_BLCommand" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="DM6_$iqXIs" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:DM6_$iqV$8" resolve="ProjectExpression" />
+      <node concept="j$656" id="DM6_$iqXIt" role="1lVwrX">
+        <ref role="v9R2y" node="DM6_$iqXIq" resolve="reduce_ProjectExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="3J6h25QOL64" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:3J6h25QeHQy" resolve="ProjectScope" />
+      <node concept="j$656" id="3J6h25QOL65" role="1lVwrX">
+        <ref role="v9R2y" node="3J6h25QOL62" resolve="reduce_ProjectScopeLiteral" />
+      </node>
+    </node>
     <node concept="3lhOvk" id="4Cd_ANvqgEi" role="3lj3bC">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="eynw:1nVd0kvs_CG" resolve="ConsoleRoot" />
@@ -135,5 +380,1344 @@
       <ref role="n9lRv" to="eynw:1nVd0kvs_CG" resolve="ConsoleRoot" />
     </node>
   </node>
+  <node concept="13MO4I" id="4Cd_ANvqxx0">
+    <property role="TrG5h" value="reduce_BLCommand" />
+    <property role="3GE5qa" value="command" />
+    <ref role="3gUMe" to="eynw:4Jke6BA4ffD" resolve="BLCommand" />
+    <node concept="312cEu" id="4Cd_ANvqxy7" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main2" />
+      <node concept="2YIFZL" id="4Cd_ANvqxyB" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="4Cd_ANvqxyP" role="3clF45" />
+        <node concept="37vLTG" id="4m1XtPGA2Lr" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <property role="3TUv4t" value="true" />
+          <node concept="3uibUv" id="4m1XtPGA4y6" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="4Cd_ANvqxyC" role="3clF46">
+          <property role="TrG5h" value="console" />
+          <property role="3TUv4t" value="true" />
+          <node concept="3uibUv" id="5WpmwkrRlD5" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="4Cd_ANvqxyG" role="1B3o_S" />
+        <node concept="raruj" id="4Cd_ANvqx$6" role="lGtFl" />
+        <node concept="3clFbS" id="4Cd_ANvqRDs" role="3clF47">
+          <node concept="SfApY" id="2lR2lzquv$0" role="3cqZAp">
+            <node concept="3clFbS" id="2lR2lzquv$2" role="SfCbr">
+              <node concept="3clFbH" id="4Cd_ANvqRDw" role="3cqZAp">
+                <node concept="2b32R4" id="4Cd_ANvqYIK" role="lGtFl">
+                  <node concept="3JmXsc" id="4Cd_ANvqYIS" role="2P8S$">
+                    <node concept="3clFbS" id="4Cd_ANvqYJ0" role="2VODD2">
+                      <node concept="3clFbF" id="4Cd_ANvqZ_K" role="3cqZAp">
+                        <node concept="2OqwBi" id="4k34Rd0vH1C" role="3clFbG">
+                          <node concept="2OqwBi" id="4Cd_ANvqZLa" role="2Oq$k0">
+                            <node concept="3TrEf2" id="4k34Rd0vF_C" role="2OqNvi">
+                              <ref role="3Tt5mk" to="eynw:1yfzJNJreD_" />
+                            </node>
+                            <node concept="30H73N" id="4Cd_ANvqZ_J" role="2Oq$k0" />
+                          </node>
+                          <node concept="3Tsc0h" id="4k34Rd0vOnl" role="2OqNvi">
+                            <ref role="3TtcxE" to="tpee:fzcqZ_x" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="TDmWw" id="2lR2lzquv$3" role="TEbGg">
+              <node concept="3cpWsn" id="2lR2lzquv$5" role="TDEfY">
+                <property role="TrG5h" value="throwable" />
+                <node concept="3uibUv" id="47G6Tek7BTw" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="2lR2lzquv$9" role="TDEfX">
+                <node concept="3clFbF" id="3ZgZ1njXaN3" role="3cqZAp">
+                  <node concept="2OqwBi" id="3ZgZ1njXaNG" role="3clFbG">
+                    <node concept="37vLTw" id="3ZgZ1njXaN2" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4Cd_ANvqxyC" resolve="console" />
+                    </node>
+                    <node concept="liA8E" id="3ZgZ1njXaVo" role="2OqNvi">
+                      <ref role="37wK5l" to="qgo0:3ZgZ1njWQP3" resolve="addException" />
+                      <node concept="37vLTw" id="3ZgZ1njXaWa" role="37wK5m">
+                        <ref role="3cqZAo" node="2lR2lzquv$5" resolve="throwable" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4Cd_ANvqxy8" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="6D0CP__pccc">
+    <property role="TrG5h" value="reduce_BLExpression" />
+    <property role="3GE5qa" value="command" />
+    <ref role="3gUMe" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
+    <node concept="2HLcI0" id="6D0CP__pcr9" role="13RCb5">
+      <node concept="raruj" id="6D0CP__pcvP" role="lGtFl" />
+      <node concept="3clFbS" id="6D0CP__pczX" role="3RSQip">
+        <node concept="3clFbF" id="6_TW7xV984N" role="3cqZAp">
+          <node concept="ikQcf" id="6_TW7xVSaEN" role="3clFbG">
+            <node concept="10Nm6u" id="6_TW7xVSaEP" role="2v23J2">
+              <node concept="29HgVG" id="6_TW7xVSaEQ" role="lGtFl">
+                <node concept="3NFfHV" id="6_TW7xVSaER" role="3NFExx">
+                  <node concept="3clFbS" id="6_TW7xVSaES" role="2VODD2">
+                    <node concept="3clFbF" id="6_TW7xVSaET" role="3cqZAp">
+                      <node concept="2OqwBi" id="6_TW7xVSaEU" role="3clFbG">
+                        <node concept="3TrEf2" id="6_TW7xVSaEV" role="2OqNvi">
+                          <ref role="3Tt5mk" to="eynw:6D0CP__oaD2" />
+                        </node>
+                        <node concept="30H73N" id="6_TW7xVSaEW" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="bUwia" id="6_TW7xV3y9s">
+    <property role="TrG5h" value="synonyms" />
+    <property role="3GE5qa" value="" />
+    <node concept="3aamgX" id="6_TW7xVhAkv" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:6_TW7xVaDdR" resolve="PrintExpression" />
+      <node concept="14YyZ8" id="6_TW7xVhAlu" role="1lVwrX">
+        <node concept="14ZrTv" id="2WuZn$znplc" role="14ZwWg">
+          <node concept="30G5F_" id="2WuZn$znpoi" role="150hEN">
+            <node concept="3clFbS" id="2WuZn$znpoj" role="2VODD2">
+              <node concept="3clFbF" id="2WuZn$znxPl" role="3cqZAp">
+                <node concept="3JuTUA" id="2WuZn$znxPm" role="3clFbG">
+                  <node concept="2c44tf" id="2WuZn$znxPn" role="3JuZjQ">
+                    <node concept="3cqZAl" id="2WuZn$znyqm" role="2c44tc" />
+                  </node>
+                  <node concept="2OqwBi" id="3idupetCFPZ" role="3JuY14">
+                    <node concept="2OqwBi" id="2WuZn$znxPs" role="2Oq$k0">
+                      <node concept="30H73N" id="2WuZn$znxPt" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2WuZn$znxPu" role="2OqNvi">
+                        <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                      </node>
+                    </node>
+                    <node concept="3JvlWi" id="3idupetCHkP" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="2WuZn$znXpc" role="150oIE">
+            <node concept="10Nm6u" id="2WuZn$znXDU" role="gfFT$">
+              <node concept="29HgVG" id="2WuZn$znXE4" role="lGtFl">
+                <node concept="3NFfHV" id="2WuZn$znXE7" role="3NFExx">
+                  <node concept="3clFbS" id="2WuZn$znXE8" role="2VODD2">
+                    <node concept="3clFbF" id="2WuZn$znXEe" role="3cqZAp">
+                      <node concept="2OqwBi" id="2WuZn$znXE9" role="3clFbG">
+                        <node concept="3TrEf2" id="2WuZn$znXEc" role="2OqNvi">
+                          <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                        </node>
+                        <node concept="30H73N" id="2WuZn$znXEd" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="14ZrTv" id="6_TW7xVhAly" role="14ZwWg">
+          <node concept="30G5F_" id="6_TW7xVhAlz" role="150hEN">
+            <node concept="3clFbS" id="6_TW7xVhAl$" role="2VODD2">
+              <node concept="3clFbF" id="6_TW7xVpwZO" role="3cqZAp">
+                <node concept="3JuTUA" id="6_TW7xVpwZI" role="3clFbG">
+                  <node concept="2c44tf" id="6_TW7xVpxIq" role="3JuZjQ">
+                    <node concept="3Tqbb2" id="6_TW7xVpy7e" role="2c44tc" />
+                  </node>
+                  <node concept="2OqwBi" id="3idupetCH_o" role="3JuY14">
+                    <node concept="2OqwBi" id="3idupetCH_p" role="2Oq$k0">
+                      <node concept="30H73N" id="3idupetCH_q" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3idupetCH_r" role="2OqNvi">
+                        <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                      </node>
+                    </node>
+                    <node concept="3JvlWi" id="3idupetCH_s" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="6_TW7xVhCyl" role="150oIE">
+            <node concept="2OqwBi" id="6_TW7xViBj9" role="gfFT$">
+              <node concept="1bVj0M" id="6_TW7xViBjn" role="2Oq$k0">
+                <node concept="3clFbS" id="6_TW7xViBjp" role="1bW5cS">
+                  <node concept="3clFbJ" id="6_TW7xVu4jZ" role="3cqZAp">
+                    <node concept="3clFbS" id="6_TW7xVu4k2" role="3clFbx">
+                      <node concept="3clFbF" id="6_TW7xVu9rb" role="3cqZAp">
+                        <node concept="2v220a" id="6_TW7xVu9r9" role="3clFbG">
+                          <node concept="37vLTw" id="7OcVEq$q3qu" role="2v23J2">
+                            <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbC" id="6_TW7xVu8D1" role="3clFbw">
+                      <node concept="10Nm6u" id="6_TW7xVu92i" role="3uHU7w" />
+                      <node concept="37vLTw" id="7OcVEq$q3Ky" role="3uHU7B">
+                        <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
+                      </node>
+                    </node>
+                    <node concept="3eNFk2" id="6_TW7xVuaOF" role="3eNLev">
+                      <node concept="3clFbS" id="6_TW7xVuaOH" role="3eOfB_">
+                        <node concept="3clFbF" id="6_TW7xViF1W" role="3cqZAp">
+                          <node concept="1nExRE" id="6_TW7xViF1U" role="3clFbG">
+                            <node concept="37vLTw" id="5kx7ze1rHjR" role="2v23J2">
+                              <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbC" id="6_TW7xVkpJZ" role="3eO9$A">
+                        <node concept="10Nm6u" id="6_TW7xVkpK0" role="3uHU7w" />
+                        <node concept="2OqwBi" id="6_TW7xVkpK1" role="3uHU7B">
+                          <node concept="liA8E" id="5kx7ze1rHbQ" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SNode.getModel():org.jetbrains.mps.openapi.model.SModel" resolve="getModel" />
+                          </node>
+                          <node concept="37vLTw" id="7OcVEq$q2YI" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="9aQIb" id="6_TW7xVudkU" role="9aQIa">
+                      <node concept="3clFbS" id="6_TW7xVudkV" role="9aQI4">
+                        <node concept="3clFbF" id="6_TW7xViFVf" role="3cqZAp">
+                          <node concept="14Kevp" id="6_TW7xViGcf" role="3clFbG">
+                            <node concept="37vLTw" id="7OcVEq$q19U" role="2v23J2">
+                              <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTG" id="7OcVEq$pVXg" role="1bW2Oz">
+                  <property role="TrG5h" value="n" />
+                  <node concept="3uibUv" id="5kx7ze1rGwZ" role="1tU5fm">
+                    <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1Bd96e" id="6_TW7xViCiJ" role="2OqNvi">
+                <node concept="33vP2n" id="7OcVEq$pX32" role="1BdPVh">
+                  <node concept="29HgVG" id="7OcVEq$pX33" role="lGtFl">
+                    <node concept="3NFfHV" id="7OcVEq$pX34" role="3NFExx">
+                      <node concept="3clFbS" id="7OcVEq$pX35" role="2VODD2">
+                        <node concept="3clFbF" id="7OcVEq$pX36" role="3cqZAp">
+                          <node concept="2OqwBi" id="7OcVEq$pX37" role="3clFbG">
+                            <node concept="3TrEf2" id="7OcVEq$pX38" role="2OqNvi">
+                              <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                            </node>
+                            <node concept="30H73N" id="7OcVEq$pX39" role="2Oq$k0" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="14ZrTv" id="6_TW7xVoFxD" role="14ZwWg">
+          <node concept="30G5F_" id="6_TW7xVoFxE" role="150hEN">
+            <node concept="3clFbS" id="6_TW7xVoFxF" role="2VODD2">
+              <node concept="3cpWs8" id="3idupetCIO0" role="3cqZAp">
+                <node concept="3cpWsn" id="3idupetCIO3" role="3cpWs9">
+                  <property role="TrG5h" value="type" />
+                  <node concept="3Tqbb2" id="3idupetCINY" role="1tU5fm" />
+                  <node concept="2OqwBi" id="3idupetCLJO" role="33vP2m">
+                    <node concept="2OqwBi" id="3idupetCLJP" role="2Oq$k0">
+                      <node concept="30H73N" id="3idupetCLJQ" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3idupetCLJR" role="2OqNvi">
+                        <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                      </node>
+                    </node>
+                    <node concept="3JvlWi" id="3idupetCLJS" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6_TW7xVoGn3" role="3cqZAp">
+                <node concept="22lmx$" id="6_TW7xVrRRj" role="3clFbG">
+                  <node concept="22lmx$" id="6_TW7xVrJMT" role="3uHU7B">
+                    <node concept="22lmx$" id="6_TW7xVrsOY" role="3uHU7B">
+                      <node concept="3JuTUA" id="6_TW7xVpBsw" role="3uHU7B">
+                        <node concept="2c44tf" id="6_TW7xVpBsx" role="3JuZjQ">
+                          <node concept="A3Dl8" id="6_TW7xVpBZw" role="2c44tc">
+                            <node concept="3Tqbb2" id="6_TW7xVpCh6" role="A3Ik2" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="3idupetCNgq" role="3JuY14">
+                          <ref role="3cqZAo" node="3idupetCIO3" resolve="type" />
+                        </node>
+                      </node>
+                      <node concept="3JuTUA" id="6_TW7xVru51" role="3uHU7w">
+                        <node concept="2c44tf" id="6_TW7xVru52" role="3JuZjQ">
+                          <node concept="A3Dl8" id="6_TW7xVru53" role="2c44tc">
+                            <node concept="2z4iKi" id="6_TW7xVrGVK" role="A3Ik2" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="3idupetCOay" role="3JuY14">
+                          <ref role="3cqZAo" node="3idupetCIO3" resolve="type" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3JuTUA" id="6_TW7xVrL7E" role="3uHU7w">
+                      <node concept="2c44tf" id="6_TW7xVrL7F" role="3JuZjQ">
+                        <node concept="A3Dl8" id="6_TW7xVrL7G" role="2c44tc">
+                          <node concept="H_c77" id="6_TW7xVrPa$" role="A3Ik2" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="3idupetCOYE" role="3JuY14">
+                        <ref role="3cqZAo" node="3idupetCIO3" resolve="type" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3JuTUA" id="6_TW7xVrTgI" role="3uHU7w">
+                    <node concept="2c44tf" id="6_TW7xVrTgJ" role="3JuZjQ">
+                      <node concept="A3Dl8" id="6_TW7xVrTgK" role="2c44tc">
+                        <node concept="3uibUv" id="6_TW7xVrZ3s" role="A3Ik2">
+                          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="3idupetCPGE" role="3JuY14">
+                      <ref role="3cqZAo" node="3idupetCIO3" resolve="type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="6_TW7xVqOiJ" role="150oIE">
+            <node concept="i14oR" id="6_TW7xVR_CN" role="gfFT$">
+              <node concept="33vP2n" id="6_TW7xVR_CO" role="2v23J2">
+                <node concept="29HgVG" id="6_TW7xVR_Dk" role="lGtFl">
+                  <node concept="3NFfHV" id="6_TW7xVR_Dn" role="3NFExx">
+                    <node concept="3clFbS" id="6_TW7xVR_Do" role="2VODD2">
+                      <node concept="3clFbF" id="6_TW7xVR_Du" role="3cqZAp">
+                        <node concept="2OqwBi" id="6_TW7xVR_Dp" role="3clFbG">
+                          <node concept="3TrEf2" id="6_TW7xVR_Ds" role="2OqNvi">
+                            <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                          </node>
+                          <node concept="30H73N" id="6_TW7xVR_Dt" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="14ZrTv" id="3m3GNuUc7JY" role="14ZwWg">
+          <node concept="30G5F_" id="3m3GNuUc7N4" role="150hEN">
+            <node concept="3clFbS" id="3m3GNuUc7N5" role="2VODD2">
+              <node concept="3cpWs8" id="31Tct3T$b9Z" role="3cqZAp">
+                <node concept="3cpWsn" id="31Tct3T$ba2" role="3cpWs9">
+                  <property role="TrG5h" value="functionType" />
+                  <node concept="3Tqbb2" id="31Tct3T$b9X" role="1tU5fm">
+                    <ref role="ehGHo" to="tp2c:htajhBZ" resolve="FunctionType" />
+                  </node>
+                  <node concept="1UdQGJ" id="31Tct3TzX1P" role="33vP2m">
+                    <node concept="1YaCAy" id="31Tct3TzXzi" role="1Ub_4A">
+                      <property role="TrG5h" value="functionType" />
+                      <ref role="1YaFvo" to="tp2c:htajhBZ" resolve="FunctionType" />
+                    </node>
+                    <node concept="2OqwBi" id="31Tct3TzXhO" role="1Ub_4B">
+                      <node concept="2OqwBi" id="31Tct3TzXhP" role="2Oq$k0">
+                        <node concept="30H73N" id="31Tct3TzXhQ" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="31Tct3TzXhR" role="2OqNvi">
+                          <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                        </node>
+                      </node>
+                      <node concept="3JvlWi" id="31Tct3TzXhS" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="5No3jep9CZN" role="3cqZAp">
+                <node concept="3y3z36" id="5No3jep9Fu$" role="3cqZAk">
+                  <node concept="10Nm6u" id="5No3jep9F_h" role="3uHU7w" />
+                  <node concept="37vLTw" id="5No3jep9Dqr" role="3uHU7B">
+                    <ref role="3cqZAo" node="31Tct3T$ba2" resolve="functionType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="3m3GNuUdjaY" role="150oIE">
+            <node concept="2v220a" id="5No3jepaFyl" role="gfFT$">
+              <node concept="Xl_RD" id="5No3jepaFHI" role="2v23J2">
+                <node concept="17Uvod" id="5No3jepaFLG" role="lGtFl">
+                  <property role="2qtEX9" value="value" />
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <node concept="3zFVjK" id="5No3jepaFLH" role="3zH0cK">
+                    <node concept="3clFbS" id="5No3jepaFLI" role="2VODD2">
+                      <node concept="3clFbF" id="5No3jepaFXF" role="3cqZAp">
+                        <node concept="3cpWs3" id="5No3jepaZ2v" role="3clFbG">
+                          <node concept="Xl_RD" id="5No3jepaZgD" role="3uHU7B">
+                            <property role="Xl_RC" value="closure : " />
+                          </node>
+                          <node concept="2OqwBi" id="5No3jepaHA7" role="3uHU7w">
+                            <node concept="2OqwBi" id="5No3jepaGXE" role="2Oq$k0">
+                              <node concept="2OqwBi" id="5No3jepaG2Z" role="2Oq$k0">
+                                <node concept="30H73N" id="5No3jepaFXE" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="5No3jepaGCH" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                                </node>
+                              </node>
+                              <node concept="3JvlWi" id="5No3jepaHoe" role="2OqNvi" />
+                            </node>
+                            <node concept="2qgKlT" id="5No3jepaHYp" role="2OqNvi">
+                              <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="6_TW7xVhDdj" role="14YRTM">
+          <node concept="2v220a" id="6_TW7xVhDdk" role="gfFT$">
+            <node concept="33vP2n" id="6_TW7xVhDdl" role="2v23J2">
+              <node concept="29HgVG" id="6_TW7xVhDdm" role="lGtFl">
+                <node concept="3NFfHV" id="6_TW7xVhDdn" role="3NFExx">
+                  <node concept="3clFbS" id="6_TW7xVhDdo" role="2VODD2">
+                    <node concept="3clFbF" id="6_TW7xVhDdp" role="3cqZAp">
+                      <node concept="2OqwBi" id="6_TW7xVhDdq" role="3clFbG">
+                        <node concept="3TrEf2" id="6_TW7xVhDdr" role="2OqNvi">
+                          <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                        </node>
+                        <node concept="30H73N" id="6_TW7xVhDds" role="2Oq$k0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="3idupetBr1u" role="30HLyM">
+        <node concept="3clFbS" id="3idupetBr1v" role="2VODD2">
+          <node concept="3clFbF" id="3idupetBtw8" role="3cqZAp">
+            <node concept="2OqwBi" id="3idupetBCSi" role="3clFbG">
+              <node concept="2OqwBi" id="3idupetBtB0" role="2Oq$k0">
+                <node concept="30H73N" id="3idupetBtw7" role="2Oq$k0" />
+                <node concept="2Rf3mk" id="3idupetBy5P" role="2OqNvi">
+                  <node concept="1xMEDy" id="3idupetBy5R" role="1xVPHs">
+                    <node concept="chp4Y" id="3idupetByjq" role="ri$Ld">
+                      <ref role="cht4Q" to="eynw:6_TW7xVaDdR" resolve="PrintExpression" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1v1jN8" id="3idupetBSWG" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="bUwia" id="4oW11H0eh1n">
+    <property role="TrG5h" value="print" />
+    <node concept="3aamgX" id="3Pf6DLbUQ$0" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:5WpmwkrQrRs" resolve="PrintNodeReferenceExpression" />
+      <node concept="j$656" id="3mC5XuEFrrJ" role="1lVwrX">
+        <ref role="v9R2y" node="3Pf6DLbUQzY" resolve="reduce_PrintNodeReferenceExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="7gnNafF7Zzt" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:7gnNafF7YMD" resolve="PrintTextExpression" />
+      <node concept="j$656" id="3mC5XuEFrrM" role="1lVwrX">
+        <ref role="v9R2y" node="7gnNafF7ZxM" resolve="reduce_PrintTextExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="4LU9FcrO4X2" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:4LU9FcrO3Hp" resolve="PrintNodeExpression" />
+      <node concept="j$656" id="3mC5XuEFrrP" role="1lVwrX">
+        <ref role="v9R2y" node="4LU9FcrO4Vn" resolve="reduce_PrintNodeExpression" />
+      </node>
+    </node>
+    <node concept="3aamgX" id="6_TW7xVvrFq" role="3acgRq">
+      <ref role="30HIoZ" to="eynw:6_TW7xVvrpf" resolve="PrintSequenceExpression" />
+      <node concept="j$656" id="3mC5XuEFrrS" role="1lVwrX">
+        <ref role="v9R2y" node="6_TW7xVvrFo" resolve="reduce_PrintSequenceExpression" />
+      </node>
+    </node>
+  </node>
+  <node concept="13MO4I" id="4LU9FcrO4Vn">
+    <property role="TrG5h" value="reduce_PrintNodeExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <ref role="3gUMe" to="eynw:4LU9FcrO3Hp" resolve="PrintNodeExpression" />
+    <node concept="312cEu" id="4LU9FcrO4Zk" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main2" />
+      <node concept="2YIFZL" id="4LU9FcrO4Zl" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="37vLTG" id="4LU9FcrO4Zm" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="4LU9FcrO4Zn" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="4LU9FcrO4Zo" role="3clF46">
+          <property role="TrG5h" value="console" />
+          <node concept="3uibUv" id="4LU9FcrO4Zp" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="4LU9FcrO4Zq" role="3clF45" />
+        <node concept="3Tm1VV" id="4LU9FcrO4Zr" role="1B3o_S" />
+        <node concept="3clFbS" id="4LU9FcrO4Zs" role="3clF47">
+          <node concept="3cpWs8" id="4LU9FcrP8ZE" role="3cqZAp">
+            <node concept="3cpWsn" id="4LU9FcrP8ZH" role="3cpWs9">
+              <property role="TrG5h" value="node" />
+              <node concept="3uibUv" id="5kx7ze1rEb_" role="1tU5fm">
+                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4LU9FcrO6VE" role="3cqZAp">
+            <node concept="2OqwBi" id="4LU9FcrO6VF" role="3clFbG">
+              <node concept="raruj" id="6D0CP__pkbk" role="lGtFl" />
+              <node concept="37vLTw" id="4LU9FcrO6VG" role="2Oq$k0">
+                <ref role="3cqZAo" node="4LU9FcrO4Zo" resolve="console" />
+              </node>
+              <node concept="liA8E" id="4LU9FcrO6VT" role="2OqNvi">
+                <ref role="37wK5l" to="qgo0:7Jzw3XJWFQB" resolve="addNode" />
+                <node concept="2YIFZM" id="5kx7ze1rEy1" role="37wK5m">
+                  <ref role="1Pybhc" to="w1kc:~CopyUtil" resolve="CopyUtil" />
+                  <ref role="37wK5l" to="w1kc:~CopyUtil.copy(org.jetbrains.mps.openapi.model.SNode):org.jetbrains.mps.openapi.model.SNode" resolve="copy" />
+                  <node concept="37vLTw" id="5kx7ze1rEOj" role="37wK5m">
+                    <ref role="3cqZAo" node="4LU9FcrP8ZH" resolve="node" />
+                    <node concept="29HgVG" id="5kx7ze1rEOk" role="lGtFl">
+                      <node concept="3NFfHV" id="5kx7ze1rEOl" role="3NFExx">
+                        <node concept="3clFbS" id="5kx7ze1rEOm" role="2VODD2">
+                          <node concept="3clFbF" id="5kx7ze1rEOn" role="3cqZAp">
+                            <node concept="2OqwBi" id="5kx7ze1rEOo" role="3clFbG">
+                              <node concept="3TrEf2" id="5kx7ze1rEOp" role="2OqNvi">
+                                <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                              </node>
+                              <node concept="30H73N" id="5kx7ze1rEOq" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4LU9FcrO4ZQ" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="3Pf6DLbUQzY">
+    <property role="TrG5h" value="reduce_PrintNodeReferenceExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <ref role="3gUMe" to="eynw:5WpmwkrQrRs" resolve="PrintNodeReferenceExpression" />
+    <node concept="312cEu" id="3Pf6DLbW2Fs" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main2" />
+      <node concept="2YIFZL" id="3Pf6DLbW2Ft" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="37vLTG" id="4m1XtPGA5Rd" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="4m1XtPGA5Re" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="3Pf6DLbW2Fu" role="3clF46">
+          <property role="TrG5h" value="console" />
+          <node concept="3uibUv" id="3Pf6DLbW2Fv" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="3Pf6DLbW2Fw" role="3clF45" />
+        <node concept="3Tm1VV" id="3Pf6DLbW2Fx" role="1B3o_S" />
+        <node concept="3clFbS" id="3Pf6DLbW2Fz" role="3clF47">
+          <node concept="3clFbF" id="3ZgZ1njYvja" role="3cqZAp">
+            <node concept="2OqwBi" id="3ZgZ1njYvl$" role="3clFbG">
+              <node concept="37vLTw" id="3ZgZ1njYvj8" role="2Oq$k0">
+                <ref role="3cqZAo" node="3Pf6DLbW2Fu" resolve="console" />
+              </node>
+              <node concept="liA8E" id="3ZgZ1njYvte" role="2OqNvi">
+                <ref role="37wK5l" to="qgo0:3ZgZ1njWRnh" resolve="addNodeRef" />
+                <node concept="10Nm6u" id="3ZgZ1njYvtG" role="37wK5m">
+                  <node concept="29HgVG" id="3ZgZ1njYvtH" role="lGtFl">
+                    <node concept="3NFfHV" id="3ZgZ1njYvtI" role="3NFExx">
+                      <node concept="3clFbS" id="3ZgZ1njYvtJ" role="2VODD2">
+                        <node concept="3clFbF" id="3ZgZ1njYvtK" role="3cqZAp">
+                          <node concept="2OqwBi" id="3ZgZ1njYvtL" role="3clFbG">
+                            <node concept="3TrEf2" id="3ZgZ1njYvtM" role="2OqNvi">
+                              <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                            </node>
+                            <node concept="30H73N" id="3ZgZ1njYvtN" role="2Oq$k0" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="3ZgZ1njYvy2" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3Pf6DLbW2FC" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="6_TW7xVvrFo">
+    <property role="TrG5h" value="reduce_PrintSequenceExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <ref role="3gUMe" to="eynw:6_TW7xVvrpf" resolve="PrintSequenceExpression" />
+    <node concept="312cEu" id="6_TW7xVvrTf" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main3" />
+      <node concept="2YIFZL" id="6_TW7xVvrTg" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="37vLTG" id="6_TW7xVvrTh" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="6_TW7xVvrTi" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6_TW7xVvrTj" role="3clF46">
+          <property role="TrG5h" value="console" />
+          <node concept="3uibUv" id="6_TW7xVvrTk" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6_TW7xVvrTl" role="3clF45" />
+        <node concept="3Tm1VV" id="6_TW7xVvrTm" role="1B3o_S" />
+        <node concept="3clFbS" id="6_TW7xVvrTn" role="3clF47">
+          <node concept="3clFbF" id="7OcVEq$sSvS" role="3cqZAp">
+            <node concept="2OqwBi" id="7OcVEq$tEZB" role="3clFbG">
+              <node concept="1bVj0M" id="7OcVEq$sSvO" role="2Oq$k0">
+                <node concept="3clFbS" id="7OcVEq$sSvQ" role="1bW5cS">
+                  <node concept="3clFbF" id="1ycrhFMNEIi" role="3cqZAp">
+                    <node concept="2OqwBi" id="1ycrhFMNKuX" role="3clFbG">
+                      <node concept="37vLTw" id="1ycrhFMNEIg" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6_TW7xVvrTj" resolve="console" />
+                      </node>
+                      <node concept="liA8E" id="1ycrhFMNQ7_" role="2OqNvi">
+                        <ref role="37wK5l" to="qgo0:1ycrhFMNuOa" resolve="addSequence" />
+                        <node concept="2OqwBi" id="7OcVEq$uS2Y" role="37wK5m">
+                          <node concept="37vLTw" id="7OcVEq$sUGS" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6_TW7xVvrTh" resolve="context" />
+                          </node>
+                          <node concept="liA8E" id="7OcVEq$uUgl" role="2OqNvi">
+                            <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
+                          </node>
+                        </node>
+                        <node concept="2YIFZM" id="1oFmEVz8vnb" role="37wK5m">
+                          <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                          <ref role="37wK5l" to="kxzb:YwfKjlXcuc" resolve="nodesToResults" />
+                          <node concept="37vLTw" id="1oFmEVz8vnc" role="37wK5m">
+                            <ref role="3cqZAo" node="7OcVEq$t2mT" resolve="seq" />
+                          </node>
+                          <node concept="2OqwBi" id="1oFmEVz8vnd" role="37wK5m">
+                            <node concept="2OqwBi" id="1oFmEVz8vne" role="2Oq$k0">
+                              <node concept="37vLTw" id="1oFmEVz8vnf" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6_TW7xVvrTh" resolve="context" />
+                              </node>
+                              <node concept="liA8E" id="1oFmEVz8vns" role="2OqNvi">
+                                <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="1oFmEVz8vnt" role="2OqNvi">
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            </node>
+                          </node>
+                          <node concept="1ZhdrF" id="1oFmEVz8vnu" role="lGtFl">
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="1oFmEVz8vnv" role="3$ytzL">
+                              <node concept="3clFbS" id="1oFmEVz8vnw" role="2VODD2">
+                                <node concept="3cpWs8" id="1oFmEVz8vnx" role="3cqZAp">
+                                  <node concept="3cpWsn" id="1oFmEVz8vny" role="3cpWs9">
+                                    <property role="TrG5h" value="type" />
+                                    <node concept="3Tqbb2" id="1oFmEVz8vnz" role="1tU5fm" />
+                                    <node concept="2OqwBi" id="1oFmEVz8vn$" role="33vP2m">
+                                      <node concept="2OqwBi" id="1oFmEVz8vn_" role="2Oq$k0">
+                                        <node concept="30H73N" id="1oFmEVz8vnA" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="1oFmEVz8vnB" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                                        </node>
+                                      </node>
+                                      <node concept="3JvlWi" id="1oFmEVz8vnC" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="1oFmEVz8vnD" role="3cqZAp">
+                                  <node concept="3clFbS" id="1oFmEVz8vnE" role="3clFbx">
+                                    <node concept="3cpWs6" id="1oFmEVz8vnF" role="3cqZAp">
+                                      <node concept="3fl2lp" id="1oFmEVz8vnG" role="3cqZAk">
+                                        <ref role="3fl3PK" to="kxzb:YwfKjlXcuc" resolve="nodesToResults" />
+                                        <node concept="3B5_sB" id="1oFmEVz8vnH" role="3fl3PI">
+                                          <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3JuTUA" id="1oFmEVz8vnI" role="3clFbw">
+                                    <node concept="37vLTw" id="1oFmEVz8vnJ" role="3JuY14">
+                                      <ref role="3cqZAo" node="1oFmEVz8vny" resolve="type" />
+                                    </node>
+                                    <node concept="2c44tf" id="1oFmEVz8vnK" role="3JuZjQ">
+                                      <node concept="A3Dl8" id="1oFmEVz8vnL" role="2c44tc">
+                                        <node concept="3Tqbb2" id="1oFmEVz8vnM" role="A3Ik2" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="1oFmEVz8vnN" role="3cqZAp">
+                                  <node concept="3clFbS" id="1oFmEVz8vnO" role="3clFbx">
+                                    <node concept="3cpWs6" id="1oFmEVz8vnP" role="3cqZAp">
+                                      <node concept="3fl2lp" id="1oFmEVz8vnQ" role="3cqZAk">
+                                        <ref role="3fl3PK" to="kxzb:YwfKjlXcuc" resolve="nodesToResults" />
+                                        <node concept="3B5_sB" id="1oFmEVz8vnR" role="3fl3PI">
+                                          <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3JuTUA" id="1oFmEVz8vnS" role="3clFbw">
+                                    <node concept="37vLTw" id="1oFmEVz8vnT" role="3JuY14">
+                                      <ref role="3cqZAo" node="1oFmEVz8vny" resolve="type" />
+                                    </node>
+                                    <node concept="2c44tf" id="1oFmEVz8vnU" role="3JuZjQ">
+                                      <node concept="A3Dl8" id="1oFmEVz8vnV" role="2c44tc">
+                                        <node concept="2z4iKi" id="1oFmEVz8vnW" role="A3Ik2" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="1oFmEVz8vnX" role="3cqZAp">
+                                  <node concept="3clFbS" id="1oFmEVz8vnY" role="3clFbx">
+                                    <node concept="3cpWs6" id="1oFmEVz8vnZ" role="3cqZAp">
+                                      <node concept="3fl2lp" id="1oFmEVz8vo0" role="3cqZAk">
+                                        <ref role="3fl3PK" to="kxzb:YwfKjlXcx9" resolve="modelsToResults" />
+                                        <node concept="3B5_sB" id="1oFmEVz8vo1" role="3fl3PI">
+                                          <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3JuTUA" id="1oFmEVz8vo2" role="3clFbw">
+                                    <node concept="37vLTw" id="1oFmEVz8vo3" role="3JuY14">
+                                      <ref role="3cqZAo" node="1oFmEVz8vny" resolve="type" />
+                                    </node>
+                                    <node concept="2c44tf" id="1oFmEVz8vo4" role="3JuZjQ">
+                                      <node concept="A3Dl8" id="1oFmEVz8vo5" role="2c44tc">
+                                        <node concept="H_c77" id="1oFmEVz8vo6" role="A3Ik2" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="1oFmEVz8vo7" role="3cqZAp">
+                                  <node concept="3clFbS" id="1oFmEVz8vo8" role="3clFbx">
+                                    <node concept="3cpWs6" id="1oFmEVz8vo9" role="3cqZAp">
+                                      <node concept="3fl2lp" id="1oFmEVz8voa" role="3cqZAk">
+                                        <ref role="3fl3PK" to="kxzb:YwfKjlXcyY" resolve="modulesToResults" />
+                                        <node concept="3B5_sB" id="1oFmEVz8vob" role="3fl3PI">
+                                          <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3JuTUA" id="1oFmEVz8voc" role="3clFbw">
+                                    <node concept="37vLTw" id="1oFmEVz8vod" role="3JuY14">
+                                      <ref role="3cqZAo" node="1oFmEVz8vny" resolve="type" />
+                                    </node>
+                                    <node concept="2c44tf" id="1oFmEVz8voe" role="3JuZjQ">
+                                      <node concept="A3Dl8" id="1oFmEVz8vof" role="2c44tc">
+                                        <node concept="3uibUv" id="1oFmEVz8vog" role="A3Ik2">
+                                          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs6" id="1oFmEVz8voh" role="3cqZAp">
+                                  <node concept="10Nm6u" id="1oFmEVz8voi" role="3cqZAk" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="7OcVEq$ttxM" role="37wK5m">
+                          <node concept="2YIFZM" id="7OcVEq$tm6X" role="2Oq$k0">
+                            <ref role="1Pybhc" to="urs3:5Ffu4tBUwT$" resolve="Sequence" />
+                            <ref role="37wK5l" to="urs3:5Ffu4tBUwUU" resolve="fromIterable" />
+                            <node concept="37vLTw" id="7OcVEq$tplq" role="37wK5m">
+                              <ref role="3cqZAo" node="7OcVEq$t2mT" resolve="seq" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="7OcVEq$t_m9" role="2OqNvi">
+                            <ref role="37wK5l" to="urs3:5Ffu4tBUx9j" resolve="count" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="7OcVEq$tDmR" role="37wK5m">
+                          <property role="Xl_RC" value="" />
+                          <node concept="17Uvod" id="7OcVEq$tDmS" role="lGtFl">
+                            <property role="2qtEX9" value="value" />
+                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                            <node concept="3zFVjK" id="7OcVEq$tDmT" role="3zH0cK">
+                              <node concept="3clFbS" id="7OcVEq$tDmU" role="2VODD2">
+                                <node concept="3cpWs8" id="7OcVEq$tDmV" role="3cqZAp">
+                                  <node concept="3cpWsn" id="7OcVEq$tDmW" role="3cpWs9">
+                                    <property role="TrG5h" value="type" />
+                                    <node concept="3Tqbb2" id="7OcVEq$tDmX" role="1tU5fm" />
+                                    <node concept="2OqwBi" id="7OcVEq$tDmY" role="33vP2m">
+                                      <node concept="2OqwBi" id="7OcVEq$tDmZ" role="2Oq$k0">
+                                        <node concept="30H73N" id="7OcVEq$tDn0" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="7OcVEq$tDn1" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                                        </node>
+                                      </node>
+                                      <node concept="3JvlWi" id="7OcVEq$tDn2" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="7OcVEq$tDn3" role="3cqZAp">
+                                  <node concept="3clFbS" id="7OcVEq$tDn4" role="3clFbx">
+                                    <node concept="3cpWs6" id="7OcVEq$tDn5" role="3cqZAp">
+                                      <node concept="Xl_RD" id="7OcVEq$tDn6" role="3cqZAk">
+                                        <property role="Xl_RC" value="nodes" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3JuTUA" id="7OcVEq$tDn7" role="3clFbw">
+                                    <node concept="37vLTw" id="7OcVEq$tDn8" role="3JuY14">
+                                      <ref role="3cqZAo" node="7OcVEq$tDmW" resolve="type" />
+                                    </node>
+                                    <node concept="2c44tf" id="7OcVEq$tDn9" role="3JuZjQ">
+                                      <node concept="A3Dl8" id="7OcVEq$tDna" role="2c44tc">
+                                        <node concept="3Tqbb2" id="7OcVEq$tDnb" role="A3Ik2" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="7OcVEq$tDnc" role="3cqZAp">
+                                  <node concept="3clFbS" id="7OcVEq$tDnd" role="3clFbx">
+                                    <node concept="3cpWs6" id="7OcVEq$tDne" role="3cqZAp">
+                                      <node concept="Xl_RD" id="7OcVEq$tDnf" role="3cqZAk">
+                                        <property role="Xl_RC" value="references" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3JuTUA" id="7OcVEq$tDng" role="3clFbw">
+                                    <node concept="37vLTw" id="7OcVEq$tDnh" role="3JuY14">
+                                      <ref role="3cqZAo" node="7OcVEq$tDmW" resolve="type" />
+                                    </node>
+                                    <node concept="2c44tf" id="7OcVEq$tDni" role="3JuZjQ">
+                                      <node concept="A3Dl8" id="7OcVEq$tDnj" role="2c44tc">
+                                        <node concept="2z4iKi" id="7OcVEq$tDnk" role="A3Ik2" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="7OcVEq$tDnl" role="3cqZAp">
+                                  <node concept="3clFbS" id="7OcVEq$tDnm" role="3clFbx">
+                                    <node concept="3cpWs6" id="7OcVEq$tDnn" role="3cqZAp">
+                                      <node concept="Xl_RD" id="7OcVEq$tDno" role="3cqZAk">
+                                        <property role="Xl_RC" value="models" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3JuTUA" id="7OcVEq$tDnp" role="3clFbw">
+                                    <node concept="37vLTw" id="7OcVEq$tDnq" role="3JuY14">
+                                      <ref role="3cqZAo" node="7OcVEq$tDmW" resolve="type" />
+                                    </node>
+                                    <node concept="2c44tf" id="7OcVEq$tDnr" role="3JuZjQ">
+                                      <node concept="A3Dl8" id="7OcVEq$tDns" role="2c44tc">
+                                        <node concept="H_c77" id="7OcVEq$tDnt" role="A3Ik2" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="7OcVEq$tDnu" role="3cqZAp">
+                                  <node concept="3clFbS" id="7OcVEq$tDnv" role="3clFbx">
+                                    <node concept="3cpWs6" id="7OcVEq$tDnw" role="3cqZAp">
+                                      <node concept="Xl_RD" id="7OcVEq$tDnx" role="3cqZAk">
+                                        <property role="Xl_RC" value="modules" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3JuTUA" id="7OcVEq$tDny" role="3clFbw">
+                                    <node concept="37vLTw" id="7OcVEq$tDnz" role="3JuY14">
+                                      <ref role="3cqZAo" node="7OcVEq$tDmW" resolve="type" />
+                                    </node>
+                                    <node concept="2c44tf" id="7OcVEq$tDn$" role="3JuZjQ">
+                                      <node concept="A3Dl8" id="7OcVEq$tDn_" role="2c44tc">
+                                        <node concept="3uibUv" id="7OcVEq$tDnA" role="A3Ik2">
+                                          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs6" id="7OcVEq$tDnB" role="3cqZAp">
+                                  <node concept="10Nm6u" id="7OcVEq$tDnC" role="3cqZAk" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTG" id="7OcVEq$t2mT" role="1bW2Oz">
+                  <property role="TrG5h" value="seq" />
+                  <node concept="_YKpA" id="32notsQjgHX" role="1tU5fm">
+                    <node concept="3uibUv" id="32notsQnCO$" role="_ZDj9">
+                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                      <node concept="29HgVG" id="32notsQnDU0" role="lGtFl">
+                        <node concept="3NFfHV" id="32notsQnDU1" role="3NFExx">
+                          <node concept="3clFbS" id="32notsQnDU2" role="2VODD2">
+                            <node concept="3cpWs8" id="32notsQjlp1" role="3cqZAp">
+                              <node concept="3cpWsn" id="32notsQjlp2" role="3cpWs9">
+                                <property role="TrG5h" value="type" />
+                                <node concept="3Tqbb2" id="32notsQjlp3" role="1tU5fm" />
+                                <node concept="2OqwBi" id="32notsQjlp4" role="33vP2m">
+                                  <node concept="2OqwBi" id="32notsQjlp5" role="2Oq$k0">
+                                    <node concept="30H73N" id="32notsQjlp6" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="32notsQjlp7" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                                    </node>
+                                  </node>
+                                  <node concept="3JvlWi" id="32notsQjlp8" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbJ" id="32notsQjlp9" role="3cqZAp">
+                              <node concept="3clFbS" id="32notsQjlpa" role="3clFbx">
+                                <node concept="3cpWs6" id="32notsQjlpb" role="3cqZAp">
+                                  <node concept="2c44tf" id="32notsQjGgL" role="3cqZAk">
+                                    <node concept="3uibUv" id="32notsQkY$J" role="2c44tc">
+                                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3JuTUA" id="32notsQjlpe" role="3clFbw">
+                                <node concept="37vLTw" id="32notsQjlpf" role="3JuY14">
+                                  <ref role="3cqZAo" node="32notsQjlp2" resolve="type" />
+                                </node>
+                                <node concept="2c44tf" id="32notsQjlpg" role="3JuZjQ">
+                                  <node concept="A3Dl8" id="32notsQjlph" role="2c44tc">
+                                    <node concept="3Tqbb2" id="32notsQjlpi" role="A3Ik2" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbJ" id="32notsQjlpj" role="3cqZAp">
+                              <node concept="3clFbS" id="32notsQjlpk" role="3clFbx">
+                                <node concept="3cpWs6" id="32notsQjlpl" role="3cqZAp">
+                                  <node concept="2c44tf" id="32notsQkr6k" role="3cqZAk">
+                                    <node concept="3uibUv" id="32notsQwUhS" role="2c44tc">
+                                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3JuTUA" id="32notsQjlpo" role="3clFbw">
+                                <node concept="37vLTw" id="32notsQjlpp" role="3JuY14">
+                                  <ref role="3cqZAo" node="32notsQjlp2" resolve="type" />
+                                </node>
+                                <node concept="2c44tf" id="32notsQjlpq" role="3JuZjQ">
+                                  <node concept="A3Dl8" id="32notsQjlpr" role="2c44tc">
+                                    <node concept="2z4iKi" id="32notsQjlps" role="A3Ik2" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbJ" id="32notsQjlpt" role="3cqZAp">
+                              <node concept="3clFbS" id="32notsQjlpu" role="3clFbx">
+                                <node concept="3cpWs6" id="32notsQjlpv" role="3cqZAp">
+                                  <node concept="2c44tf" id="32notsQkB4K" role="3cqZAk">
+                                    <node concept="3uibUv" id="32notsQllBl" role="2c44tc">
+                                      <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3JuTUA" id="32notsQjlpy" role="3clFbw">
+                                <node concept="37vLTw" id="32notsQjlpz" role="3JuY14">
+                                  <ref role="3cqZAo" node="32notsQjlp2" resolve="type" />
+                                </node>
+                                <node concept="2c44tf" id="32notsQjlp$" role="3JuZjQ">
+                                  <node concept="A3Dl8" id="32notsQjlp_" role="2c44tc">
+                                    <node concept="H_c77" id="32notsQjlpA" role="A3Ik2" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbJ" id="32notsQjlpB" role="3cqZAp">
+                              <node concept="3clFbS" id="32notsQjlpC" role="3clFbx">
+                                <node concept="3cpWs6" id="32notsQjlpD" role="3cqZAp">
+                                  <node concept="2c44tf" id="32notsQkN3o" role="3cqZAk">
+                                    <node concept="3uibUv" id="32notsQlx8C" role="2c44tc">
+                                      <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3JuTUA" id="32notsQjlpG" role="3clFbw">
+                                <node concept="37vLTw" id="32notsQjlpH" role="3JuY14">
+                                  <ref role="3cqZAo" node="32notsQjlp2" resolve="type" />
+                                </node>
+                                <node concept="2c44tf" id="32notsQjlpI" role="3JuZjQ">
+                                  <node concept="A3Dl8" id="32notsQjlpJ" role="2c44tc">
+                                    <node concept="3uibUv" id="32notsQjlpK" role="A3Ik2">
+                                      <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs6" id="32notsQjlpL" role="3cqZAp">
+                              <node concept="10Nm6u" id="32notsQjlpM" role="3cqZAk" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1Bd96e" id="7OcVEq$tODe" role="2OqNvi">
+                <node concept="2OqwBi" id="32notsQnRkA" role="1BdPVh">
+                  <node concept="2OqwBi" id="32notsQjdfx" role="2Oq$k0">
+                    <node concept="2Jgcaq" id="7OcVEq$tQ5_" role="2Oq$k0">
+                      <node concept="1dO9Bo" id="7OcVEq$tQ5A" role="1dOa5D" />
+                      <node concept="29HgVG" id="7OcVEq$tQ5B" role="lGtFl">
+                        <node concept="3NFfHV" id="7OcVEq$tQ5C" role="3NFExx">
+                          <node concept="3clFbS" id="7OcVEq$tQ5D" role="2VODD2">
+                            <node concept="3clFbF" id="7OcVEq$tQ5E" role="3cqZAp">
+                              <node concept="2OqwBi" id="7OcVEq$tQ5F" role="3clFbG">
+                                <node concept="30H73N" id="7OcVEq$tQ5G" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="7OcVEq$tQ5H" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3$u5V9" id="32notsQlHlI" role="2OqNvi">
+                      <node concept="1bVj0M" id="32notsQlHlK" role="23t8la">
+                        <node concept="3clFbS" id="32notsQlHlL" role="1bW5cS">
+                          <node concept="3clFbF" id="32notsQlST9" role="3cqZAp">
+                            <node concept="2YIFZM" id="32notsQtx6f" role="3clFbG">
+                              <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                              <ref role="37wK5l" to="kxzb:32notsQsTE3" resolve="getNodeReference" />
+                              <node concept="37vLTw" id="32notsQtGcV" role="37wK5m">
+                                <ref role="3cqZAo" node="32notsQlHlM" resolve="it" />
+                              </node>
+                              <node concept="1ZhdrF" id="32notsQtRjh" role="lGtFl">
+                                <property role="2qtEX8" value="baseMethodDeclaration" />
+                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                <node concept="3$xsQk" id="32notsQtRji" role="3$ytzL">
+                                  <node concept="3clFbS" id="32notsQtRjj" role="2VODD2">
+                                    <node concept="3cpWs8" id="32notsQu2uA" role="3cqZAp">
+                                      <node concept="3cpWsn" id="32notsQu2uB" role="3cpWs9">
+                                        <property role="TrG5h" value="type" />
+                                        <node concept="3Tqbb2" id="32notsQu2uC" role="1tU5fm" />
+                                        <node concept="2OqwBi" id="32notsQu2uD" role="33vP2m">
+                                          <node concept="2OqwBi" id="32notsQu2uE" role="2Oq$k0">
+                                            <node concept="30H73N" id="32notsQu2uF" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="32notsQu2uG" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                                            </node>
+                                          </node>
+                                          <node concept="3JvlWi" id="32notsQu2uH" role="2OqNvi" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbJ" id="32notsQu2uI" role="3cqZAp">
+                                      <node concept="3clFbS" id="32notsQu2uJ" role="3clFbx">
+                                        <node concept="3cpWs6" id="32notsQu2uK" role="3cqZAp">
+                                          <node concept="3fl2lp" id="32notsQu2uL" role="3cqZAk">
+                                            <ref role="3fl3PK" to="kxzb:32notsQsTE3" resolve="getNodeReference" />
+                                            <node concept="3B5_sB" id="32notsQu2uM" role="3fl3PI">
+                                              <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3JuTUA" id="32notsQu2uN" role="3clFbw">
+                                        <node concept="37vLTw" id="32notsQu2uO" role="3JuY14">
+                                          <ref role="3cqZAo" node="32notsQu2uB" resolve="type" />
+                                        </node>
+                                        <node concept="2c44tf" id="32notsQu2uP" role="3JuZjQ">
+                                          <node concept="A3Dl8" id="32notsQu2uQ" role="2c44tc">
+                                            <node concept="3Tqbb2" id="32notsQu2uR" role="A3Ik2" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbJ" id="32notsQu2uS" role="3cqZAp">
+                                      <node concept="3clFbS" id="32notsQu2uT" role="3clFbx">
+                                        <node concept="3cpWs6" id="32notsQu2uU" role="3cqZAp">
+                                          <node concept="3fl2lp" id="32notsQu2uV" role="3cqZAk">
+                                            <ref role="3fl3PK" to="kxzb:32notsQsUA1" resolve="getReferenceReference" />
+                                            <node concept="3B5_sB" id="32notsQu2uW" role="3fl3PI">
+                                              <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3JuTUA" id="32notsQu2uX" role="3clFbw">
+                                        <node concept="37vLTw" id="32notsQu2uY" role="3JuY14">
+                                          <ref role="3cqZAo" node="32notsQu2uB" resolve="type" />
+                                        </node>
+                                        <node concept="2c44tf" id="32notsQu2uZ" role="3JuZjQ">
+                                          <node concept="A3Dl8" id="32notsQu2v0" role="2c44tc">
+                                            <node concept="2z4iKi" id="32notsQu2v1" role="A3Ik2" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbJ" id="32notsQu2v2" role="3cqZAp">
+                                      <node concept="3clFbS" id="32notsQu2v3" role="3clFbx">
+                                        <node concept="3cpWs6" id="32notsQu2v4" role="3cqZAp">
+                                          <node concept="3fl2lp" id="32notsQu2v5" role="3cqZAk">
+                                            <ref role="3fl3PK" to="kxzb:32notsQsVkE" resolve="getModelReference" />
+                                            <node concept="3B5_sB" id="32notsQu2v6" role="3fl3PI">
+                                              <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3JuTUA" id="32notsQu2v7" role="3clFbw">
+                                        <node concept="37vLTw" id="32notsQu2v8" role="3JuY14">
+                                          <ref role="3cqZAo" node="32notsQu2uB" resolve="type" />
+                                        </node>
+                                        <node concept="2c44tf" id="32notsQu2v9" role="3JuZjQ">
+                                          <node concept="A3Dl8" id="32notsQu2va" role="2c44tc">
+                                            <node concept="H_c77" id="32notsQu2vb" role="A3Ik2" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbJ" id="32notsQu2vc" role="3cqZAp">
+                                      <node concept="3clFbS" id="32notsQu2vd" role="3clFbx">
+                                        <node concept="3cpWs6" id="32notsQu2ve" role="3cqZAp">
+                                          <node concept="3fl2lp" id="32notsQu2vf" role="3cqZAk">
+                                            <ref role="3fl3PK" to="kxzb:32notsQsW4c" resolve="getModuleReference" />
+                                            <node concept="3B5_sB" id="32notsQu2vg" role="3fl3PI">
+                                              <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3JuTUA" id="32notsQu2vh" role="3clFbw">
+                                        <node concept="37vLTw" id="32notsQu2vi" role="3JuY14">
+                                          <ref role="3cqZAo" node="32notsQu2uB" resolve="type" />
+                                        </node>
+                                        <node concept="2c44tf" id="32notsQu2vj" role="3JuZjQ">
+                                          <node concept="A3Dl8" id="32notsQu2vk" role="2c44tc">
+                                            <node concept="3uibUv" id="32notsQu2vl" role="A3Ik2">
+                                              <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3cpWs6" id="32notsQu2vm" role="3cqZAp">
+                                      <node concept="10Nm6u" id="32notsQu2vn" role="3cqZAk" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="32notsQlHlM" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="32notsQlHlN" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="32notsQo2yM" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="raruj" id="7OcVEq$tRMm" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6_TW7xVvrTQ" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="7gnNafF7ZxM">
+    <property role="TrG5h" value="reduce_PrintTextExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <ref role="3gUMe" to="eynw:7gnNafF7YMD" resolve="PrintTextExpression" />
+    <node concept="312cEu" id="7gnNafF7ZKS" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main4" />
+      <node concept="2YIFZL" id="7gnNafF7ZKT" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="37vLTG" id="7gnNafF7ZKU" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="7gnNafF7ZKV" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="7gnNafF7ZKW" role="3clF46">
+          <property role="TrG5h" value="console" />
+          <node concept="3uibUv" id="7gnNafF7ZKX" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7gnNafF7ZKY" role="3clF45" />
+        <node concept="3Tm1VV" id="7gnNafF7ZKZ" role="1B3o_S" />
+        <node concept="3clFbS" id="7gnNafF7ZL0" role="3clF47">
+          <node concept="3clFbF" id="4LU9FcrO9rk" role="3cqZAp">
+            <node concept="2OqwBi" id="4LU9FcrO9rl" role="3clFbG">
+              <node concept="raruj" id="6D0CP__pjLb" role="lGtFl" />
+              <node concept="liA8E" id="4LU9FcrO9rm" role="2OqNvi">
+                <ref role="37wK5l" to="qgo0:5WpmwkrQPWC" resolve="addText" />
+                <node concept="3cpWs3" id="3k3Ji7IudM_" role="37wK5m">
+                  <node concept="Xl_RD" id="3k3Ji7IudWt" role="3uHU7w">
+                    <property role="Xl_RC" value="" />
+                  </node>
+                  <node concept="37vLTw" id="4LU9FcrO9ro" role="3uHU7B">
+                    <node concept="29HgVG" id="4LU9FcrO9rp" role="lGtFl">
+                      <node concept="3NFfHV" id="4LU9FcrO9rq" role="3NFExx">
+                        <node concept="3clFbS" id="4LU9FcrO9rr" role="2VODD2">
+                          <node concept="3clFbF" id="4LU9FcrO9rs" role="3cqZAp">
+                            <node concept="2OqwBi" id="4LU9FcrO9rt" role="3clFbG">
+                              <node concept="3TrEf2" id="4LU9FcrO9ru" role="2OqNvi">
+                                <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                              </node>
+                              <node concept="30H73N" id="4LU9FcrO9rv" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="4LU9FcrO9rw" role="2Oq$k0">
+                <ref role="3cqZAo" node="7gnNafF7ZKW" resolve="console" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7gnNafF7ZLe" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="3J6h25QOL62">
+    <property role="TrG5h" value="reduce_ProjectScopeLiteral" />
+    <property role="3GE5qa" value="expression.parameter" />
+    <ref role="3gUMe" to="eynw:3J6h25QeHQy" resolve="ProjectScope" />
+    <node concept="312cEu" id="3J6h25QOMzM" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main2" />
+      <node concept="2YIFZL" id="3J6h25QOMzN" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="3J6h25QOMzO" role="3clF45" />
+        <node concept="37vLTG" id="3J6h25QOMzP" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="WMsS6mCWgy" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="3J6h25QOMzT" role="1B3o_S" />
+        <node concept="3clFbS" id="3J6h25QOMzU" role="3clF47">
+          <node concept="3clFbF" id="3J6h25QOMzV" role="3cqZAp">
+            <node concept="2ShNRf" id="3TUIR3TH$mK" role="3clFbG">
+              <node concept="1pGfFk" id="3TUIR3TIfUB" role="2ShVmc">
+                <ref role="37wK5l" to="mte5:~ProjectScope.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="ProjectScope" />
+                <node concept="2OqwBi" id="3J6h25QP07d" role="37wK5m">
+                  <node concept="37vLTw" id="3J6h25QP00V" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3J6h25QOMzP" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="3J6h25QP0N3" role="2OqNvi">
+                    <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="3J6h25QP0PQ" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3J6h25QOMzY" role="1B3o_S" />
+    </node>
+  </node>
+  <node concept="13MO4I" id="DM6_$iqXIq">
+    <property role="TrG5h" value="reduce_ProjectExpression" />
+    <property role="3GE5qa" value="expression.query" />
+    <ref role="3gUMe" to="eynw:DM6_$iqV$8" resolve="ProjectExpression" />
+    <node concept="312cEu" id="DM6_$iqYkT" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main3" />
+      <node concept="2YIFZL" id="DM6_$iqYkU" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="DM6_$iqYkV" role="3clF45" />
+        <node concept="37vLTG" id="DM6_$iqYkW" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="WMsS6mCWip" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="DM6_$iqYl0" role="1B3o_S" />
+        <node concept="3clFbS" id="DM6_$iqYl1" role="3clF47">
+          <node concept="3clFbF" id="DM6_$ir01X" role="3cqZAp">
+            <node concept="2OqwBi" id="DM6_$ir060" role="3clFbG">
+              <node concept="37vLTw" id="DM6_$ir01W" role="2Oq$k0">
+                <ref role="3cqZAo" node="DM6_$iqYkW" resolve="context" />
+              </node>
+              <node concept="liA8E" id="DM6_$ir0s1" role="2OqNvi">
+                <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
+              </node>
+              <node concept="raruj" id="DM6_$isJh2" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="DM6_$iqYli" role="1B3o_S" />
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl
index c97c5611ce96..e1913924067c 100644
--- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl
+++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl
@@ -3,7 +3,7 @@
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
-      <sourceRoot path="${module}/languageAccessories" />
+      <sourceRoot location="languageAccessories" />
     </modelRoot>
   </models>
   <accessoryModels />
@@ -17,6 +17,15 @@
       <external-templates />
       <dependencies>
         <dependency reexport="false">a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)</dependency>
+        <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+        <dependency reexport="false">de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)</dependency>
+        <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+        <dependency reexport="false">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
+        <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+        <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+        <dependency reexport="false">504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.lang.smodel.query#5336086527852811409)</dependency>
+        <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+        <dependency reexport="false">9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)</dependency>
       </dependencies>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -29,12 +38,16 @@
         <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" fqName="jetbrains.mps.console.base" version="0" />
         <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
         <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
         <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
+        <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" fqName="jetbrains.mps.lang.smodel.query" version="0" />
+        <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+        <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
       </languageVersions>
       <mapping-priorities />
     </generator>
@@ -42,7 +55,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
-    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="true">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">e6368d5c-b931-4d4d-9941-07b7da7d2e2d(jetbrains.mps.tool.builder)</dependency>
@@ -79,6 +92,7 @@
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
   </languageVersions>
   <runtime>
     <dependency reexport="false">a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)</dependency>
@@ -87,6 +101,7 @@
     <extendedLanguage>7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</extendedLanguage>
     <extendedLanguage>ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</extendedLanguage>
     <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
+    <extendedLanguage>1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/plugins/console/lang/blCommand/languageModels/actions.mps b/plugins/console/lang/base/languageModels/actions.mps
similarity index 67%
rename from plugins/console/lang/blCommand/languageModels/actions.mps
rename to plugins/console/lang/base/languageModels/actions.mps
index 1f52b1b42435..245750c614f3 100644
--- a/plugins/console/lang/blCommand/languageModels/actions.mps
+++ b/plugins/console/lang/base/languageModels/actions.mps
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.console.blCommand.actions)">
+<model ref="r:e2e0d663-5267-4842-83ca-f12fcca33264(jetbrains.mps.console.base.actions)">
   <persistence version="9" />
   <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
-    <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
+    <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
   </imports>
   <registry>
     <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" />
-      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -27,7 +25,6 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -42,7 +39,6 @@
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
       </concept>
@@ -91,8 +87,6 @@
       </concept>
       <concept id="1177402571666" name="jetbrains.mps.lang.actions.structure.QueryFunction_SubstituteWrapper" flags="in" index="yEnE0" />
       <concept id="1177402641904" name="jetbrains.mps.lang.actions.structure.ConceptFunctionParameter_nodeToWrap" flags="nn" index="yECNy" />
-      <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
-      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
       <concept id="5480835971642155304" name="jetbrains.mps.lang.actions.structure.NF_Model_CreateNewNodeOperation" flags="nn" index="15TzpJ" />
       <concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
         <child id="1158700779049" name="nodeFactory" index="37WGs$" />
@@ -130,16 +124,10 @@
       <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="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
-        <reference id="1139880128956" name="concept" index="1A9B2P" />
-      </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1143235216708" name="jetbrains.mps.lang.smodel.structure.Model_CreateNewNodeOperation" flags="nn" index="I8ghe">
         <reference id="1143235391024" name="concept" index="I8UWU" />
       </concept>
-      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
-        <reference id="1139877738879" name="concept" index="1A0vxQ" />
-      </concept>
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -153,9 +141,6 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </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">
@@ -166,114 +151,13 @@
       </concept>
     </language>
   </registry>
-  <node concept="37WguZ" id="3J6h25QtWbZ">
-    <property role="3GE5qa" value="expression" />
-    <property role="TrG5h" value="QueryExpression_NodeFactories" />
-    <node concept="37WvkG" id="3J6h25QtWc0" role="37WGs$">
-      <ref role="37XkoT" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
-      <node concept="37Y9Zx" id="3J6h25QtWc1" role="37ZfLb">
-        <node concept="3clFbS" id="3J6h25QtWc2" role="2VODD2">
-          <node concept="3clFbJ" id="3J6h25QtWc5" role="3cqZAp">
-            <node concept="3clFbS" id="3J6h25QtWc6" role="3clFbx">
-              <node concept="3clFbF" id="3J6h25QxUZU" role="3cqZAp">
-                <node concept="2OqwBi" id="3J6h25QCL5M" role="3clFbG">
-                  <node concept="2OqwBi" id="3J6h25QxVFq" role="2Oq$k0">
-                    <node concept="1r4Lsj" id="3J6h25QxUZS" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="3J6h25QCKdo" role="2OqNvi">
-                      <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                    </node>
-                  </node>
-                  <node concept="2oxUTD" id="3J6h25QCMin" role="2OqNvi">
-                    <node concept="2OqwBi" id="3J6h25QCNJ5" role="2oxUTC">
-                      <node concept="1PxgMI" id="3J6h25QCNuO" role="2Oq$k0">
-                        <ref role="1PxNhF" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
-                        <node concept="1r4N5L" id="3J6h25QCMkZ" role="1PxMeX" />
-                      </node>
-                      <node concept="3TrEf2" id="3J6h25QCPoo" role="2OqNvi">
-                        <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="3J6h25QtWie" role="3clFbw">
-              <node concept="1r4N5L" id="3J6h25QtWcn" role="2Oq$k0" />
-              <node concept="1mIQ4w" id="3J6h25QtX3r" role="2OqNvi">
-                <node concept="chp4Y" id="3J6h25QtX4p" role="cj9EA">
-                  <ref role="cht4Q" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
-                </node>
-              </node>
-            </node>
-            <node concept="9aQIb" id="3J6h25QDjj7" role="9aQIa">
-              <node concept="3clFbS" id="3J6h25QDjj8" role="9aQI4">
-                <node concept="3clFbF" id="3J6h25QDjou" role="3cqZAp">
-                  <node concept="37vLTI" id="3J6h25QDmYb" role="3clFbG">
-                    <node concept="10Nm6u" id="3J6h25QDn0P" role="37vLTx" />
-                    <node concept="2OqwBi" id="3J6h25QDj_g" role="37vLTJ">
-                      <node concept="1r4Lsj" id="3J6h25QDjot" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="3J6h25QDl8l" role="2OqNvi">
-                        <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="37WguZ" id="6kp4dbAhwuy">
-    <property role="3GE5qa" value="print" />
-    <property role="TrG5h" value="printStatement_NodeFactories" />
-    <node concept="37WvkG" id="6kp4dbAhwuz" role="37WGs$">
-      <ref role="37XkoT" to="3xdn:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-      <node concept="37Y9Zx" id="6kp4dbAhwvN" role="37ZfLb">
-        <node concept="3clFbS" id="6kp4dbAhwvO" role="2VODD2">
-          <node concept="3clFbJ" id="6kp4dbAhwvR" role="3cqZAp">
-            <node concept="3clFbS" id="6kp4dbAhwvS" role="3clFbx">
-              <node concept="3clFbF" id="6kp4dbAhxI3" role="3cqZAp">
-                <node concept="37vLTI" id="6kp4dbAhEf5" role="3clFbG">
-                  <node concept="2OqwBi" id="6kp4dbAhFRk" role="37vLTx">
-                    <node concept="1PxgMI" id="6kp4dbAhFzP" role="2Oq$k0">
-                      <ref role="1PxNhF" to="3xdn:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-                      <node concept="1r4N5L" id="6kp4dbAhEiz" role="1PxMeX" />
-                    </node>
-                    <node concept="3TrEf2" id="6kp4dbAhIG3" role="2OqNvi">
-                      <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="6kp4dbAhxSN" role="37vLTJ">
-                    <node concept="1r4Lsj" id="6kp4dbAhxI2" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="6kp4dbAh_XB" role="2OqNvi">
-                      <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6kp4dbAhwIN" role="3clFbw">
-              <node concept="1r4N5L" id="6kp4dbAhwE2" role="2Oq$k0" />
-              <node concept="1mIQ4w" id="6kp4dbAhxw0" role="2OqNvi">
-                <node concept="chp4Y" id="6kp4dbAhxwY" role="cj9EA">
-                  <ref role="cht4Q" to="3xdn:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="3FK_9_" id="3idupetA40z">
     <property role="3GE5qa" value="expression" />
     <property role="TrG5h" value="blExpression" />
     <node concept="3FOIzC" id="3idupetA57V" role="3FOPby">
       <ref role="3FOWKa" to="eynw:5WvH$QO98uv" resolve="Command" />
       <node concept="tYCnQ" id="3idupetA5CX" role="tZc4B">
-        <ref role="uz4UX" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
+        <ref role="uz4UX" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
         <node concept="yEb5T" id="3idupetA5YZ" role="uz6Si">
           <ref role="yEYPM" to="tpee:fz3vP1J" resolve="Expression" />
           <node concept="yEnE0" id="3idupetA5Z0" role="yEVE$">
@@ -282,7 +166,7 @@
                 <node concept="3cpWsn" id="h8yIrC2" role="3cpWs9">
                   <property role="TrG5h" value="result" />
                   <node concept="3Tqbb2" id="h8yIrC3" role="1tU5fm">
-                    <ref role="ehGHo" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
+                    <ref role="ehGHo" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
                   </node>
                   <node concept="2OqwBi" id="hxiFsjh" role="33vP2m">
                     <node concept="2OqwBi" id="hxiFpG7" role="2Oq$k0">
@@ -290,7 +174,7 @@
                       <node concept="I4A8Y" id="h8yItwH" role="2OqNvi" />
                     </node>
                     <node concept="15TzpJ" id="x$tpHUZAEy" role="2OqNvi">
-                      <ref role="I8UWU" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
+                      <ref role="I8UWU" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
                     </node>
                   </node>
                 </node>
@@ -302,7 +186,7 @@
                       <ref role="3cqZAo" node="h8yIrC2" resolve="result" />
                     </node>
                     <node concept="3TrEf2" id="3idupetAUMY" role="2OqNvi">
-                      <ref role="3Tt5mk" to="3xdn:6D0CP__oaD2" />
+                      <ref role="3Tt5mk" to="eynw:6D0CP__oaD2" />
                     </node>
                   </node>
                   <node concept="2oxUTD" id="3idupetAXpN" role="2OqNvi">
@@ -330,84 +214,20 @@
       </node>
     </node>
   </node>
-  <node concept="37WguZ" id="31Tct3Tmt18">
-    <property role="3GE5qa" value="expression.query.parameter" />
-    <property role="TrG5h" value="ScopeParameterLiteral_factories" />
-    <node concept="37WvkG" id="31Tct3Tmt19" role="37WGs$">
-      <ref role="37XkoT" to="3xdn:2oWvAovDHkX" resolve="ModulesScope" />
-      <node concept="37Y9Zx" id="31Tct3Tmt37" role="37ZfLb">
-        <node concept="3clFbS" id="31Tct3Tmt38" role="2VODD2">
-          <node concept="3clFbF" id="31Tct3Tmt3c" role="3cqZAp">
-            <node concept="2OqwBi" id="31Tct3TmvE2" role="3clFbG">
-              <node concept="2OqwBi" id="31Tct3Tmtdk" role="2Oq$k0">
-                <node concept="1r4Lsj" id="31Tct3Tmt3b" role="2Oq$k0" />
-                <node concept="3Tsc0h" id="31Tct3TxscK" role="2OqNvi">
-                  <ref role="3TtcxE" to="3xdn:31Tct3TiJtC" />
-                </node>
-              </node>
-              <node concept="2DeJg1" id="31Tct3TxABi" role="2OqNvi">
-                <ref role="1A0vxQ" to="tp25:3wj3sjzQPFL" resolve="ModuleReferenceExpression" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="37WvkG" id="31Tct3TmLCU" role="37WGs$">
-      <ref role="37XkoT" to="3xdn:31Tct3Tk$xe" resolve="ModelScope" />
-      <node concept="37Y9Zx" id="31Tct3TmLCV" role="37ZfLb">
-        <node concept="3clFbS" id="31Tct3TmLCW" role="2VODD2">
-          <node concept="3clFbF" id="31Tct3TmLCX" role="3cqZAp">
-            <node concept="2OqwBi" id="31Tct3TmLCY" role="3clFbG">
-              <node concept="2OqwBi" id="31Tct3TmLCZ" role="2Oq$k0">
-                <node concept="1r4Lsj" id="31Tct3TmLD0" role="2Oq$k0" />
-                <node concept="3Tsc0h" id="31Tct3TxD8L" role="2OqNvi">
-                  <ref role="3TtcxE" to="3xdn:31Tct3Tk$xf" />
-                </node>
-              </node>
-              <node concept="2DeJg1" id="31Tct3TxNCD" role="2OqNvi">
-                <ref role="1A0vxQ" to="tp25:v3WHCwUiHy" resolve="ModelReferenceExpression" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="37WvkG" id="31Tct3TnY01" role="37WGs$">
-      <ref role="37XkoT" to="3xdn:31Tct3Txnn9" resolve="CustomScope" />
-      <node concept="37Y9Zx" id="31Tct3TnY02" role="37ZfLb">
-        <node concept="3clFbS" id="31Tct3TnY03" role="2VODD2">
-          <node concept="3clFbF" id="31Tct3TnY04" role="3cqZAp">
-            <node concept="2OqwBi" id="31Tct3TnY05" role="3clFbG">
-              <node concept="2OqwBi" id="31Tct3TnY06" role="2Oq$k0">
-                <node concept="1r4Lsj" id="31Tct3TnY07" role="2Oq$k0" />
-                <node concept="3TrEf2" id="31Tct3TxOzG" role="2OqNvi">
-                  <ref role="3Tt5mk" to="3xdn:31Tct3Txpke" />
-                </node>
-              </node>
-              <node concept="2DeJnY" id="31Tct3TxPN2" role="2OqNvi">
-                <ref role="1A9B2P" to="tpee:gEShNN5" resolve="GenericNewExpression" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1hljLi" id="40bPOmRLlqy">
     <property role="3GE5qa" value="expression" />
     <property role="TrG5h" value="blExpression" />
     <node concept="1hlzdc" id="40bPOmRLlqz" role="1hl$rw">
-      <ref role="1hmvP4" to="tpee:fz3vP1J" resolve="Expression" />
       <ref role="1hszAz" to="eynw:5WvH$QO98uv" resolve="Command" />
+      <ref role="1hmvP4" to="tpee:fz3vP1J" resolve="Expression" />
       <node concept="1ht64k" id="40bPOmRLlq$" role="1hsNre">
         <node concept="3clFbS" id="40bPOmRLlq_" role="2VODD2">
           <node concept="3clFbF" id="40bPOmRLlAA" role="3cqZAp">
             <node concept="2pJPEk" id="40bPOmRLlA$" role="3clFbG">
               <node concept="2pJPED" id="40bPOmRLlDo" role="2pJPEn">
-                <ref role="2pJxaS" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
+                <ref role="2pJxaS" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
                 <node concept="2pIpSj" id="40bPOmRLlHd" role="2pJxcM">
-                  <ref role="2pIpSl" to="3xdn:6D0CP__oaD2" />
+                  <ref role="2pIpSl" to="eynw:6D0CP__oaD2" />
                   <node concept="36biLy" id="40bPOmRLlKu" role="2pJxcZ">
                     <node concept="1ht04C" id="40bPOmRLlNR" role="36biLW" />
                   </node>
@@ -419,15 +239,15 @@
       </node>
     </node>
     <node concept="1hlzdc" id="1fzYukMjiUe" role="1hl$rw">
+      <ref role="1hmvP4" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
       <ref role="1hszAz" to="tpee:fz3vP1J" resolve="Expression" />
-      <ref role="1hmvP4" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
       <node concept="1ht64k" id="1fzYukMjiUf" role="1hsNre">
         <node concept="3clFbS" id="1fzYukMjiUg" role="2VODD2">
           <node concept="3clFbF" id="1fzYukMjiUh" role="3cqZAp">
             <node concept="2OqwBi" id="1fzYukMjiUi" role="3clFbG">
               <node concept="1ht04C" id="1fzYukMjiUj" role="2Oq$k0" />
               <node concept="3TrEf2" id="1fzYukMjiUk" role="2OqNvi">
-                <ref role="3Tt5mk" to="3xdn:6D0CP__oaD2" />
+                <ref role="3Tt5mk" to="eynw:6D0CP__oaD2" />
               </node>
             </node>
           </node>
@@ -435,7 +255,7 @@
       </node>
     </node>
     <node concept="1hlzdc" id="5h_4CeHXsLx" role="1hl$rw">
-      <ref role="1hmvP4" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
+      <ref role="1hmvP4" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
       <ref role="1hszAz" to="tpee:fzclF8l" resolve="Statement" />
       <node concept="1ht64k" id="5h_4CeHXsOH" role="1hsNre">
         <node concept="3clFbS" id="5h_4CeHXvHh" role="2VODD2">
@@ -449,7 +269,7 @@
                     <node concept="2OqwBi" id="5h_4CeHXA2x" role="36biLW">
                       <node concept="1ht04C" id="5h_4CeHX_X3" role="2Oq$k0" />
                       <node concept="3TrEf2" id="5h_4CeHXBDp" role="2OqNvi">
-                        <ref role="3Tt5mk" to="3xdn:6D0CP__oaD2" />
+                        <ref role="3Tt5mk" to="eynw:6D0CP__oaD2" />
                       </node>
                     </node>
                   </node>
@@ -461,5 +281,47 @@
       </node>
     </node>
   </node>
+  <node concept="37WguZ" id="6kp4dbAhwuy">
+    <property role="3GE5qa" value="print" />
+    <property role="TrG5h" value="printStatement_NodeFactories" />
+    <node concept="37WvkG" id="6kp4dbAhwuz" role="37WGs$">
+      <ref role="37XkoT" to="eynw:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+      <node concept="37Y9Zx" id="6kp4dbAhwvN" role="37ZfLb">
+        <node concept="3clFbS" id="6kp4dbAhwvO" role="2VODD2">
+          <node concept="3clFbJ" id="6kp4dbAhwvR" role="3cqZAp">
+            <node concept="3clFbS" id="6kp4dbAhwvS" role="3clFbx">
+              <node concept="3clFbF" id="6kp4dbAhxI3" role="3cqZAp">
+                <node concept="37vLTI" id="6kp4dbAhEf5" role="3clFbG">
+                  <node concept="2OqwBi" id="6kp4dbAhFRk" role="37vLTx">
+                    <node concept="1PxgMI" id="6kp4dbAhFzP" role="2Oq$k0">
+                      <ref role="1PxNhF" to="eynw:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+                      <node concept="1r4N5L" id="6kp4dbAhEiz" role="1PxMeX" />
+                    </node>
+                    <node concept="3TrEf2" id="6kp4dbAhIG3" role="2OqNvi">
+                      <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="6kp4dbAhxSN" role="37vLTJ">
+                    <node concept="1r4Lsj" id="6kp4dbAhxI2" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="6kp4dbAh_XB" role="2OqNvi">
+                      <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6kp4dbAhwIN" role="3clFbw">
+              <node concept="1r4N5L" id="6kp4dbAhwE2" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="6kp4dbAhxw0" role="2OqNvi">
+                <node concept="chp4Y" id="6kp4dbAhxwY" role="cj9EA">
+                  <ref role="cht4Q" to="eynw:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps
index 66b76138c5ae..17e434eb241a 100644
--- a/plugins/console/lang/base/languageModels/behavior.mps
+++ b/plugins/console/lang/base/languageModels/behavior.mps
@@ -13,7 +13,6 @@
   <imports>
     <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
     <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
-    <import index="oh9p" ref="r:ab572aa6-6e4f-43f3-8bc9-ad4a8ae29372(jetbrains.mps.console.actions)" />
     <import index="unno" ref="r:61e3d524-8c49-4491-b5e3-f6d6e9364527(jetbrains.mps.util)" />
     <import index="tpeu" ref="r:00000000-0000-4000-0000-011c895902fa(jetbrains.mps.lang.smodel.behavior)" />
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
@@ -29,8 +28,17 @@
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" />
+    <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
+    <import index="kt01" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.datatransfer(JDK/)" />
+    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
+    <import index="oh9p" ref="r:ab572aa6-6e4f-43f3-8bc9-ad4a8ae29372(jetbrains.mps.console.actions)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)" implicit="true" />
+    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -236,6 +244,11 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </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">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
         <property id="1167228628751" name="hasException" index="34fQS0" />
@@ -252,13 +265,18 @@
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
       <concept id="1181952871644" name="jetbrains.mps.lang.smodel.structure.Concept_GetAllSubConcepts" flags="nn" index="LSoRf">
         <child id="1182506816063" name="smodel" index="1iTxcG" />
       </concept>
+      <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
+        <child id="1145567471833" name="createdType" index="2T96Bj" />
+      </concept>
       <concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
         <reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
         <reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
@@ -279,7 +297,7 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
-      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3THzug">
+      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug">
         <reference id="1180481110358" name="conceptDeclaraton" index="3qa414" />
       </concept>
       <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
@@ -410,12 +428,19 @@
                           <node concept="3cpWsn" id="1BJjlnrBHXK" role="3cpWs9">
                             <property role="TrG5h" value="model" />
                             <node concept="2OqwBi" id="7zdHeh8cOnA" role="33vP2m">
-                              <node concept="2OqwBi" id="7zdHeh8cEPm" role="2Oq$k0">
-                                <node concept="37vLTw" id="7zdHeh8cEw7" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3MPHfSuOT_T" resolve="context" />
-                                </node>
-                                <node concept="liA8E" id="7zdHeh8cNuz" role="2OqNvi">
-                                  <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getConsoleTab" />
+                              <node concept="1eOMI4" id="3ZgZ1njThn7" role="2Oq$k0">
+                                <node concept="10QFUN" id="3ZgZ1njThn8" role="1eOMHV">
+                                  <node concept="2OqwBi" id="3ZgZ1njThn4" role="10QFUP">
+                                    <node concept="37vLTw" id="3ZgZ1njThn5" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3MPHfSuOT_T" resolve="context" />
+                                    </node>
+                                    <node concept="liA8E" id="3ZgZ1njThn6" role="2OqNvi">
+                                      <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getOutputWindow" />
+                                    </node>
+                                  </node>
+                                  <node concept="3uibUv" id="3ZgZ1njThIk" role="10QFUM">
+                                    <ref role="3uigEE" to="qgo0:4gO8Gruz$1J" resolve="BaseConsoleTab" />
+                                  </node>
                                 </node>
                               </node>
                               <node concept="liA8E" id="7zdHeh8d0XI" role="2OqNvi">
@@ -482,17 +507,25 @@
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="3cpWs8" id="1KUoCiqb7pu" role="3cqZAp">
-                                      <node concept="3cpWsn" id="1KUoCiqb7pv" role="3cpWs9">
+                                    <node concept="3cpWs8" id="3ZgZ1njTfOq" role="3cqZAp">
+                                      <node concept="3cpWsn" id="3ZgZ1njTfOr" role="3cpWs9">
                                         <property role="TrG5h" value="name" />
-                                        <node concept="2YIFZM" id="7zdHeh8bQO0" role="33vP2m">
-                                          <ref role="1Pybhc" to="qgo0:7zdHeh8agf_" resolve="ConsoleUtil" />
-                                          <ref role="37wK5l" to="qgo0:7zdHeh8bIs_" resolve="getGeneratedModelName" />
-                                          <node concept="37vLTw" id="7zdHeh8bYNE" role="37wK5m">
-                                            <ref role="3cqZAo" node="3MPHfSuOT_T" resolve="context" />
+                                        <node concept="3cpWs3" id="3ZgZ1njTfOs" role="33vP2m">
+                                          <node concept="Xl_RD" id="3ZgZ1njTfOt" role="3uHU7w">
+                                            <property role="Xl_RC" value=".Main" />
+                                          </node>
+                                          <node concept="2OqwBi" id="3ZgZ1njTfOu" role="3uHU7B">
+                                            <node concept="liA8E" id="3ZgZ1njTfOv" role="2OqNvi">
+                                              <ref role="37wK5l" to="mhbf:~SModel.getModelName():java.lang.String" resolve="getModelName" />
+                                            </node>
+                                            <node concept="2JrnkZ" id="3ZgZ1njTfOw" role="2Oq$k0">
+                                              <node concept="37vLTw" id="3ZgZ1njTgw_" role="2JrQYb">
+                                                <ref role="3cqZAo" node="1BJjlnrBHXK" resolve="model" />
+                                              </node>
+                                            </node>
                                           </node>
                                         </node>
-                                        <node concept="17QB3L" id="1KUoCiqb7pw" role="1tU5fm" />
+                                        <node concept="17QB3L" id="3ZgZ1njTfOA" role="1tU5fm" />
                                       </node>
                                     </node>
                                     <node concept="3cpWs8" id="5UIijiormpD" role="3cqZAp">
@@ -513,7 +546,7 @@
                                               <ref role="3cqZAo" node="5UIijiorcFj" resolve="module" />
                                             </node>
                                             <node concept="37vLTw" id="5UIijiorHTQ" role="37wK5m">
-                                              <ref role="3cqZAo" node="1KUoCiqb7pv" resolve="name" />
+                                              <ref role="3cqZAo" node="3ZgZ1njTfOr" resolve="name" />
                                             </node>
                                           </node>
                                         </node>
@@ -535,7 +568,7 @@
                                                       <property role="Xl_RC" value="No class " />
                                                     </node>
                                                     <node concept="37vLTw" id="5UIijiorXjh" role="3uHU7w">
-                                                      <ref role="3cqZAo" node="1KUoCiqb7pv" resolve="name" />
+                                                      <ref role="3cqZAo" node="3ZgZ1njTfOr" resolve="name" />
                                                     </node>
                                                   </node>
                                                   <node concept="Xl_RD" id="5UIijiorYnL" role="3uHU7w">
@@ -1150,7 +1183,7 @@
       <node concept="3clFbS" id="5WvH$QO9bvd" role="3clF47" />
       <node concept="37vLTG" id="5WvH$QO9bve" role="3clF46">
         <property role="TrG5h" value="c" />
-        <node concept="3uibUv" id="5WvH$QO9bvf" role="1tU5fm">
+        <node concept="3uibUv" id="3ZgZ1njMGH8" role="1tU5fm">
           <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
         </node>
       </node>
@@ -1181,7 +1214,7 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getKind" />
-      <ref role="13i0hy" node="64VftqEenf4" resolve="getKind" />
+      <ref role="13i0hy" to="fq2o:64VftqEenf4" resolve="getKind" />
       <node concept="3Tm1VV" id="64VftqEeo6V" role="1B3o_S" />
       <node concept="3clFbS" id="64VftqEeo6Y" role="3clF47">
         <node concept="3clFbF" id="64VftqEeo7h" role="3cqZAp">
@@ -1401,7 +1434,7 @@
                 <property role="TrG5h" value="constructions" />
                 <node concept="A3Dl8" id="60B$833918g" role="1tU5fm">
                   <node concept="3THzug" id="60B$833918i" role="A3Ik2">
-                    <ref role="3qa414" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                    <ref role="3qa414" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="59iQg8rxsyM" role="33vP2m">
@@ -1410,16 +1443,23 @@
                       <node concept="2OqwBi" id="60B$8338kWo" role="2Oq$k0">
                         <node concept="2OqwBi" id="60B$832Zq$Y" role="2Oq$k0">
                           <node concept="3TUQnm" id="60B$832Zqrr" role="2Oq$k0">
-                            <ref role="3TV0OU" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                            <ref role="3TV0OU" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
                           </node>
                           <node concept="LSoRf" id="60B$832ZqZA" role="2OqNvi">
                             <node concept="2OqwBi" id="7M1Gaz37H$v" role="1iTxcG">
-                              <node concept="2OqwBi" id="60B$832ZMVa" role="2Oq$k0">
-                                <node concept="37vLTw" id="60B$832ZMOF" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="qgIopN2y9g" resolve="context" />
-                                </node>
-                                <node concept="liA8E" id="60B$832ZNsH" role="2OqNvi">
-                                  <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getConsoleTab" />
+                              <node concept="1eOMI4" id="3ZgZ1njTk9W" role="2Oq$k0">
+                                <node concept="10QFUN" id="3ZgZ1njTk9X" role="1eOMHV">
+                                  <node concept="2OqwBi" id="3ZgZ1njTk9T" role="10QFUP">
+                                    <node concept="37vLTw" id="3ZgZ1njTk9U" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="qgIopN2y9g" resolve="context" />
+                                    </node>
+                                    <node concept="liA8E" id="3ZgZ1njTk9V" role="2OqNvi">
+                                      <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getOutputWindow" />
+                                    </node>
+                                  </node>
+                                  <node concept="3uibUv" id="3ZgZ1njTkrp" role="10QFUM">
+                                    <ref role="3uigEE" to="qgo0:4gO8Gruz$1J" resolve="BaseConsoleTab" />
+                                  </node>
                                 </node>
                               </node>
                               <node concept="liA8E" id="7M1Gaz37NaB" role="2OqNvi">
@@ -1476,7 +1516,7 @@
                                   <ref role="3cqZAo" node="60B$833r$$T" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="60B$833rMdR" role="2OqNvi">
-                                  <ref role="37wK5l" node="60B$833p9Uj" resolve="getGroup" />
+                                  <ref role="37wK5l" to="fq2o:60B$833p9Uj" resolve="getGroup" />
                                 </node>
                               </node>
                             </node>
@@ -1500,7 +1540,7 @@
                                 <ref role="3cqZAo" node="60B$833s05P" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="60B$833se86" role="2OqNvi">
-                                <ref role="37wK5l" node="64VftqEenf4" resolve="getKind" />
+                                <ref role="37wK5l" to="fq2o:64VftqEenf4" resolve="getKind" />
                               </node>
                             </node>
                           </node>
@@ -1546,13 +1586,13 @@
                 <property role="TrG5h" value="groupedConstructions" />
                 <node concept="2BANLN" id="6eQQAdlFn$v" role="1tU5fm">
                   <node concept="3THzug" id="6eQQAdlFubH" role="_ZDj9">
-                    <ref role="3qa414" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                    <ref role="3qa414" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="6eQQAdlFAEC" role="33vP2m">
                   <node concept="2Jqq0_" id="6eQQAdlFAEA" role="2ShVmc">
                     <node concept="3THzug" id="6eQQAdlFAEB" role="HW$YZ">
-                      <ref role="3qa414" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                      <ref role="3qa414" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
                     </node>
                   </node>
                 </node>
@@ -1588,7 +1628,7 @@
                         <node concept="1yVyf7" id="6eQQAdlG24M" role="2OqNvi" />
                       </node>
                       <node concept="2qgKlT" id="6eQQAdlG7wl" role="2OqNvi">
-                        <ref role="37wK5l" node="60B$833p9Uj" resolve="getGroup" />
+                        <ref role="37wK5l" to="fq2o:60B$833p9Uj" resolve="getGroup" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="6eQQAdlFPHe" role="3uHU7B">
@@ -1596,7 +1636,7 @@
                         <ref role="2Gs0qQ" node="6eQQAdlFHHj" resolve="e" />
                       </node>
                       <node concept="2qgKlT" id="6eQQAdlFRb0" role="2OqNvi">
-                        <ref role="37wK5l" node="60B$833p9Uj" resolve="getGroup" />
+                        <ref role="37wK5l" to="fq2o:60B$833p9Uj" resolve="getGroup" />
                       </node>
                     </node>
                   </node>
@@ -1646,7 +1686,7 @@
                                           <ref role="3cqZAo" node="60B$8332SL7" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="60B$8332SL0" role="2OqNvi">
-                                          <ref role="37wK5l" node="64VftqEenfn" resolve="getShortDisplayString" />
+                                          <ref role="37wK5l" to="fq2o:64VftqEenfn" resolve="getShortDisplayString" />
                                         </node>
                                       </node>
                                       <node concept="2OqwBi" id="60B$8332SL4" role="HW$Y0">
@@ -1654,7 +1694,7 @@
                                           <ref role="3cqZAo" node="60B$8332SL7" resolve="it" />
                                         </node>
                                         <node concept="2qgKlT" id="60B$8332SL6" role="2OqNvi">
-                                          <ref role="37wK5l" node="qgIopNa9Hb" resolve="getShortHelp" />
+                                          <ref role="37wK5l" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
                                         </node>
                                       </node>
                                     </node>
@@ -1708,7 +1748,7 @@
                                                 <ref role="3cqZAo" node="60B$8332SL7" resolve="it" />
                                               </node>
                                               <node concept="2qgKlT" id="60B$8335NCH" role="2OqNvi">
-                                                <ref role="37wK5l" node="64VftqEenfn" resolve="getShortDisplayString" />
+                                                <ref role="37wK5l" to="fq2o:64VftqEenfn" resolve="getShortDisplayString" />
                                               </node>
                                             </node>
                                             <node concept="Xl_RD" id="64VftqEzdqs" role="HW$Y0" />
@@ -2148,11 +2188,11 @@
                     <node concept="3cpWsn" id="60B$833jyKx" role="3cpWs9">
                       <property role="TrG5h" value="chp" />
                       <node concept="3THzug" id="60B$833jyKs" role="1tU5fm">
-                        <ref role="3qa414" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                        <ref role="3qa414" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
                       </node>
                       <node concept="10QFUN" id="60B$833jzyf" role="33vP2m">
                         <node concept="3THzug" id="60B$833jzyg" role="10QFUM">
-                          <ref role="3qa414" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                          <ref role="3qa414" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
                         </node>
                         <node concept="10QFUN" id="1oFmEVzcYXC" role="10QFUP">
                           <node concept="3THzug" id="1oFmEVzcZ_o" role="10QFUM" />
@@ -2181,7 +2221,7 @@
                           <ref role="3cqZAo" node="60B$833jyKx" resolve="chp" />
                         </node>
                         <node concept="2qgKlT" id="60B$833kgkN" role="2OqNvi">
-                          <ref role="37wK5l" node="64VftqEen2L" resolve="getHelpPage" />
+                          <ref role="37wK5l" to="fq2o:64VftqEen2L" resolve="getHelpPage" />
                         </node>
                       </node>
                     </node>
@@ -2196,7 +2236,7 @@
                             <ref role="3cqZAo" node="60B$833jyKx" resolve="chp" />
                           </node>
                           <node concept="2qgKlT" id="1fzYukMhSeI" role="2OqNvi">
-                            <ref role="37wK5l" node="qgIopNa9Hb" resolve="getShortHelp" />
+                            <ref role="37wK5l" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
                           </node>
                         </node>
                         <node concept="3cpWs3" id="1fzYukMhSeJ" role="3uHU7B">
@@ -2207,7 +2247,7 @@
                                   <ref role="3cqZAo" node="60B$833jyKx" resolve="chp" />
                                 </node>
                                 <node concept="2qgKlT" id="25MaZwhh22l" role="2OqNvi">
-                                  <ref role="37wK5l" node="5YxQmqOFZEf" resolve="getDisplayString" />
+                                  <ref role="37wK5l" to="fq2o:5YxQmqOFZEf" resolve="getDisplayString" />
                                 </node>
                               </node>
                               <node concept="Xl_RD" id="1fzYukMhSeP" role="3uHU7w">
@@ -2219,7 +2259,7 @@
                                 <ref role="3cqZAo" node="60B$833jyKx" resolve="chp" />
                               </node>
                               <node concept="2qgKlT" id="1fzYukMhSeS" role="2OqNvi">
-                                <ref role="37wK5l" node="64VftqEenf4" resolve="getKind" />
+                                <ref role="37wK5l" to="fq2o:64VftqEenf4" resolve="getKind" />
                               </node>
                             </node>
                           </node>
@@ -2307,7 +2347,7 @@
               <node concept="2qgKlT" id="73yVtVlYNf4" role="2OqNvi">
                 <ref role="37wK5l" to="tpcn:73yVtVlWOga" resolve="isSubconceptOf" />
                 <node concept="3B5_sB" id="1oFmEVzcNlb" role="37wK5m">
-                  <ref role="3B5MYn" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                  <ref role="3B5MYn" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
                 </node>
               </node>
             </node>
@@ -2333,7 +2373,7 @@
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getShortelp" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" node="qgIopNa9Hb" resolve="getShortHelp" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
       <node concept="3Tm1VV" id="qgIopNcHD9" role="1B3o_S" />
       <node concept="3clFbS" id="qgIopNcHDc" role="3clF47">
         <node concept="3clFbF" id="DySRn8Xstx" role="3cqZAp">
@@ -2347,7 +2387,7 @@
     <node concept="13i0hz" id="6eQQAdlIRom" role="13h7CS">
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getHelpPage" />
-      <ref role="13i0hy" node="64VftqEen2L" resolve="getHelpPage" />
+      <ref role="13i0hy" to="fq2o:64VftqEen2L" resolve="getHelpPage" />
       <node concept="3clFbS" id="6eQQAdlIRop" role="3clF47">
         <node concept="3cpWs6" id="6eQQAdlISsq" role="3cqZAp">
           <node concept="Xl_RD" id="6eQQAdlISsy" role="3cqZAk">
@@ -2359,218 +2399,391 @@
       <node concept="3Tm1VV" id="6eQQAdlIRZN" role="1B3o_S" />
     </node>
   </node>
-  <node concept="13h7C7" id="qgIopNa9H8">
-    <property role="3GE5qa" value="help" />
-    <ref role="13h7C2" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
-    <node concept="13i0hz" id="qgIopNa9Hb" role="13h7CS">
+  <node concept="13h7C7" id="3ob4OZ0k7Ze">
+    <property role="3GE5qa" value="response.interactive" />
+    <ref role="13h7C2" to="eynw:XHjpmeKJb6" resolve="NodeWithClosure" />
+    <node concept="13i0hz" id="3ob4OZ0k829" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="getShortHelp" />
-      <property role="2Ki8OM" value="true" />
-      <node concept="3Tm1VV" id="qgIopNa9Hc" role="1B3o_S" />
-      <node concept="17QB3L" id="qgIopNa9Hj" role="3clF45" />
-      <node concept="3clFbS" id="qgIopNa9He" role="3clF47">
-        <node concept="3cpWs6" id="1fzYukMge_6" role="3cqZAp">
-          <node concept="2OqwBi" id="1fzYukMgf0t" role="3cqZAk">
-            <node concept="2OqwBi" id="1fzYukMgeD5" role="2Oq$k0">
-              <node concept="13iPFW" id="1fzYukMge_s" role="2Oq$k0" />
-              <node concept="FGMqu" id="1fzYukMgePn" role="2OqNvi" />
-            </node>
-            <node concept="3TrcHB" id="1fzYukMgfvf" role="2OqNvi">
-              <ref role="3TsBF5" to="tpce:40UcGlRaVSw" resolve="conceptShortDescription" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="execute" />
+      <ref role="13i0hy" node="7oNS25df64x" resolve="execute" />
+      <node concept="3Tm1VV" id="3ob4OZ0k82a" role="1B3o_S" />
+      <node concept="3clFbS" id="3ob4OZ0k82b" role="3clF47">
+        <node concept="3clFbF" id="3ob4OZ0k82c" role="3cqZAp">
+          <node concept="2OqwBi" id="3ob4OZ0k82d" role="3clFbG">
+            <node concept="2YIFZM" id="3ob4OZ0k82e" role="2Oq$k0">
+              <ref role="37wK5l" to="oh9p:2ONldth5FtA" resolve="getInstance" />
+              <ref role="1Pybhc" to="oh9p:2ONldth5Ft3" resolve="ClosureHoldingNodeUtil" />
+            </node>
+            <node concept="liA8E" id="3ob4OZ0k82f" role="2OqNvi">
+              <ref role="37wK5l" to="oh9p:2ONldth5Fu$" resolve="executeClosure" />
+              <node concept="13iPFW" id="3ob4OZ0k82g" role="37wK5m" />
             </node>
           </node>
         </node>
       </node>
+      <node concept="3cqZAl" id="3ob4OZ0k82h" role="3clF45" />
+      <node concept="37vLTG" id="3ob4OZ0k82i" role="3clF46">
+        <property role="TrG5h" value="project" />
+        <node concept="3uibUv" id="3ob4OZ0k82j" role="1tU5fm">
+          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+        </node>
+      </node>
     </node>
-    <node concept="13i0hz" id="64VftqEen2L" role="13h7CS">
+    <node concept="13i0hz" id="r_OzKrcvMY" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <property role="13i0it" value="true" />
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getHelpPage" />
-      <node concept="3Tm1VV" id="64VftqEen5c" role="1B3o_S" />
-      <node concept="17QB3L" id="64VftqEenf1" role="3clF45" />
-      <node concept="3clFbS" id="64VftqEen5e" role="3clF47">
-        <node concept="3clFbF" id="64VftqEenMI" role="3cqZAp">
-          <node concept="10Nm6u" id="64VftqEenMH" role="3clFbG" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="canExecute" />
+      <ref role="13i0hy" node="2QdC0h7dh1h" resolve="canExecute" />
+      <node concept="3Tm1VV" id="r_OzKrcvMZ" role="1B3o_S" />
+      <node concept="3clFbS" id="r_OzKrcvN0" role="3clF47">
+        <node concept="3cpWs6" id="r_OzKrcvMR" role="3cqZAp">
+          <node concept="3y3z36" id="r_OzKrcvMS" role="3cqZAk">
+            <node concept="2OqwBi" id="r_OzKrcvMT" role="3uHU7B">
+              <node concept="2YIFZM" id="r_OzKrcvMU" role="2Oq$k0">
+                <ref role="1Pybhc" to="oh9p:2ONldth5Ft3" resolve="ClosureHoldingNodeUtil" />
+                <ref role="37wK5l" to="oh9p:2ONldth5FtA" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="r_OzKrcvMV" role="2OqNvi">
+                <ref role="37wK5l" to="oh9p:2ONldth5Fum" resolve="getClosure" />
+                <node concept="13iPFW" id="r_OzKrcvMW" role="37wK5m" />
+              </node>
+            </node>
+            <node concept="10Nm6u" id="r_OzKrcvMX" role="3uHU7w" />
+          </node>
         </node>
       </node>
+      <node concept="10P_77" id="r_OzKrcvN3" role="3clF45" />
     </node>
-    <node concept="13i0hz" id="64VftqEenf4" role="13h7CS">
-      <property role="13i0iv" value="true" />
-      <property role="13i0it" value="true" />
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getKind" />
-      <node concept="3Tm1VV" id="64VftqEenf5" role="1B3o_S" />
-      <node concept="17QB3L" id="64VftqEenfk" role="3clF45" />
-      <node concept="3clFbS" id="64VftqEenf7" role="3clF47" />
+    <node concept="13hLZK" id="3ob4OZ0k81A" role="13h7CW">
+      <node concept="3clFbS" id="3ob4OZ0k81B" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="60B$833p9Uj" role="13h7CS">
+  </node>
+  <node concept="13h7C7" id="5G2W3aWAPT8">
+    <property role="3GE5qa" value="response" />
+    <ref role="13h7C2" to="eynw:5G2W3aW$Vsk" resolve="ExceptionHolder" />
+    <node concept="13hLZK" id="5G2W3aWAPVw" role="13h7CW">
+      <node concept="3clFbS" id="5G2W3aWAPVx" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="5G2W3aWAQ0q" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <property role="13i0it" value="true" />
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getGroup" />
-      <node concept="3Tm1VV" id="60B$833p9Uk" role="1B3o_S" />
-      <node concept="17QB3L" id="60B$833pa0v" role="3clF45" />
-      <node concept="3clFbS" id="60B$833p9Um" role="3clF47">
-        <node concept="3cpWs6" id="60B$833paGI" role="3cqZAp">
-          <node concept="2OqwBi" id="60B$833ppp_" role="3cqZAk">
-            <node concept="2OqwBi" id="60B$833po1N" role="2Oq$k0">
-              <node concept="2JrnkZ" id="60B$833pnWY" role="2Oq$k0">
-                <node concept="2OqwBi" id="60B$833pjEc" role="2JrQYb">
-                  <node concept="2OqwBi" id="60B$833ph6$" role="2Oq$k0">
-                    <node concept="13iPFW" id="60B$833ph1c" role="2Oq$k0" />
-                    <node concept="FGMqu" id="60B$833pjl2" role="2OqNvi" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="execute" />
+      <ref role="13i0hy" node="7oNS25df64x" resolve="execute" />
+      <node concept="3Tm1VV" id="5G2W3aWAQ0t" role="1B3o_S" />
+      <node concept="3clFbS" id="5G2W3aWAQ0w" role="3clF47">
+        <node concept="3cpWs8" id="3EnpNH2zGjd" role="3cqZAp">
+          <node concept="3cpWsn" id="3EnpNH2zGje" role="3cpWs9">
+            <property role="TrG5h" value="contents" />
+            <property role="3TUv4t" value="false" />
+            <node concept="3uibUv" id="2lR2lzqyOOa" role="1tU5fm">
+              <ref role="3uigEE" to="kt01:~StringSelection" resolve="StringSelection" />
+            </node>
+            <node concept="2ShNRf" id="3EnpNH2zGjg" role="33vP2m">
+              <node concept="1pGfFk" id="3EnpNH2zGjh" role="2ShVmc">
+                <ref role="37wK5l" to="kt01:~StringSelection.&lt;init&gt;(java.lang.String)" resolve="StringSelection" />
+                <node concept="2OqwBi" id="5G2W3aWBmRR" role="37wK5m">
+                  <node concept="13iPFW" id="5G2W3aWBmHn" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="5G2W3aWBpek" role="2OqNvi">
+                    <ref role="3TsBF5" to="eynw:5G2W3aWBbyD" resolve="stackTrace" />
                   </node>
-                  <node concept="I4A8Y" id="60B$833pkue" role="2OqNvi" />
                 </node>
               </node>
-              <node concept="liA8E" id="60B$833pozH" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getModule():org.jetbrains.mps.openapi.module.SModule" resolve="getModule" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3EnpNH2zGjl" role="3cqZAp">
+          <node concept="2OqwBi" id="2lR2lzqySdw" role="3clFbG">
+            <node concept="2YIFZM" id="2lR2lzqyRFR" role="2Oq$k0">
+              <ref role="37wK5l" to="ddhc:~CopyPasteManagerEx.getInstanceEx():com.intellij.ide.CopyPasteManagerEx" resolve="getInstanceEx" />
+              <ref role="1Pybhc" to="ddhc:~CopyPasteManagerEx" resolve="CopyPasteManagerEx" />
+            </node>
+            <node concept="liA8E" id="2lR2lzqyTqf" role="2OqNvi">
+              <ref role="37wK5l" to="ddhc:~CopyPasteManagerEx.setContents(java.awt.datatransfer.Transferable):void" resolve="setContents" />
+              <node concept="37vLTw" id="2lR2lzqyTIS" role="37wK5m">
+                <ref role="3cqZAo" node="3EnpNH2zGje" resolve="contents" />
               </node>
             </node>
-            <node concept="liA8E" id="60B$833ppXQ" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SModule.getModuleName():java.lang.String" resolve="getModuleName" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3EnpNH2zGjt" role="3cqZAp">
+          <node concept="3cpWsn" id="3EnpNH2zGju" role="3cpWs9">
+            <property role="TrG5h" value="dialog" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="7sYmXdMFtQV" role="1tU5fm">
+              <ref role="3uigEE" to="tprs:3EnpNH2zGjG" resolve="AnalyzeStacktraceDialog" />
+            </node>
+            <node concept="2ShNRf" id="3EnpNH2zGjw" role="33vP2m">
+              <node concept="1pGfFk" id="3EnpNH2zGjx" role="2ShVmc">
+                <ref role="37wK5l" to="tprs:3EnpNH2zGjR" resolve="AnalyzeStacktraceDialog" />
+                <node concept="37vLTw" id="5G2W3aWBqvO" role="37wK5m">
+                  <ref role="3cqZAo" node="5G2W3aWAQ0x" resolve="project" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="3EnpNH2zGjC" role="3cqZAp">
+          <node concept="2OqwBi" id="3EnpNH2zGjD" role="3clFbG">
+            <node concept="37vLTw" id="3GM_nagTsDu" role="2Oq$k0">
+              <ref role="3cqZAo" node="3EnpNH2zGju" resolve="dialog" />
+            </node>
+            <node concept="liA8E" id="3EnpNH2zGjF" role="2OqNvi">
+              <ref role="37wK5l" to="jkm4:~DialogWrapper.show():void" resolve="show" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="5G2W3aWAQ0x" role="3clF46">
+        <property role="TrG5h" value="project" />
+        <node concept="3uibUv" id="5G2W3aWBbyv" role="1tU5fm">
+          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+        </node>
       </node>
+      <node concept="3cqZAl" id="5G2W3aWAQ0z" role="3clF45" />
     </node>
-    <node concept="13i0hz" id="64VftqEenfn" role="13h7CS">
+    <node concept="13i0hz" id="5G2W3aWAQ0$" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <property role="13i0it" value="true" />
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getShortDisplayString" />
-      <node concept="3Tm1VV" id="64VftqEenfo" role="1B3o_S" />
-      <node concept="17QB3L" id="64VftqEenfF" role="3clF45" />
-      <node concept="3clFbS" id="64VftqEenfq" role="3clF47">
-        <node concept="3cpWs8" id="60B$833bre_" role="3cqZAp">
-          <node concept="3cpWsn" id="60B$833breC" role="3cpWs9">
-            <property role="TrG5h" value="alias" />
-            <node concept="17QB3L" id="60B$833brez" role="1tU5fm" />
-            <node concept="2OqwBi" id="64VftqE$Cmc" role="33vP2m">
-              <node concept="2OqwBi" id="60B$833pf1e" role="2Oq$k0">
-                <node concept="13iPFW" id="60B$833peTq" role="2Oq$k0" />
-                <node concept="FGMqu" id="60B$833pfiy" role="2OqNvi" />
-              </node>
-              <node concept="3TrcHB" id="64VftqE$Efu" role="2OqNvi">
-                <ref role="3TsBF5" to="tpce:4qF2Hm2r7ja" resolve="conceptAlias" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="canExecute" />
+      <ref role="13i0hy" node="2QdC0h7dh1h" resolve="canExecute" />
+      <node concept="3Tm1VV" id="5G2W3aWAQ0_" role="1B3o_S" />
+      <node concept="3clFbS" id="5G2W3aWAQ0C" role="3clF47">
+        <node concept="3clFbF" id="5G2W3aWBbyL" role="3cqZAp">
+          <node concept="3y3z36" id="5G2W3aWBfIR" role="3clFbG">
+            <node concept="10Nm6u" id="5G2W3aWBfLw" role="3uHU7w" />
+            <node concept="2OqwBi" id="5G2W3aWBbIF" role="3uHU7B">
+              <node concept="13iPFW" id="5G2W3aWBbyI" role="2Oq$k0" />
+              <node concept="3TrcHB" id="5G2W3aWBe3o" role="2OqNvi">
+                <ref role="3TsBF5" to="eynw:5G2W3aWBbyD" resolve="stackTrace" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="60B$833brus" role="3cqZAp">
-          <node concept="3clFbS" id="60B$833bruv" role="3clFbx">
-            <node concept="3cpWs6" id="60B$833bum9" role="3cqZAp">
-              <node concept="37vLTw" id="60B$833buoy" role="3cqZAk">
-                <ref role="3cqZAo" node="60B$833breC" resolve="alias" />
-              </node>
+      </node>
+      <node concept="10P_77" id="5G2W3aWAQ0D" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="2lR2lzqth1R">
+    <ref role="13h7C2" to="eynw:4Jke6BA4ffD" resolve="BLCommand" />
+    <node concept="13hLZK" id="2lR2lzqth4f" role="13h7CW">
+      <node concept="3clFbS" id="2lR2lzqth4g" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="2lR2lzqthc1" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="TrG5h" value="getExpectedRetType" />
+      <property role="13i0it" value="false" />
+      <ref role="13i0hy" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
+      <node concept="3Tm1VV" id="2lR2lzqthc2" role="1B3o_S" />
+      <node concept="3clFbS" id="2lR2lzqthc5" role="3clF47">
+        <node concept="3cpWs6" id="2lR2lzqtjT2" role="3cqZAp">
+          <node concept="2c44tf" id="2lR2lzqtjTs" role="3cqZAk">
+            <node concept="3cqZAl" id="2lR2lzqtjU6" role="2c44tc" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2lR2lzqthc6" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="2lR2lzqthc7" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="TrG5h" value="getBody" />
+      <property role="13i0it" value="false" />
+      <ref role="13i0hy" to="tpek:i2fhZ_m" resolve="getBody" />
+      <node concept="3Tm1VV" id="2lR2lzqthc8" role="1B3o_S" />
+      <node concept="3clFbS" id="2lR2lzqthcb" role="3clF47">
+        <node concept="3cpWs6" id="2lR2lzqtjXu" role="3cqZAp">
+          <node concept="2OqwBi" id="2lR2lzqtk84" role="3cqZAk">
+            <node concept="13iPFW" id="2lR2lzqtjYi" role="2Oq$k0" />
+            <node concept="3TrEf2" id="2lR2lzqtmtj" role="2OqNvi">
+              <ref role="3Tt5mk" to="eynw:1yfzJNJreD_" />
             </node>
           </node>
-          <node concept="2OqwBi" id="60B$833brO1" role="3clFbw">
-            <node concept="37vLTw" id="60B$833brwr" role="2Oq$k0">
-              <ref role="3cqZAo" node="60B$833breC" resolve="alias" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2lR2lzqthcc" role="3clF45">
+        <ref role="ehGHo" to="tpee:fzclF80" resolve="StatementList" />
+      </node>
+    </node>
+    <node concept="13i0hz" id="2lR2lzqthcd" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="TrG5h" value="getThrowableTypes" />
+      <property role="13i0it" value="false" />
+      <ref role="13i0hy" to="tpek:5op8ooRkkc7" resolve="getThrowableTypes" />
+      <node concept="3Tm1VV" id="2lR2lzqthce" role="1B3o_S" />
+      <node concept="3clFbS" id="2lR2lzqthch" role="3clF47">
+        <node concept="3cpWs8" id="2lR2lzqtCR9" role="3cqZAp">
+          <node concept="3cpWsn" id="2lR2lzqtCRc" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="2I9FWS" id="2lR2lzqtCR7" role="1tU5fm">
+              <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+            </node>
+            <node concept="2ShNRf" id="2lR2lzqtCSF" role="33vP2m">
+              <node concept="2T8Vx0" id="2lR2lzqtDsB" role="2ShVmc">
+                <node concept="2I9FWS" id="2lR2lzqtDsD" role="2T96Bj">
+                  <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+                </node>
+              </node>
             </node>
-            <node concept="17RvpY" id="60B$833bulK" role="2OqNvi" />
           </node>
-          <node concept="9aQIb" id="60B$833buqS" role="9aQIa">
-            <node concept="3clFbS" id="60B$833buqT" role="9aQI4">
-              <node concept="3cpWs6" id="60B$833butg" role="3cqZAp">
-                <node concept="2OqwBi" id="60B$833bwqJ" role="3cqZAk">
-                  <node concept="2OqwBi" id="60B$833bvOA" role="2Oq$k0">
-                    <node concept="13iPFW" id="60B$833bvGY" role="2Oq$k0" />
-                    <node concept="FGMqu" id="60B$833bw48" role="2OqNvi" />
-                  </node>
-                  <node concept="3TrcHB" id="60B$833by7R" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
+        </node>
+        <node concept="3clFbF" id="2lR2lzqtDt_" role="3cqZAp">
+          <node concept="2OqwBi" id="2lR2lzqtEgc" role="3clFbG">
+            <node concept="37vLTw" id="2lR2lzqtDt$" role="2Oq$k0">
+              <ref role="3cqZAo" node="2lR2lzqtCRc" resolve="result" />
+            </node>
+            <node concept="TSZUe" id="2lR2lzqtLzD" role="2OqNvi">
+              <node concept="2c44tf" id="2lR2lzqtLB5" role="25WWJ7">
+                <node concept="3uibUv" id="2lR2lzqtLHg" role="2c44tc">
+                  <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3cpWs6" id="2lR2lzqtmw1" role="3cqZAp">
+          <node concept="37vLTw" id="2lR2lzqtLN_" role="3cqZAk">
+            <ref role="3cqZAo" node="2lR2lzqtCRc" resolve="result" />
+          </node>
+        </node>
+      </node>
+      <node concept="2I9FWS" id="2lR2lzqthci" role="3clF45">
+        <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
       </node>
     </node>
-    <node concept="13i0hz" id="5YxQmqOFZEf" role="13h7CS">
+    <node concept="13i0hz" id="64VftqEeonj" role="13h7CS">
       <property role="13i0iv" value="false" />
-      <property role="13i0it" value="true" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getShortHelp" />
       <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="getDisplayString" />
-      <node concept="3Tm1VV" id="5YxQmqOFZEg" role="1B3o_S" />
-      <node concept="17QB3L" id="5YxQmqOFZEh" role="3clF45" />
-      <node concept="3clFbS" id="5YxQmqOFZEi" role="3clF47">
-        <node concept="3cpWs6" id="5YxQmqOG04_" role="3cqZAp">
-          <node concept="2OqwBi" id="2U2$P9VS2Kf" role="3cqZAk">
-            <node concept="13iPFW" id="2U2$P9VS2G4" role="2Oq$k0" />
-            <node concept="2qgKlT" id="2U2$P9VS2WO" role="2OqNvi">
-              <ref role="37wK5l" node="64VftqEenfn" resolve="getShortDisplayString" />
-            </node>
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
+      <node concept="3Tm1VV" id="64VftqEeonk" role="1B3o_S" />
+      <node concept="3clFbS" id="64VftqEeonn" role="3clF47">
+        <node concept="3clFbF" id="64VftqEeopH" role="3cqZAp">
+          <node concept="Xl_RD" id="64VftqEeopG" role="3clFbG">
+            <property role="Xl_RC" value="execute a statement list" />
           </node>
         </node>
       </node>
+      <node concept="17QB3L" id="64VftqEeono" role="3clF45" />
     </node>
-    <node concept="13hLZK" id="qgIopNa9H9" role="13h7CW">
-      <node concept="3clFbS" id="qgIopNa9Ha" role="2VODD2" />
+    <node concept="13i0hz" id="64VftqEeosT" role="13h7CS">
+      <property role="2Ki8OM" value="true" />
+      <property role="TrG5h" value="getDisplayString" />
+      <ref role="13i0hy" to="fq2o:64VftqEenfn" resolve="getShortDisplayString" />
+      <node concept="3clFbS" id="64VftqEeosW" role="3clF47">
+        <node concept="3clFbF" id="64VftqEeoCg" role="3cqZAp">
+          <node concept="Xl_RD" id="64VftqEeoCf" role="3clFbG">
+            <property role="Xl_RC" value="{ &lt;statements&gt; }" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="64VftqEeovs" role="3clF45" />
+      <node concept="3Tm1VV" id="64VftqEeovt" role="1B3o_S" />
     </node>
   </node>
-  <node concept="13h7C7" id="3ob4OZ0k7Ze">
-    <property role="3GE5qa" value="response.interactive" />
-    <ref role="13h7C2" to="eynw:XHjpmeKJb6" resolve="NodeWithClosure" />
-    <node concept="13i0hz" id="3ob4OZ0k829" role="13h7CS">
+  <node concept="13h7C7" id="64VftqEeoGE">
+    <ref role="13h7C2" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
+    <node concept="13hLZK" id="64VftqEeoGF" role="13h7CW">
+      <node concept="3clFbS" id="64VftqEeoGG" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="64VftqEeoGH" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
-      <property role="TrG5h" value="execute" />
-      <ref role="13i0hy" node="7oNS25df64x" resolve="execute" />
-      <node concept="3Tm1VV" id="3ob4OZ0k82a" role="1B3o_S" />
-      <node concept="3clFbS" id="3ob4OZ0k82b" role="3clF47">
-        <node concept="3clFbF" id="3ob4OZ0k82c" role="3cqZAp">
-          <node concept="2OqwBi" id="3ob4OZ0k82d" role="3clFbG">
-            <node concept="2YIFZM" id="3ob4OZ0k82e" role="2Oq$k0">
-              <ref role="37wK5l" to="oh9p:2ONldth5FtA" resolve="getInstance" />
-              <ref role="1Pybhc" to="oh9p:2ONldth5Ft3" resolve="ClosureHoldingNodeUtil" />
-            </node>
-            <node concept="liA8E" id="3ob4OZ0k82f" role="2OqNvi">
-              <ref role="37wK5l" to="oh9p:2ONldth5Fu$" resolve="executeClosure" />
-              <node concept="13iPFW" id="3ob4OZ0k82g" role="37wK5m" />
-            </node>
+      <property role="TrG5h" value="getShortHelp" />
+      <property role="2Ki8OM" value="true" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
+      <node concept="3Tm1VV" id="64VftqEeoGI" role="1B3o_S" />
+      <node concept="3clFbS" id="64VftqEeoGL" role="3clF47">
+        <node concept="3clFbF" id="64VftqEeoGS" role="3cqZAp">
+          <node concept="Xl_RD" id="64VftqEeoGR" role="3clFbG">
+            <property role="Xl_RC" value="evaluate an expression and print its result" />
           </node>
         </node>
       </node>
-      <node concept="3cqZAl" id="3ob4OZ0k82h" role="3clF45" />
-      <node concept="37vLTG" id="3ob4OZ0k82i" role="3clF46">
-        <property role="TrG5h" value="project" />
-        <node concept="3uibUv" id="3ob4OZ0k82j" role="1tU5fm">
-          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+      <node concept="17QB3L" id="64VftqEeoGM" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="64VftqEepAv" role="13h7CS">
+      <property role="2Ki8OM" value="true" />
+      <property role="TrG5h" value="getDisplayString" />
+      <ref role="13i0hy" to="fq2o:64VftqEenfn" resolve="getShortDisplayString" />
+      <node concept="3clFbS" id="64VftqEepAy" role="3clF47">
+        <node concept="3clFbF" id="64VftqEepAM" role="3cqZAp">
+          <node concept="Xl_RD" id="64VftqEepAL" role="3clFbG">
+            <property role="Xl_RC" value="&lt;expression&gt;" />
+          </node>
         </node>
       </node>
+      <node concept="17QB3L" id="64VftqEepAH" role="3clF45" />
+      <node concept="3Tm1VV" id="64VftqEepAI" role="1B3o_S" />
     </node>
-    <node concept="13i0hz" id="r_OzKrcvMY" role="13h7CS">
+  </node>
+  <node concept="13h7C7" id="3E_u19H2SYz">
+    <property role="3GE5qa" value="expression.print" />
+    <ref role="13h7C2" to="eynw:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+    <node concept="13i0hz" id="3E_u19H2SYA" role="13h7CS">
+      <property role="2Ki8OM" value="true" />
+      <property role="TrG5h" value="legalAsStatement" />
+      <ref role="13i0hy" to="tpek:1653mnvAgqK" resolve="legalAsStatement" />
+      <node concept="3clFbS" id="3E_u19H2SYD" role="3clF47">
+        <node concept="3clFbF" id="3E_u19H2SYN" role="3cqZAp">
+          <node concept="3clFbT" id="3E_u19H2SYM" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="3E_u19H2SYI" role="3clF45" />
+      <node concept="3Tm1VV" id="3E_u19H2SYJ" role="1B3o_S" />
+    </node>
+    <node concept="13hLZK" id="3E_u19H2SY$" role="13h7CW">
+      <node concept="3clFbS" id="3E_u19H2SY_" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="64VftqEr$5E">
+    <property role="3GE5qa" value="expression.print" />
+    <ref role="13h7C2" to="eynw:6_TW7xVaDdR" resolve="PrintExpression" />
+    <node concept="13hLZK" id="64VftqEr$5F" role="13h7CW">
+      <node concept="3clFbS" id="64VftqEr$5G" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="64VftqEr$5H" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
-      <property role="TrG5h" value="canExecute" />
-      <ref role="13i0hy" node="2QdC0h7dh1h" resolve="canExecute" />
-      <node concept="3Tm1VV" id="r_OzKrcvMZ" role="1B3o_S" />
-      <node concept="3clFbS" id="r_OzKrcvN0" role="3clF47">
-        <node concept="3cpWs6" id="r_OzKrcvMR" role="3cqZAp">
-          <node concept="3y3z36" id="r_OzKrcvMS" role="3cqZAk">
-            <node concept="2OqwBi" id="r_OzKrcvMT" role="3uHU7B">
-              <node concept="2YIFZM" id="r_OzKrcvMU" role="2Oq$k0">
-                <ref role="1Pybhc" to="oh9p:2ONldth5Ft3" resolve="ClosureHoldingNodeUtil" />
-                <ref role="37wK5l" to="oh9p:2ONldth5FtA" resolve="getInstance" />
-              </node>
-              <node concept="liA8E" id="r_OzKrcvMV" role="2OqNvi">
-                <ref role="37wK5l" to="oh9p:2ONldth5Fum" resolve="getClosure" />
-                <node concept="13iPFW" id="r_OzKrcvMW" role="37wK5m" />
-              </node>
-            </node>
-            <node concept="10Nm6u" id="r_OzKrcvMX" role="3uHU7w" />
+      <property role="TrG5h" value="getShortHelp" />
+      <property role="2Ki8OM" value="true" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
+      <node concept="3Tm1VV" id="64VftqEr$5I" role="1B3o_S" />
+      <node concept="3clFbS" id="64VftqEr$5L" role="3clF47">
+        <node concept="3clFbF" id="64VftqErBiU" role="3cqZAp">
+          <node concept="Xl_RD" id="64VftqErBiT" role="3clFbG">
+            <property role="Xl_RC" value="print into the console window" />
           </node>
         </node>
       </node>
-      <node concept="10P_77" id="r_OzKrcvN3" role="3clF45" />
+      <node concept="17QB3L" id="64VftqEr$5M" role="3clF45" />
     </node>
-    <node concept="13hLZK" id="3ob4OZ0k81A" role="13h7CW">
-      <node concept="3clFbS" id="3ob4OZ0k81B" role="2VODD2" />
+  </node>
+  <node concept="13h7C7" id="6kp4dbAb8Gj">
+    <property role="3GE5qa" value="query" />
+    <ref role="13h7C2" to="eynw:DM6_$iqV$8" resolve="ProjectExpression" />
+    <node concept="13hLZK" id="6kp4dbAb8Gk" role="13h7CW">
+      <node concept="3clFbS" id="6kp4dbAb8Gl" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="6kp4dbAb8H4" role="13h7CS">
+      <property role="2Ki8OM" value="true" />
+      <property role="TrG5h" value="getSupportedParameters" />
+      <property role="13i0it" value="false" />
+      <property role="13i0iv" value="false" />
+      <ref role="13i0hy" to="fq2o:3J6h25QXCDW" resolve="getSupportedParameters" />
+      <node concept="3Tm1VV" id="6kp4dbAb8H5" role="1B3o_S" />
+      <node concept="3clFbS" id="6kp4dbAb8H9" role="3clF47">
+        <node concept="3clFbF" id="3E_u19H2d$m" role="3cqZAp">
+          <node concept="10Nm6u" id="3E_u19H2d$l" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="A3Dl8" id="6kp4dbAb8Ha" role="3clF45">
+        <node concept="3THzug" id="6kp4dbAb8Hb" role="A3Ik2">
+          <ref role="3qa414" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/plugins/console/lang/base/languageModels/constraints.mps b/plugins/console/lang/base/languageModels/constraints.mps
index 2ff28a831637..6e27ca4da8b9 100644
--- a/plugins/console/lang/base/languageModels/constraints.mps
+++ b/plugins/console/lang/base/languageModels/constraints.mps
@@ -13,10 +13,12 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="t8pl" ref="r:7c6b6a5a-7faa-4582-9cf9-57f779b50a76(jetbrains.mps.console.base.util)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
-    <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
     <import index="zyb2" ref="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)" implicit="true" />
+    <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" implicit="true" />
+    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -142,7 +144,7 @@
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
-      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3THzug">
+      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug">
         <reference id="1180481110358" name="conceptDeclaraton" index="3qa414" />
       </concept>
       <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
@@ -251,16 +253,16 @@
         <node concept="3clFbS" id="60B$832XHYk" role="2VODD2">
           <node concept="3clFbF" id="60B$832XI9s" role="3cqZAp">
             <node concept="2OqwBi" id="60B$832WVc7" role="3clFbG">
-              <node concept="1eOMI4" id="60B$832WVc8" role="2Oq$k0">
-                <node concept="10QFUN" id="60B$832WVc9" role="1eOMHV">
-                  <node concept="3THzug" id="60B$832WVca" role="10QFUM">
-                    <ref role="3qa414" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+              <node concept="1eOMI4" id="3ZgZ1njP4Ed" role="2Oq$k0">
+                <node concept="10QFUN" id="3ZgZ1njP4Ee" role="1eOMHV">
+                  <node concept="Bn53e" id="3ZgZ1njP4Ec" role="10QFUP" />
+                  <node concept="3THzug" id="3ZgZ1njP4M5" role="10QFUM">
+                    <ref role="3qa414" to="3xdn:qgIopN3HO7" resolve="ConsoleHelpProvider" />
                   </node>
-                  <node concept="Bn53e" id="60B$832XJbt" role="10QFUP" />
                 </node>
               </node>
               <node concept="2qgKlT" id="60B$832WVcc" role="2OqNvi">
-                <ref role="37wK5l" to="zyb2:64VftqEenfn" resolve="getShortDisplayString" />
+                <ref role="37wK5l" to="fq2o:64VftqEenfn" resolve="getShortDisplayString" />
               </node>
             </node>
           </node>
@@ -298,7 +300,7 @@
                                 <node concept="1eOMI4" id="60B$8333R$Z" role="2Oq$k0">
                                   <node concept="10QFUN" id="60B$8333R_0" role="1eOMHV">
                                     <node concept="3THzug" id="60B$8333R_1" role="10QFUM">
-                                      <ref role="3qa414" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                                      <ref role="3qa414" to="3xdn:qgIopN3HO7" resolve="ConsoleHelpProvider" />
                                     </node>
                                     <node concept="37vLTw" id="60B$8333RF$" role="10QFUP">
                                       <ref role="3cqZAo" node="60B$8333Rq9" resolve="child" />
@@ -306,14 +308,14 @@
                                   </node>
                                 </node>
                                 <node concept="2qgKlT" id="60B$8333R_3" role="2OqNvi">
-                                  <ref role="37wK5l" to="zyb2:64VftqEenfn" resolve="getShortDisplayString" />
+                                  <ref role="37wK5l" to="fq2o:64VftqEenfn" resolve="getShortDisplayString" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                         <node concept="3TUQnm" id="60B$8334gyC" role="37wK5m">
-                          <ref role="3TV0OU" to="eynw:qgIopN3HO7" resolve="ConsoleHelpProvider" />
+                          <ref role="3TV0OU" to="3xdn:qgIopN3HO7" resolve="ConsoleHelpProvider" />
                         </node>
                         <node concept="1Q6Npb" id="60B$8334hD3" role="37wK5m" />
                       </node>
diff --git a/plugins/console/lang/base/languageModels/editor.mps b/plugins/console/lang/base/languageModels/editor.mps
index 03b41ded4db1..c96752bb6226 100644
--- a/plugins/console/lang/base/languageModels/editor.mps
+++ b/plugins/console/lang/base/languageModels/editor.mps
@@ -11,9 +11,12 @@
     <import index="zyb2" ref="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor()" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt()" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
       <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
@@ -23,6 +26,7 @@
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
       <concept id="2491174914159318432" name="jetbrains.mps.lang.editor.structure.DominatesRecord" flags="lg" index="2lhJJ2" />
+      <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
       <concept id="1237308012275" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineStyleClassItem" flags="ln" index="ljvvj" />
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
@@ -30,10 +34,16 @@
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
       <concept id="795210086017940429" name="jetbrains.mps.lang.editor.structure.ReadOnlyStyleClassItem" flags="lg" index="xShMh" />
+      <concept id="1164824717996" name="jetbrains.mps.lang.editor.structure.CellMenuDescriptor" flags="ng" index="OXEIz">
+        <child id="1164824815888" name="cellMenuPart" index="OY2wv" />
+      </concept>
       <concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
+      <concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
+        <reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
+      </concept>
       <concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
         <child id="1186402402630" name="styleClass" index="V601i" />
       </concept>
@@ -62,6 +72,15 @@
         <child id="3383245079137422296" name="dominates" index="14Sbyx" />
       </concept>
       <concept id="1221062700015" name="jetbrains.mps.lang.editor.structure.QueryFunction_Underlined" flags="in" index="1d0yFN" />
+      <concept id="1139535219966" name="jetbrains.mps.lang.editor.structure.CellActionMapDeclaration" flags="ig" index="1h_SRR">
+        <reference id="1139535219968" name="applicableConcept" index="1h_SK9" />
+        <child id="1139535219969" name="item" index="1h_SK8" />
+      </concept>
+      <concept id="1139535280617" name="jetbrains.mps.lang.editor.structure.CellActionMapItem" flags="lg" index="1hA7zw">
+        <property id="1139535298778" name="actionId" index="1hAc7j" />
+        <child id="1139535280620" name="executeFunction" index="1hA7z_" />
+      </concept>
+      <concept id="1139535439104" name="jetbrains.mps.lang.editor.structure.CellActionMap_ExecuteFunction" flags="in" index="1hAIg9" />
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
@@ -76,6 +95,10 @@
         <property id="1214560368769" name="emptyNoTargetText" index="39s7Ar" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
+      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
+        <reference id="1139959269582" name="actionMap" index="1ERwB7" />
+        <child id="1164826688380" name="menuDescriptor" index="P5bDN" />
+      </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -119,10 +142,17 @@
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
@@ -130,9 +160,17 @@
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -147,6 +185,10 @@
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -158,13 +200,43 @@
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <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="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="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
+        <reference id="1139877738879" name="concept" index="1A0vxQ" />
+      </concept>
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
+      <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
+        <child id="1180636770616" name="createdType" index="3zrR0E" />
+      </concept>
+      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
+        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
+      </concept>
+      <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <reference id="1140138128738" name="concept" index="1PxNhF" />
+        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </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">
@@ -174,6 +246,9 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+    </language>
   </registry>
   <node concept="24kQdi" id="3Rtzc5jtaZ5">
     <property role="3GE5qa" value="history" />
@@ -596,5 +671,245 @@
       <node concept="2lhJJ2" id="2airAaT5Mod" role="14Sbyx" />
     </node>
   </node>
+  <node concept="24kQdi" id="5G2W3aWCXqw">
+    <property role="3GE5qa" value="response" />
+    <ref role="1XX52x" to="eynw:5G2W3aW$Vsk" resolve="ExceptionHolder" />
+    <node concept="3EZMnI" id="5G2W3aWD0CO" role="2wV5jI">
+      <node concept="3F0ifn" id="5G2W3aWD0CV" role="3EZMnx">
+        <property role="3F0ifm" value="Exception:" />
+      </node>
+      <node concept="PMmxH" id="5G2W3aWD11C" role="3EZMnx">
+        <ref role="PMmxG" node="5G2W3aWCZ08" resolve="ClickableEditorComponent" />
+      </node>
+      <node concept="2iRfu4" id="5G2W3aWD0CR" role="2iSdaV" />
+      <node concept="Veino" id="5G2W3aWDrTB" role="3F10Kt">
+        <property role="Vb096" value="pink" />
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="4Jke6BA4gx1">
+    <ref role="1XX52x" to="eynw:4Jke6BA4ffD" resolve="BLCommand" />
+    <node concept="1QoScp" id="5RBjc7g8YOu" role="2wV5jI">
+      <property role="1QpmdY" value="true" />
+      <node concept="pkWqt" id="5RBjc7g8YOv" role="3e4ffs">
+        <node concept="3clFbS" id="5RBjc7g8YOw" role="2VODD2">
+          <node concept="3clFbF" id="5RBjc7g8Zf3" role="3cqZAp">
+            <node concept="3clFbC" id="5RBjc7g9p6A" role="3clFbG">
+              <node concept="2OqwBi" id="5RBjc7g9p6D" role="3uHU7B">
+                <node concept="pncrf" id="5RBjc7g9p6E" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5RBjc7g9p6F" role="2OqNvi">
+                  <node concept="1xMEDy" id="5RBjc7g9p6G" role="1xVPHs">
+                    <node concept="chp4Y" id="5RBjc7g9p6H" role="ri$Ld">
+                      <ref role="cht4Q" to="eynw:E3nMz1EwaY" resolve="History" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="10Nm6u" id="5RBjc7g9p6C" role="3uHU7w" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F1sOY" id="5RBjc7g8Z8u" role="1QoVPY">
+        <ref role="1NtTu8" to="eynw:1yfzJNJreD_" />
+      </node>
+      <node concept="3EZMnI" id="5RBjc7g8YNa" role="1QoS34">
+        <node concept="3F0ifn" id="5RBjc7g8YNl" role="3EZMnx">
+          <property role="3F0ifm" value="{" />
+          <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
+          <node concept="ljvvj" id="5RBjc7g8YNs" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F1sOY" id="5RBjc7g8YN$" role="3EZMnx">
+          <ref role="1NtTu8" to="eynw:1yfzJNJreD_" />
+          <node concept="lj46D" id="5RBjc7g8YNC" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="ljvvj" id="5RBjc7g8YOh" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F0ifn" id="5RBjc7g8YOa" role="3EZMnx">
+          <property role="3F0ifm" value="}" />
+          <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
+        </node>
+        <node concept="l2Vlx" id="5RBjc7g8YNd" role="2iSdaV" />
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="6D0CP__oERm">
+    <ref role="1XX52x" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
+    <node concept="3F1sOY" id="6_TW7xUYPpQ" role="2wV5jI">
+      <ref role="1ERwB7" node="PtBTHLWHzE" resolve="BLExpression_Actions" />
+      <ref role="1NtTu8" to="eynw:6D0CP__oaD2" />
+    </node>
+  </node>
+  <node concept="1h_SRR" id="PtBTHLWHzE">
+    <property role="TrG5h" value="BLExpression_Actions" />
+    <ref role="1h_SK9" to="eynw:6D0CP__oaBp" resolve="BLExpression" />
+    <node concept="1hA7zw" id="PtBTHLWI1q" role="1h_SK8">
+      <property role="1hAc7j" value="insert_action_id" />
+      <node concept="1hAIg9" id="PtBTHLWI1r" role="1hA7z_">
+        <node concept="3clFbS" id="PtBTHLWI1s" role="2VODD2">
+          <node concept="3cpWs8" id="PtBTHLWMQm" role="3cqZAp">
+            <node concept="3cpWsn" id="PtBTHLWMQp" role="3cpWs9">
+              <property role="TrG5h" value="blCommand" />
+              <node concept="3Tqbb2" id="PtBTHLWMQl" role="1tU5fm">
+                <ref role="ehGHo" to="eynw:4Jke6BA4ffD" resolve="BLCommand" />
+              </node>
+              <node concept="2ShNRf" id="PtBTHLWMTP" role="33vP2m">
+                <node concept="3zrR0B" id="PtBTHLWMTN" role="2ShVmc">
+                  <node concept="3Tqbb2" id="PtBTHLWMTO" role="3zrR0E">
+                    <ref role="ehGHo" to="eynw:4Jke6BA4ffD" resolve="BLCommand" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="PtBTHLY7pU" role="3cqZAp">
+            <node concept="37vLTI" id="PtBTHLYmZ3" role="3clFbG">
+              <node concept="2ShNRf" id="PtBTHLYn51" role="37vLTx">
+                <node concept="3zrR0B" id="PtBTHLYn3W" role="2ShVmc">
+                  <node concept="3Tqbb2" id="PtBTHLYn3X" role="3zrR0E">
+                    <ref role="ehGHo" to="tpee:fzclF80" resolve="StatementList" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="PtBTHLY7zD" role="37vLTJ">
+                <node concept="37vLTw" id="PtBTHLY7pT" role="2Oq$k0">
+                  <ref role="3cqZAo" node="PtBTHLWMQp" resolve="blCommand" />
+                </node>
+                <node concept="3TrEf2" id="PtBTHLYfnQ" role="2OqNvi">
+                  <ref role="3Tt5mk" to="eynw:1yfzJNJreD_" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="PtBTHLYnaO" role="3cqZAp">
+            <node concept="2OqwBi" id="PtBTHLYYR7" role="3clFbG">
+              <node concept="2OqwBi" id="PtBTHLYrFU" role="2Oq$k0">
+                <node concept="2OqwBi" id="PtBTHLYnkF" role="2Oq$k0">
+                  <node concept="37vLTw" id="PtBTHLYnaN" role="2Oq$k0">
+                    <ref role="3cqZAo" node="PtBTHLWMQp" resolve="blCommand" />
+                  </node>
+                  <node concept="3TrEf2" id="PtBTHLYq4X" role="2OqNvi">
+                    <ref role="3Tt5mk" to="eynw:1yfzJNJreD_" />
+                  </node>
+                </node>
+                <node concept="3Tsc0h" id="PtBTHLYvQh" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpee:fzcqZ_x" />
+                </node>
+              </node>
+              <node concept="WFELt" id="PtBTHLZgBk" role="2OqNvi">
+                <ref role="1A0vxQ" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="PtBTHLZgEJ" role="3cqZAp">
+            <node concept="37vLTI" id="PtBTHM0aSD" role="3clFbG">
+              <node concept="2OqwBi" id="PtBTHM0bmf" role="37vLTx">
+                <node concept="0IXxy" id="PtBTHM0beh" role="2Oq$k0" />
+                <node concept="3TrEf2" id="PtBTHM0dM$" role="2OqNvi">
+                  <ref role="3Tt5mk" to="eynw:6D0CP__oaD2" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="PtBTHM05NP" role="37vLTJ">
+                <node concept="1PxgMI" id="PtBTHM04lS" role="2Oq$k0">
+                  <ref role="1PxNhF" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                  <node concept="2OqwBi" id="PtBTHLZrLS" role="1PxMeX">
+                    <node concept="2OqwBi" id="PtBTHLZjMW" role="2Oq$k0">
+                      <node concept="2OqwBi" id="PtBTHLZgOI" role="2Oq$k0">
+                        <node concept="37vLTw" id="PtBTHLZgEI" role="2Oq$k0">
+                          <ref role="3cqZAo" node="PtBTHLWMQp" resolve="blCommand" />
+                        </node>
+                        <node concept="3TrEf2" id="PtBTHLZid2" role="2OqNvi">
+                          <ref role="3Tt5mk" to="eynw:1yfzJNJreD_" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="PtBTHLZnXj" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:fzcqZ_x" />
+                      </node>
+                    </node>
+                    <node concept="1uHKPH" id="PtBTHLZGIL" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="PtBTHM08jj" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:fzclF8k" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="PtBTHLWMUs" role="3cqZAp">
+            <node concept="2OqwBi" id="PtBTHLWN2D" role="3clFbG">
+              <node concept="0IXxy" id="PtBTHLWMUq" role="2Oq$k0" />
+              <node concept="1P9Npp" id="PtBTHLX4PU" role="2OqNvi">
+                <node concept="37vLTw" id="PtBTHLX4Rk" role="1P9ThW">
+                  <ref role="3cqZAo" node="PtBTHLWMQp" resolve="blCommand" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1hA7zw" id="5YxQmqOF2S5" role="1h_SK8">
+      <property role="1hAc7j" value="backspace_action_id" />
+      <node concept="1hAIg9" id="5YxQmqOF2S6" role="1hA7z_">
+        <node concept="3clFbS" id="5YxQmqOF2S7" role="2VODD2">
+          <node concept="3clFbF" id="5YxQmqOF2UV" role="3cqZAp">
+            <node concept="2OqwBi" id="5YxQmqOF2Xs" role="3clFbG">
+              <node concept="0IXxy" id="5YxQmqOF2UU" role="2Oq$k0" />
+              <node concept="1PgB_6" id="5YxQmqOF3dx" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="6M9lfhDDWh5">
+    <property role="3GE5qa" value="expression.print" />
+    <ref role="1XX52x" to="eynw:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+    <node concept="3EZMnI" id="7gnNafF7Ztz" role="2wV5jI">
+      <node concept="PMmxH" id="7gnNafF7ZtD" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        <ref role="1ERwB7" node="6D0CP__cz92" resolve="AbstractPrintExpression_Actions" />
+        <node concept="OXEIz" id="6kp4dbAhdvj" role="P5bDN">
+          <node concept="UkePV" id="6kp4dbAhdy$" role="OY2wv">
+            <ref role="Ul1FP" to="eynw:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F1sOY" id="7gnNafF7ZtI" role="3EZMnx">
+        <ref role="1NtTu8" to="eynw:7gnNafF7Ztx" />
+      </node>
+      <node concept="l2Vlx" id="3J6h25Qz6bJ" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="1h_SRR" id="6D0CP__cz92">
+    <property role="3GE5qa" value="expression.print" />
+    <property role="TrG5h" value="AbstractPrintExpression_Actions" />
+    <ref role="1h_SK9" to="eynw:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+    <node concept="1hA7zw" id="6D0CP__czcO" role="1h_SK8">
+      <property role="1hAc7j" value="delete_action_id" />
+      <node concept="1hAIg9" id="6D0CP__czcP" role="1hA7z_">
+        <node concept="3clFbS" id="6D0CP__czcQ" role="2VODD2">
+          <node concept="3clFbF" id="6D0CP__cTUX" role="3cqZAp">
+            <node concept="2OqwBi" id="6D0CP__cU1f" role="3clFbG">
+              <node concept="0IXxy" id="6D0CP__cTUW" role="2Oq$k0" />
+              <node concept="1P9Npp" id="6D0CP__cVAK" role="2OqNvi">
+                <node concept="2OqwBi" id="6D0CP__cVJQ" role="1P9ThW">
+                  <node concept="0IXxy" id="6D0CP__cVD$" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="6D0CP__cXm7" role="2OqNvi">
+                    <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps
index e55355ba63ea..1f73ba6436a1 100644
--- a/plugins/console/lang/base/languageModels/structure.mps
+++ b/plugins/console/lang/base/languageModels/structure.mps
@@ -7,7 +7,9 @@
   <imports>
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
@@ -144,7 +146,7 @@
     <property role="R5$K2" value="false" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="64VftqEcjuW" role="PzmwI">
-      <ref role="PrY4T" node="qgIopN3HO7" resolve="ConsoleHelpProvider" />
+      <ref role="PrY4T" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
     </node>
   </node>
   <node concept="1TIwiD" id="22lVekVE19_">
@@ -192,7 +194,7 @@
     <property role="R4oN_" value="help" />
     <ref role="1TJDcQ" node="1yfzJNJq9L_" resolve="InterpretedCommand" />
     <node concept="PrWs8" id="qgIopNcGQC" role="PzmwI">
-      <ref role="PrY4T" node="qgIopN3HO7" resolve="ConsoleHelpProvider" />
+      <ref role="PrY4T" to="3xdn:qgIopN3HO7" resolve="HelpProvider" />
     </node>
     <node concept="1TJgyj" id="60B$832X1$F" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
@@ -200,10 +202,6 @@
       <ref role="20lvS9" node="60B$832WV89" resolve="HelpConceptReference" />
     </node>
   </node>
-  <node concept="PlHQZ" id="qgIopN3HO7">
-    <property role="TrG5h" value="ConsoleHelpProvider" />
-    <property role="3GE5qa" value="help" />
-  </node>
   <node concept="1TIwiD" id="1nVd0kvs_CG">
     <property role="TrG5h" value="ConsoleRoot" />
     <property role="19KtqR" value="true" />
@@ -292,5 +290,113 @@
     <property role="19KtqR" value="true" />
     <ref role="1TJDcQ" node="1nVd0kvs_CG" resolve="ConsoleRoot" />
   </node>
+  <node concept="1TIwiD" id="5G2W3aW$Vsk">
+    <property role="3GE5qa" value="response" />
+    <property role="TrG5h" value="ExceptionHolder" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyi" id="5G2W3aWBbyD" role="1TKVEl">
+      <property role="TrG5h" value="stackTrace" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+    <node concept="PrWs8" id="3ob4OZ0kHtj" role="PzmwI">
+      <ref role="PrY4T" node="22lVekVIvmK" resolve="IClickable" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4Jke6BA4ffD">
+    <property role="TrG5h" value="BLCommand" />
+    <property role="R4oN_" value="baseLanguage statements" />
+    <property role="34LRSv" value="{" />
+    <ref role="1TJDcQ" node="1yfzJNJq9LL" resolve="GeneratedCommand" />
+    <node concept="1TJgyj" id="1yfzJNJreD_" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="body" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
+    </node>
+    <node concept="PrWs8" id="2lR2lzqth0Q" role="PzmwI">
+      <ref role="PrY4T" to="tpee:i2fhoOR" resolve="IMethodLike" />
+    </node>
+    <node concept="PrWs8" id="2lR2lzquo81" role="PzmwI">
+      <ref role="PrY4T" to="tpee:htgVS9_" resolve="IStatementListContainer" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="6D0CP__oaBp">
+    <property role="TrG5h" value="BLExpression" />
+    <property role="R4oN_" value="baseLanguage expression" />
+    <ref role="1TJDcQ" node="1yfzJNJq9LL" resolve="GeneratedCommand" />
+    <node concept="1TJgyj" id="6D0CP__oaD2" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="expression" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="PrWs8" id="6D0CP__qHGT" role="PzmwI">
+      <ref role="PrY4T" to="tpck:hLJPP0O" resolve="IWrapper" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="6M9lfhDDWgw">
+    <property role="3GE5qa" value="expression.print" />
+    <property role="TrG5h" value="AbstractPrintExpression" />
+    <property role="R5$K7" value="true" />
+    <property role="R5$K2" value="false" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="1TJgyj" id="7gnNafF7Ztx" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="object" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="6_TW7xVaDdR">
+    <property role="3GE5qa" value="expression.print" />
+    <property role="TrG5h" value="PrintExpression" />
+    <property role="34LRSv" value="#print" />
+    <property role="R4oN_" value="smart print depending on content" />
+    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+    <node concept="PrWs8" id="64VftqEsbD$" role="PzmwI">
+      <ref role="PrY4T" to="3xdn:64VftqErqMg" resolve="ExpressionHelpProvider" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="4LU9FcrO3Hp">
+    <property role="3GE5qa" value="expression.print" />
+    <property role="TrG5h" value="PrintNodeExpression" />
+    <property role="34LRSv" value="#printNode" />
+    <property role="R4oN_" value="print node copy" />
+    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+  </node>
+  <node concept="1TIwiD" id="5WpmwkrQrRs">
+    <property role="3GE5qa" value="expression.print" />
+    <property role="TrG5h" value="PrintNodeReferenceExpression" />
+    <property role="34LRSv" value="#printNodeRef" />
+    <property role="R4oN_" value="print reference to the node" />
+    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+  </node>
+  <node concept="1TIwiD" id="6_TW7xVvrpf">
+    <property role="3GE5qa" value="expression.print" />
+    <property role="TrG5h" value="PrintSequenceExpression" />
+    <property role="34LRSv" value="#printSequence" />
+    <property role="R4oN_" value="print size with link to usages view" />
+    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+  </node>
+  <node concept="1TIwiD" id="7gnNafF7YMD">
+    <property role="3GE5qa" value="expression.print" />
+    <property role="TrG5h" value="PrintTextExpression" />
+    <property role="34LRSv" value="#printText" />
+    <property role="R4oN_" value="print as string" />
+    <ref role="1TJDcQ" node="6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+  </node>
+  <node concept="1TIwiD" id="3J6h25QeHQy">
+    <property role="3GE5qa" value="query.parameter" />
+    <property role="TrG5h" value="ProjectScope" />
+    <property role="34LRSv" value="project" />
+    <ref role="1TJDcQ" to="3xdn:3J6h25QeHPb" resolve="ScopeParameter" />
+  </node>
+  <node concept="1TIwiD" id="DM6_$iqV$8">
+    <property role="TrG5h" value="ProjectExpression" />
+    <property role="34LRSv" value="#project" />
+    <property role="3GE5qa" value="query" />
+    <property role="R4oN_" value="the current project" />
+    <ref role="1TJDcQ" to="3xdn:3J6h25Q2UNX" resolve="QueryExpression" />
+  </node>
 </model>
 
diff --git a/plugins/console/lang/base/languageModels/typesystem.mps b/plugins/console/lang/base/languageModels/typesystem.mps
index e3bb638e7458..9f3fe4f72507 100644
--- a/plugins/console/lang/base/languageModels/typesystem.mps
+++ b/plugins/console/lang/base/languageModels/typesystem.mps
@@ -1,8 +1,313 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)">
   <persistence version="9" />
-  <languages />
-  <imports />
-  <registry />
+  <languages>
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="0" />
+    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
+    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
+    <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="0" />
+  </languages>
+  <imports>
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" implicit="true" />
+    <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" implicit="true" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
+  <registry>
+    <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" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </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">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
+        <child id="1185788644032" name="normalType" index="mwGJk" />
+      </concept>
+      <concept id="1179479408386" name="jetbrains.mps.lang.typesystem.structure.JoinType" flags="ng" index="2usRSg">
+        <child id="1179479418730" name="argument" index="2usUpS" />
+      </concept>
+      <concept id="1179832490862" name="jetbrains.mps.lang.typesystem.structure.CreateStrongLessThanInequationStatement" flags="nn" index="2NvLDW" />
+      <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
+        <child id="1195213635060" name="body" index="18ibNy" />
+      </concept>
+      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
+        <reference id="1174642800329" name="concept" index="1YaFvo" />
+      </concept>
+      <concept id="1174643105530" name="jetbrains.mps.lang.typesystem.structure.InferenceRule" flags="ig" index="1YbPZF" />
+      <concept id="1174648085619" name="jetbrains.mps.lang.typesystem.structure.AbstractRule" flags="ng" index="1YuPPy">
+        <child id="1174648101952" name="applicableNode" index="1YuTPh" />
+      </concept>
+      <concept id="1174650418652" name="jetbrains.mps.lang.typesystem.structure.ApplicableNodeReference" flags="nn" index="1YBJjd">
+        <reference id="1174650432090" name="applicableNode" index="1YBMHb" />
+      </concept>
+      <concept id="1174657487114" name="jetbrains.mps.lang.typesystem.structure.TypeOfExpression" flags="nn" index="1Z2H0r">
+        <child id="1174657509053" name="term" index="1Z2MuG" />
+      </concept>
+      <concept id="1174658326157" name="jetbrains.mps.lang.typesystem.structure.CreateEquationStatement" flags="nn" index="1Z5TYs" />
+      <concept id="1174660718586" name="jetbrains.mps.lang.typesystem.structure.AbstractEquationStatement" flags="nn" index="1Zf1VF">
+        <property id="1206359757216" name="checkOnly" index="3wDh2S" />
+        <child id="1174660783413" name="leftExpression" index="1ZfhK$" />
+        <child id="1174660783414" name="rightExpression" index="1ZfhKB" />
+      </concept>
+      <concept id="1174663118805" name="jetbrains.mps.lang.typesystem.structure.CreateLessThanInequationStatement" flags="nn" index="1ZobV4" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="8758390115029295477" name="jetbrains.mps.lang.smodel.structure.SReferenceType" flags="in" index="2z4iKi" />
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </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">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1YbPZF" id="5WpmwkrQrVd">
+    <property role="TrG5h" value="typeof_PrintNodeReferenceExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <node concept="3clFbS" id="5WpmwkrQrZl" role="18ibNy">
+      <node concept="2NvLDW" id="5WpmwkrQseH" role="3cqZAp">
+        <property role="3wDh2S" value="true" />
+        <node concept="mw_s8" id="5WpmwkrQsfA" role="1ZfhKB">
+          <node concept="2c44tf" id="5WpmwkrQsfy" role="mwGJk">
+            <node concept="3Tqbb2" id="5WpmwkrQsh0" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="5WpmwkrQseK" role="1ZfhK$">
+          <node concept="1Z2H0r" id="5WpmwkrQs0E" role="mwGJk">
+            <node concept="2OqwBi" id="4LU9FcrOzNt" role="1Z2MuG">
+              <node concept="1YBJjd" id="5WpmwkrQs56" role="2Oq$k0">
+                <ref role="1YBMHb" node="5WpmwkrQrZn" resolve="printNodeReferenceExpression" />
+              </node>
+              <node concept="3TrEf2" id="6M9lfhDFVhT" role="2OqNvi">
+                <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="5WpmwkrQrZn" role="1YuTPh">
+      <property role="TrG5h" value="printNodeReferenceExpression" />
+      <ref role="1YaFvo" to="eynw:5WpmwkrQrRs" resolve="PrintNodeReferenceExpression" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="4LU9FcrO4k2">
+    <property role="TrG5h" value="typeof_PrintNodeExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <node concept="3clFbS" id="4LU9FcrO4k3" role="18ibNy">
+      <node concept="2NvLDW" id="4LU9FcrO4kx" role="3cqZAp">
+        <property role="3wDh2S" value="true" />
+        <node concept="mw_s8" id="4LU9FcrO4ky" role="1ZfhKB">
+          <node concept="2c44tf" id="4LU9FcrO4kz" role="mwGJk">
+            <node concept="3Tqbb2" id="4LU9FcrO4k$" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="4LU9FcrO4k_" role="1ZfhK$">
+          <node concept="1Z2H0r" id="4LU9FcrO4kA" role="mwGJk">
+            <node concept="2OqwBi" id="4LU9FcrOALI" role="1Z2MuG">
+              <node concept="1YBJjd" id="4LU9FcrO4Gq" role="2Oq$k0">
+                <ref role="1YBMHb" node="4LU9FcrO4k5" resolve="printNodeExpression" />
+              </node>
+              <node concept="3TrEf2" id="6M9lfhDFWW6" role="2OqNvi">
+                <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="4LU9FcrO4k5" role="1YuTPh">
+      <property role="TrG5h" value="printNodeExpression" />
+      <ref role="1YaFvo" to="eynw:4LU9FcrO3Hp" resolve="PrintNodeExpression" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="6D0CP__pkYQ">
+    <property role="TrG5h" value="typeof_AbstractPrintExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <node concept="3clFbS" id="6D0CP__pkYR" role="18ibNy">
+      <node concept="1Z5TYs" id="6D0CP__pldU" role="3cqZAp">
+        <node concept="mw_s8" id="6D0CP__pleZ" role="1ZfhKB">
+          <node concept="2c44tf" id="6D0CP__pleV" role="mwGJk">
+            <node concept="3cqZAl" id="6D0CP__plfy" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="6D0CP__pldX" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6D0CP__pl6V" role="mwGJk">
+            <node concept="1YBJjd" id="6D0CP__pl7A" role="1Z2MuG">
+              <ref role="1YBMHb" node="6D0CP__pkYT" resolve="abstractPrintExpression" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6D0CP__pkYT" role="1YuTPh">
+      <property role="TrG5h" value="abstractPrintExpression" />
+      <ref role="1YaFvo" to="eynw:6M9lfhDDWgw" resolve="AbstractPrintExpression" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="6_TW7xVaM$f">
+    <property role="TrG5h" value="typeof_PrintExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <node concept="3clFbS" id="6_TW7xVaM$g" role="18ibNy">
+      <node concept="1ZobV4" id="6_TW7xVqlaW" role="3cqZAp">
+        <node concept="mw_s8" id="6_TW7xVqlaY" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6_TW7xVqlaZ" role="mwGJk">
+            <node concept="2OqwBi" id="6_TW7xVqlb0" role="1Z2MuG">
+              <node concept="1YBJjd" id="6_TW7xVqlb1" role="2Oq$k0">
+                <ref role="1YBMHb" node="6_TW7xVaM$i" resolve="printExpression" />
+              </node>
+              <node concept="3TrEf2" id="6_TW7xVqlb2" role="2OqNvi">
+                <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="6_TW7xVqley" role="1ZfhKB">
+          <node concept="2c44tf" id="6_TW7xVqleu" role="mwGJk">
+            <node concept="2usRSg" id="2WuZn$zmq4e" role="2c44tc">
+              <node concept="3uibUv" id="2WuZn$zmq5i" role="2usUpS">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+              <node concept="3cqZAl" id="2WuZn$zmq7t" role="2usUpS" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6_TW7xVaM$i" role="1YuTPh">
+      <property role="TrG5h" value="printExpression" />
+      <ref role="1YaFvo" to="eynw:6_TW7xVaDdR" resolve="PrintExpression" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="6_TW7xVaPWK">
+    <property role="TrG5h" value="typeof_PrintTextExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <node concept="3clFbS" id="6_TW7xVaPWL" role="18ibNy">
+      <node concept="1ZobV4" id="6_TW7xVqlkf" role="3cqZAp">
+        <node concept="mw_s8" id="6_TW7xVqlkh" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6_TW7xVqlki" role="mwGJk">
+            <node concept="2OqwBi" id="6_TW7xVqlkj" role="1Z2MuG">
+              <node concept="1YBJjd" id="6_TW7xVqlkk" role="2Oq$k0">
+                <ref role="1YBMHb" node="6_TW7xVaPWN" resolve="printTextExpression" />
+              </node>
+              <node concept="3TrEf2" id="6_TW7xVqlkl" role="2OqNvi">
+                <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="6_TW7xVqlkm" role="1ZfhKB">
+          <node concept="2c44tf" id="6_TW7xVqlnN" role="mwGJk">
+            <node concept="3uibUv" id="6_TW7xVqlnO" role="2c44tc">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6_TW7xVaPWN" role="1YuTPh">
+      <property role="TrG5h" value="printTextExpression" />
+      <ref role="1YaFvo" to="eynw:7gnNafF7YMD" resolve="PrintTextExpression" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="6_TW7xVvrr5">
+    <property role="TrG5h" value="typeof_PrintSequenceExpression" />
+    <property role="3GE5qa" value="expression.print" />
+    <node concept="3clFbS" id="6_TW7xVvrr6" role="18ibNy">
+      <node concept="1ZobV4" id="3m3GNuUbcC$" role="3cqZAp">
+        <node concept="mw_s8" id="3m3GNuUbcCL" role="1ZfhK$">
+          <node concept="1Z2H0r" id="3m3GNuUbcCM" role="mwGJk">
+            <node concept="2OqwBi" id="3m3GNuUbcCN" role="1Z2MuG">
+              <node concept="1YBJjd" id="3m3GNuUbcCO" role="2Oq$k0">
+                <ref role="1YBMHb" node="6_TW7xVvrr8" resolve="printSequenceExpression" />
+              </node>
+              <node concept="3TrEf2" id="3m3GNuUbcCP" role="2OqNvi">
+                <ref role="3Tt5mk" to="eynw:7gnNafF7Ztx" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="3m3GNuUbcCA" role="1ZfhKB">
+          <node concept="2c44tf" id="3m3GNuUbcCB" role="mwGJk">
+            <node concept="2usRSg" id="3m3GNuUbcCC" role="2c44tc">
+              <node concept="A3Dl8" id="3m3GNuUbcCD" role="2usUpS">
+                <node concept="3Tqbb2" id="3m3GNuUbcCE" role="A3Ik2" />
+              </node>
+              <node concept="A3Dl8" id="3m3GNuUbcCF" role="2usUpS">
+                <node concept="2z4iKi" id="3m3GNuUbcCG" role="A3Ik2" />
+              </node>
+              <node concept="A3Dl8" id="3m3GNuUbcCH" role="2usUpS">
+                <node concept="H_c77" id="3m3GNuUbcCI" role="A3Ik2" />
+              </node>
+              <node concept="A3Dl8" id="3m3GNuUbcCJ" role="2usUpS">
+                <node concept="3uibUv" id="3m3GNuUbcCK" role="A3Ik2">
+                  <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6_TW7xVvrr8" role="1YuTPh">
+      <property role="TrG5h" value="printSequenceExpression" />
+      <ref role="1YaFvo" to="eynw:6_TW7xVvrpf" resolve="PrintSequenceExpression" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="DM6_$iqVAS">
+    <property role="TrG5h" value="typeof_ProjectExpression" />
+    <property role="3GE5qa" value="query" />
+    <node concept="3clFbS" id="DM6_$iqVEX" role="18ibNy">
+      <node concept="1Z5TYs" id="DM6_$iqXCh" role="3cqZAp">
+        <node concept="mw_s8" id="DM6_$iqXDG" role="1ZfhKB">
+          <node concept="2c44tf" id="DM6_$iqXEj" role="mwGJk">
+            <node concept="3uibUv" id="DM6_$iqXGy" role="2c44tc">
+              <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="DM6_$iqXCk" role="1ZfhK$">
+          <node concept="1Z2H0r" id="DM6_$iqXoj" role="mwGJk">
+            <node concept="1YBJjd" id="DM6_$iqXoG" role="1Z2MuG">
+              <ref role="1YBMHb" node="DM6_$iqVEZ" resolve="projectExpression" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="DM6_$iqVEZ" role="1YuTPh">
+      <property role="TrG5h" value="projectExpression" />
+      <ref role="1YaFvo" to="eynw:DM6_$iqV$8" resolve="ProjectExpression" />
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies
similarity index 64%
rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies
rename to plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies
index d5ea7f04d57f..c51b51fbaba7 100644
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.actions.ActionAspectDescriptorImpl" file="ActionAspectDescriptorImpl.java">
+  <dependency className="jetbrains.mps.console.base.actions.ActionAspectDescriptorImpl" file="ActionAspectDescriptorImpl.java">
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.Arrays" />
     <classNode dependClassName="java.util.Collection" />
     <classNode dependClassName="java.util.Collections" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.actions.QueryExpression_NodeFactories" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.actions.ScopeParameterLiteral_factories" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.actions.printStatement_NodeFactories" />
+    <classNode dependClassName="jetbrains.mps.console.base.actions.printStatement_NodeFactories" />
     <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.NodeFactory" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
     <classNode extendsClassName="jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.actions.PasteWrappers" file="PasteWrappers.java">
+  <dependency className="jetbrains.mps.console.base.actions.PasteWrappers" file="PasteWrappers.java">
     <classNode dependClassName="java.lang.Object" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.ArrayList" />
@@ -28,7 +26,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.actions.QueriesGenerated" file="QueriesGenerated.java">
+  <dependency className="jetbrains.mps.console.base.actions.QueriesGenerated" file="QueriesGenerated.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.util.ArrayList" />
     <classNode dependClassName="java.util.List" />
@@ -49,22 +47,7 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SModel" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
   </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.actions.QueryExpression_NodeFactories" file="QueryExpression_NodeFactories.java">
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.NodeFactory" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SModel" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.actions.ScopeParameterLiteral_factories" file="ScopeParameterLiteral_factories.java">
-    <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.NodeFactory" />
-    <classNode dependClassName="jetbrains.mps.smodel.action.SNodeFactoryOperations" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SModel" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.actions.printStatement_NodeFactories" file="printStatement_NodeFactories.java">
+  <dependency className="jetbrains.mps.console.base.actions.printStatement_NodeFactories" file="printStatement_NodeFactories.java">
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
     <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.NodeFactory" />
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated
new file mode 100644
index 000000000000..b9dc970e8192
--- /dev/null
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependencies version="2" modelHash="1fdt49tek3ltxtb27ompmficuhgow6q" />
+
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies
index e21d3c6a8c4f..6298b40015b1 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies
@@ -1,10 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
+  <dependency className="jetbrains.mps.console.base.behavior.AbstractPrintExpression_Behavior" file="AbstractPrintExpression_Behavior.java">
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.AbstractPrintExpression_BehaviorDescriptor" file="AbstractPrintExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.AbstractPrintExpression_Behavior" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.BLCommand_Behavior" file="BLCommand_Behavior.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="java.util.ArrayList" />
+    <classNode dependClassName="java.util.List" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.BLCommand_BehaviorDescriptor" file="BLCommand_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="java.util.List" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.IMethodLike_Behavior" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.IMethodLike_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.IStatementListContainer_Behavior" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.IStatementListContainer_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.BLCommand_Behavior" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="java.lang.Cloneable" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.BLExpression_Behavior" file="BLExpression_Behavior.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.BLExpression_BehaviorDescriptor" file="BLExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.BLExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.core.behavior.IWrapper_BehaviorDescriptor" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode extendsClassName="java.lang.Cloneable" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
   <dependency className="jetbrains.mps.console.base.behavior.BehaviorAspectDescriptor" file="BehaviorAspectDescriptor.java">
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.Arrays" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.BLCommand_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.BLExpression_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.CommandHolder_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleRoot_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.ExceptionHolder_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.HelpCommand_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.HelpConceptReference_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.History_BehaviorDescriptor" />
@@ -16,6 +74,13 @@
     <classNode dependClassName="jetbrains.mps.console.base.behavior.NodeWithClosure_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.OutputConsoleRoot_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.PastedNodeReference_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.PrintExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.PrintNodeExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.PrintNodeReferenceExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.PrintSequenceExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.PrintTextExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.ProjectExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.ProjectScope_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.Response_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.TextResponseItem_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.BehaviorDescriptor" />
@@ -50,35 +115,40 @@
     <classNode dependClassName="java.lang.Runnable" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.Command_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleContext" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleStream" />
     <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="java.lang.Cloneable" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" file="ConsoleHelpProvider_Behavior.java">
-    <classNode dependClassName="java.lang.Object" />
+  <dependency className="jetbrains.mps.console.base.behavior.ConsoleRoot_BehaviorDescriptor" file="ConsoleRoot_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.ExceptionHolder_Behavior" file="ExceptionHolder_Behavior.java">
+    <classNode dependClassName="com.intellij.ide.CopyPasteManagerEx" />
+    <classNode dependClassName="com.intellij.openapi.project.Project" />
+    <classNode dependClassName="java.awt.datatransfer.StringSelection" />
+    <classNode dependClassName="jetbrains.mps.ide.actions.AnalyzeStacktraceDialog" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
   </dependency>
-  <dependency className="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor" file="ConsoleHelpProvider_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.base.behavior.ConsoleRoot_BehaviorDescriptor" file="ConsoleRoot_BehaviorDescriptor.java">
+  <dependency className="jetbrains.mps.console.base.behavior.ExceptionHolder_BehaviorDescriptor" file="ExceptionHolder_BehaviorDescriptor.java">
+    <classNode dependClassName="com.intellij.openapi.project.Project" />
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.ExceptionHolder_Behavior" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.IClickable_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="java.lang.Cloneable" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
   </dependency>
   <dependency className="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior" file="GeneratedCommand_Behavior.java">
@@ -93,6 +163,7 @@
     <classNode dependClassName="java.lang.reflect.Method" />
     <classNode dependClassName="javax.swing.SwingUtilities" />
     <classNode dependClassName="jetbrains.mps.classloading.ClassLoaderManager" />
+    <classNode dependClassName="jetbrains.mps.console.tool.BaseConsoleTab" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleContext" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleStream" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleUtil" />
@@ -127,6 +198,7 @@
     <classNode dependClassName="java.util.Deque" />
     <classNode dependClassName="java.util.LinkedList" />
     <classNode dependClassName="java.util.List" />
+    <classNode dependClassName="jetbrains.mps.console.tool.BaseConsoleTab" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleContext" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleStream" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.IListSequence" />
@@ -152,12 +224,12 @@
   <dependency className="jetbrains.mps.console.base.behavior.HelpCommand_BehaviorDescriptor" file="HelpCommand_BehaviorDescriptor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.HelpCommand_Behavior" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleContext" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleStream" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="java.lang.Cloneable" />
@@ -335,6 +407,68 @@
     <classNode extendsClassName="java.lang.Cloneable" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
   </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.PrintExpression_Behavior" file="PrintExpression_Behavior.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.PrintExpression_BehaviorDescriptor" file="PrintExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.AbstractPrintExpression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.PrintExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode extendsClassName="java.lang.Cloneable" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.PrintNodeExpression_BehaviorDescriptor" file="PrintNodeExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.AbstractPrintExpression_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.PrintNodeReferenceExpression_BehaviorDescriptor" file="PrintNodeReferenceExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.AbstractPrintExpression_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.PrintSequenceExpression_BehaviorDescriptor" file="PrintSequenceExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.AbstractPrintExpression_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.PrintTextExpression_BehaviorDescriptor" file="PrintTextExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.AbstractPrintExpression_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.ProjectExpression_Behavior" file="ProjectExpression_Behavior.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.ProjectExpression_BehaviorDescriptor" file="ProjectExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Iterable" />
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.behavior.ProjectExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.behavior.ProjectScope_BehaviorDescriptor" file="ProjectScope_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
   <dependency className="jetbrains.mps.console.base.behavior.ResponseItem_BehaviorDescriptor" file="ResponseItem_BehaviorDescriptor.java" />
   <dependency className="jetbrains.mps.console.base.behavior.Response_BehaviorDescriptor" file="Response_BehaviorDescriptor.java">
     <classNode dependClassName="java.lang.Override" />
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated
index 1d5edddea2a5..b039f58f9884 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-bvu4862ayx192n2dzetnohkqhdahejl" />
+<dependencies version="2" modelHash="-6l989jub395dqqrbvevmoyc0u1a3ba8" />
 
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated
index dd32d603ba1b..7c7b10b445db 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-94d0vw8hhshmxx7h7npwiw6wrb4gxgu" />
+<dependencies version="2" modelHash="-e1t6mdmbbx69kcwj1kq0a7bl7cdubes" />
 
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies
index dfd97d2474a3..7efe45859dc0 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies
@@ -6,12 +6,16 @@
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.Collection" />
     <classNode dependClassName="java.util.UUID" />
+    <classNode dependClassName="jetbrains.mps.console.base.actions.ActionAspectDescriptorImpl" />
     <classNode dependClassName="jetbrains.mps.console.base.behavior.BehaviorAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.constraints.ConstraintsAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.base.editor.EditorAspectDescriptorImpl" />
     <classNode dependClassName="jetbrains.mps.console.base.structure.StructureAspectDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.base.typesystem.TypesystemDescriptor" />
     <classNode dependClassName="jetbrains.mps.generator.runtime.TemplateModule" />
     <classNode dependClassName="jetbrains.mps.generator.runtime.TemplateUtil" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor" />
+    <classNode dependClassName="jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.ids.SLanguageId" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor" />
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies
index bf64b9e54ab6..e95a8ec208e9 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies
@@ -1,5 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
+  <dependency className="jetbrains.mps.console.base.editor.AbstractPrintExpression_Actions" file="AbstractPrintExpression_Actions.java">
+    <classNode dependClassName="jetbrains.mps.editor.runtime.cells.AbstractCellAction" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.editor.AbstractPrintExpression_Editor" file="AbstractPrintExpression_Editor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.editor.AbstractPrintExpression_Actions" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
+    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
+    <classNode dependClassName="jetbrains.mps.lang.editor.generator.internal.AbstractCellMenuPart_ReplaceNode_CustomNodeConcept" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.BasicCellContext" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.CompositeSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.editor.BLCommand_Editor" file="BLCommand_Editor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.cells.BigCellUtil" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleImpl" />
+    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Constant" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.style.Style" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.editor.BLExpression_Actions" file="BLExpression_Actions.java">
+    <classNode dependClassName="jetbrains.mps.editor.runtime.cells.AbstractCellAction" />
+    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.editor.BLExpression_Editor" file="BLExpression_Editor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.console.base.editor.BLExpression_Actions" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
+    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
+  </dependency>
   <dependency className="jetbrains.mps.console.base.editor.ClickableEditorComponent" file="ClickableEditorComponent.java">
     <classNode dependClassName="java.awt.Color" />
     <classNode dependClassName="java.lang.Boolean" />
@@ -72,9 +152,13 @@
     <classNode dependClassName="java.util.Arrays" />
     <classNode dependClassName="java.util.Collection" />
     <classNode dependClassName="java.util.Collections" />
+    <classNode dependClassName="jetbrains.mps.console.base.editor.AbstractPrintExpression_Editor" />
+    <classNode dependClassName="jetbrains.mps.console.base.editor.BLCommand_Editor" />
+    <classNode dependClassName="jetbrains.mps.console.base.editor.BLExpression_Editor" />
     <classNode dependClassName="jetbrains.mps.console.base.editor.ClickableEditorComponent" />
     <classNode dependClassName="jetbrains.mps.console.base.editor.CommandHolder_Editor" />
     <classNode dependClassName="jetbrains.mps.console.base.editor.ConsoleRoot_Editor" />
+    <classNode dependClassName="jetbrains.mps.console.base.editor.ExceptionHolder_Editor" />
     <classNode dependClassName="jetbrains.mps.console.base.editor.HelpCommand_Editor" />
     <classNode dependClassName="jetbrains.mps.console.base.editor.HelpConceptReference_Editor" />
     <classNode dependClassName="jetbrains.mps.console.base.editor.History_Editor" />
@@ -93,6 +177,21 @@
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConceptDescriptor" />
     <classNode extendsClassName="jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor" />
   </dependency>
+  <dependency className="jetbrains.mps.console.base.editor.ExceptionHolder_Editor" file="ExceptionHolder_Editor.java">
+    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleAttributes" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.style.StyleImpl" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.MPSColors" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Constant" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.style.Style" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.style.StyleRegistry" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
+  </dependency>
   <dependency className="jetbrains.mps.console.base.editor.HelpCommand_Editor" file="HelpCommand_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated
index 122f6f5a4386..9806d1726c69 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-5c82auv17au0u7g5aalguuotk61ifct" />
+<dependencies version="2" modelHash="-8fx57jpvi5v05qscf992t0pke95xtr9" />
 
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated
index 8b0ad7fe2dd9..dda8118a0bb9 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-erfitsqrd51ejc3dc00u9j376h858hy" />
+<dependencies version="2" modelHash="-6k9o1vjsuwezrzjo3uy50ud5lbd2c52" />
 
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated
index 763dd5aa352b..41f9ba272f3b 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-75zekgngimnl1vihqzsy5qoki65fzwk" />
+<dependencies version="2" modelHash="-24ftah8hdli7szlm68a7rhakbsq07hb" />
 
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies
index 71ea00a877b6..d172729c8ff1 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies
@@ -1,3 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependenciesRoot />
+<dependenciesRoot>
+  <dependency className="jetbrains.mps.console.base.typesystem.TypesystemDescriptor" file="TypesystemDescriptor.java">
+    <classNode dependClassName="jetbrains.mps.console.base.typesystem.typeof_AbstractPrintExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.console.base.typesystem.typeof_PrintExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.console.base.typesystem.typeof_PrintNodeExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.console.base.typesystem.typeof_PrintNodeReferenceExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.console.base.typesystem.typeof_PrintSequenceExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.console.base.typesystem.typeof_PrintTextExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.console.base.typesystem.typeof_ProjectExpression_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.typesystem.typeof_AbstractPrintExpression_InferenceRule" file="typeof_AbstractPrintExpression_InferenceRule.java">
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.typesystem.typeof_PrintExpression_InferenceRule" file="typeof_PrintExpression_InferenceRule.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.typesystem.typeof_PrintNodeExpression_InferenceRule" file="typeof_PrintNodeExpression_InferenceRule.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.typesystem.typeof_PrintNodeReferenceExpression_InferenceRule" file="typeof_PrintNodeReferenceExpression_InferenceRule.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.typesystem.typeof_PrintSequenceExpression_InferenceRule" file="typeof_PrintSequenceExpression_InferenceRule.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.typesystem.typeof_PrintTextExpression_InferenceRule" file="typeof_PrintTextExpression_InferenceRule.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.base.typesystem.typeof_ProjectExpression_InferenceRule" file="typeof_ProjectExpression_InferenceRule.java">
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+  </dependency>
+</dependenciesRoot>
 
diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated
index 15a85ca957b7..5d43584104c6 100644
--- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated
+++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-7ue7blvxzn6vl839jxiu067uniswcts" />
+<dependencies version="2" modelHash="-7k4m3rz60rqxb7dz11j2gyal0tu40z4" />
 
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java
index d19143b7ab33..079cd0eb505e 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java
@@ -9,11 +9,15 @@
 import jetbrains.mps.generator.runtime.TemplateModule;
 import jetbrains.mps.generator.runtime.TemplateUtil;
 import jetbrains.mps.smodel.runtime.ILanguageAspect;
+import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor;
+import jetbrains.mps.console.base.actions.ActionAspectDescriptorImpl;
 import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor;
 import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor;
 import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor;
 import jetbrains.mps.console.base.editor.EditorAspectDescriptorImpl;
 import jetbrains.mps.smodel.runtime.StructureAspectDescriptor;
+import jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor;
+import jetbrains.mps.console.base.typesystem.TypesystemDescriptor;
 
 public class Language extends LanguageRuntime {
   public static String MODULE_REF = "de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)";
@@ -34,7 +38,7 @@ public SLanguageId getId() {
   }
   @Override
   protected String[] getExtendedLanguageIDs() {
-    return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage"};
+    return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.lang.smodel.query"};
   }
   @Override
   public Collection<TemplateModule> getGenerators() {
@@ -42,6 +46,9 @@ public Collection<TemplateModule> getGenerators() {
   }
   @Override
   protected <T extends ILanguageAspect> T createAspect(Class<T> aspectClass) {
+    if (aspectClass == ActionAspectDescriptor.class) {
+      return (T) new ActionAspectDescriptorImpl();
+    }
     if (aspectClass == BehaviorAspectDescriptor.class) {
       return (T) new jetbrains.mps.console.base.behavior.BehaviorAspectDescriptor();
     }
@@ -54,6 +61,9 @@ protected <T extends ILanguageAspect> T createAspect(Class<T> aspectClass) {
     if (aspectClass == StructureAspectDescriptor.class) {
       return (T) new jetbrains.mps.console.base.structure.StructureAspectDescriptor();
     }
+    if (aspectClass == IHelginsDescriptor.class) {
+      return (T) new TypesystemDescriptor();
+    }
 
 
     return super.createAspect(aspectClass);
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/ActionAspectDescriptorImpl.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/ActionAspectDescriptorImpl.java
new file mode 100644
index 000000000000..2aca673e1eb7
--- /dev/null
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/ActionAspectDescriptorImpl.java
@@ -0,0 +1,26 @@
+package jetbrains.mps.console.base.actions;
+
+/*Generated by MPS */
+
+import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor;
+import java.util.Collection;
+import jetbrains.mps.openapi.actions.descriptor.NodeFactory;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import java.util.Arrays;
+import java.util.Collections;
+
+public class ActionAspectDescriptorImpl implements ActionAspectDescriptor {
+  private static final String LANGUAGE_FQ_NAME = "jetbrains.mps.console.base";
+
+  public Collection<NodeFactory> getFactories(SAbstractConcept concept) {
+    if (LANGUAGE_FQ_NAME.equals(concept.getLanguage().getQualifiedName())) {
+      switch (Arrays.binarySearch(stringSwitchCases_tpto26_a0a0a0c, concept.getName())) {
+        case 0:
+          return Collections.<NodeFactory>singletonList(new printStatement_NodeFactories.NodeFactory_7284872370241013667());
+        default:
+      }
+    }
+    return Collections.<NodeFactory>emptyList();
+  }
+  private static String[] stringSwitchCases_tpto26_a0a0a0c = new String[]{"AbstractPrintExpression"};
+}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/PasteWrappers.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/PasteWrappers.java
similarity index 81%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/PasteWrappers.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/PasteWrappers.java
index 5b9aacb2c03b..f1b18be891bf 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/PasteWrappers.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/PasteWrappers.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.actions;
+package jetbrains.mps.console.base.actions;
 
 /*Generated by MPS */
 
@@ -31,33 +31,33 @@ public SNode wrap(PasteWrapperContext _context) {
     });
     ListSequence.fromList(result).addElement(new PasteWrapper() {
       public String getSourceConceptFqName() {
-        return "jetbrains.mps.console.blCommand.structure.BLExpression";
+        return "jetbrains.mps.console.base.structure.BLExpression";
       }
       public String getTargetConceptFqName() {
         return "jetbrains.mps.baseLanguage.structure.Expression";
       }
       public SNode wrap(PasteWrapperContext _context) {
-        return SLinkOperations.getTarget(_context.getSourceNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"));
+        return SLinkOperations.getTarget(_context.getSourceNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"));
       }
     });
     ListSequence.fromList(result).addElement(new PasteWrapper() {
       public String getSourceConceptFqName() {
-        return "jetbrains.mps.console.blCommand.structure.BLExpression";
+        return "jetbrains.mps.console.base.structure.BLExpression";
       }
       public String getTargetConceptFqName() {
         return "jetbrains.mps.baseLanguage.structure.Statement";
       }
       public SNode wrap(PasteWrapperContext _context) {
-        return createExpressionStatement_sma98h_a0a0c(SNodeOperations.cast(HUtil.copyIfNecessary(SLinkOperations.getTarget(_context.getSourceNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"))), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL, "jetbrains.mps.baseLanguage.structure.Expression")));
+        return createExpressionStatement_sma98h_a0a0c(SNodeOperations.cast(HUtil.copyIfNecessary(SLinkOperations.getTarget(_context.getSourceNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"))), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL, "jetbrains.mps.baseLanguage.structure.Expression")));
       }
     });
     return result;
   }
   private static SNode createBLExpression_sma98h_a0a0a(Object p0) {
     PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode n1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression"), null, null, false);
+    SNode n1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false);
     if (p0 != null) {
-      n1.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), (SNode) p0);
+      n1.addChild(MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), (SNode) p0);
     }
     return n1;
   }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/QueriesGenerated.java
similarity index 85%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/QueriesGenerated.java
index 37c867522515..3e8a99414cfc 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/QueriesGenerated.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.actions;
+package jetbrains.mps.console.base.actions;
 
 /*Generated by MPS */
 
@@ -25,14 +25,14 @@ public class QueriesGenerated {
   public static List<SubstituteAction> nodeSubstituteActionsBuilder_ActionsFactory_Command_3786816536599613947(final IOperationContext operationContext, final NodeSubstituteActionsFactoryContext _context) {
     List<SubstituteAction> result = ListSequence.fromList(new ArrayList<SubstituteAction>());
     {
-      SNode outputConcept = MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression").getDeclarationNode();
+      SNode outputConcept = MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression").getDeclarationNode();
       SNode childConcept = (SNode) _context.getChildConcept();
       if (SConceptOperations.isSuperConceptOf(SNodeOperations.asSConcept(childConcept), SNodeOperations.asSConcept(outputConcept))) {
         SNode wrappedConcept = MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL, "jetbrains.mps.baseLanguage.structure.Expression").getDeclarationNode();
         IChildNodeSetter setter = new AbstractChildNodeSetter() {
           private SNode wrapNode(SNode nodeToWrap, SModel model, @Nullable EditorContext editorContext) {
-            SNode result = SNodeFactoryOperations.createNewNode(SNodeOperations.getModel(nodeToWrap), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression")), null);
-            SLinkOperations.setTarget(result, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), nodeToWrap);
+            SNode result = SNodeFactoryOperations.createNewNode(SNodeOperations.getModel(nodeToWrap), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression")), null);
+            SLinkOperations.setTarget(result, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), nodeToWrap);
             return result;
           }
           public boolean returnSmallPart(SNode nodeToWrap) {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/printStatement_NodeFactories.java
similarity index 61%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/printStatement_NodeFactories.java
index 70784965524e..d05478a246a1 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/printStatement_NodeFactories.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.actions;
+package jetbrains.mps.console.base.actions;
 
 /*Generated by MPS */
 
@@ -12,8 +12,8 @@
 public class printStatement_NodeFactories {
   public static class NodeFactory_7284872370241013667 implements NodeFactory {
     public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) {
-      if (SNodeOperations.isInstanceOf(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression"))) {
-        SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), SLinkOperations.getTarget(SNodeOperations.cast(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
+      if (SNodeOperations.isInstanceOf(sampleNode, MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, "jetbrains.mps.console.base.structure.AbstractPrintExpression"))) {
+        SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), SLinkOperations.getTarget(SNodeOperations.cast(sampleNode, MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, "jetbrains.mps.console.base.structure.AbstractPrintExpression")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
       }
     }
   }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info
similarity index 55%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info
index fb3b9e71534d..5b4be1b7ba93 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info
@@ -9,61 +9,26 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
   <root>
     <file name="ActionAspectDescriptorImpl.java">
-      <unit at="12,0,35,0" name="jetbrains.mps.console.blCommand.actions.ActionAspectDescriptorImpl" />
+      <unit at="12,0,27,0" name="jetbrains.mps.console.base.actions.ActionAspectDescriptorImpl" />
     </file>
     <file name="PasteWrappers.java">
-      <unit at="21,49,31,5" name="jetbrains.mps.console.blCommand.actions.PasteWrappers$1" />
-      <unit at="32,49,42,5" name="jetbrains.mps.console.blCommand.actions.PasteWrappers$2" />
-      <unit at="43,49,53,5" name="jetbrains.mps.console.blCommand.actions.PasteWrappers$3" />
-      <unit at="18,0,73,0" name="jetbrains.mps.console.blCommand.actions.PasteWrappers" />
+      <unit at="21,49,31,5" name="jetbrains.mps.console.base.actions.PasteWrappers$1" />
+      <unit at="32,49,42,5" name="jetbrains.mps.console.base.actions.PasteWrappers$2" />
+      <unit at="43,49,53,5" name="jetbrains.mps.console.base.actions.PasteWrappers$3" />
+      <unit at="18,0,73,0" name="jetbrains.mps.console.base.actions.PasteWrappers" />
     </file>
     <file name="QueriesGenerated.java">
-      <unit at="24,0,54,0" name="jetbrains.mps.console.blCommand.actions.QueriesGenerated" />
+      <unit at="24,0,54,0" name="jetbrains.mps.console.base.actions.QueriesGenerated" />
     </file>
   </root>
-  <root nodeRef="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.console.blCommand.actions)/3492877759608901704">
-    <file name="ScopeParameterLiteral_factories.java">
-      <node id="3492877759608901836" at="13,91,14,384" concept="1" />
-      <node id="3492877759608986173" at="18,91,19,381" concept="1" />
-      <node id="3492877759609298948" at="23,91,24,374" concept="1" />
-      <node id="3492877759608901705" at="13,0,16,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
-      <node id="3492877759608986170" at="18,0,21,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
-      <node id="3492877759609298945" at="23,0,26,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
-      <scope id="3492877759608901705" at="13,91,14,384" />
-      <scope id="3492877759608986170" at="18,91,19,381" />
-      <scope id="3492877759609298945" at="23,91,24,374" />
-      <scope id="3492877759608901705" at="13,0,16,0">
-        <var name="enclosingNode" id="3492877759608901705" />
-        <var name="model" id="3492877759608901705" />
-        <var name="newNode" id="3492877759608901705" />
-        <var name="sampleNode" id="3492877759608901705" />
-      </scope>
-      <scope id="3492877759608986170" at="18,0,21,0">
-        <var name="enclosingNode" id="3492877759608986170" />
-        <var name="model" id="3492877759608986170" />
-        <var name="newNode" id="3492877759608986170" />
-        <var name="sampleNode" id="3492877759608986170" />
-      </scope>
-      <scope id="3492877759609298945" at="23,0,26,0">
-        <var name="enclosingNode" id="3492877759609298945" />
-        <var name="model" id="3492877759609298945" />
-        <var name="newNode" id="3492877759609298945" />
-        <var name="sampleNode" id="3492877759609298945" />
-      </scope>
-      <unit id="3492877759608901705" at="12,0,17,0" name="jetbrains.mps.console.blCommand.actions.ScopeParameterLiteral_factories$NodeFactory_3492877759608901705" />
-      <unit id="3492877759608986170" at="17,0,22,0" name="jetbrains.mps.console.blCommand.actions.ScopeParameterLiteral_factories$NodeFactory_3492877759608986170" />
-      <unit id="3492877759609298945" at="22,0,27,0" name="jetbrains.mps.console.blCommand.actions.ScopeParameterLiteral_factories$NodeFactory_3492877759609298945" />
-      <unit id="3492877759608901704" at="11,0,28,0" name="jetbrains.mps.console.blCommand.actions.ScopeParameterLiteral_factories" />
-    </file>
-  </root>
-  <root nodeRef="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.console.blCommand.actions)/3786816536599609379">
+  <root nodeRef="r:e2e0d663-5267-4842-83ca-f12fcca33264(jetbrains.mps.console.base.actions)/3786816536599609379">
     <file name="QueriesGenerated.java">
       <node id="3786816536599613947" at="25,206,26,93" concept="4" />
-      <node id="3786816536599613947" at="27,5,28,200" concept="4" />
-      <node id="3786816536599613947" at="28,200,29,62" concept="4" />
+      <node id="3786816536599613947" at="27,5,28,195" concept="4" />
+      <node id="3786816536599613947" at="28,195,29,62" concept="4" />
       <node id="3786816536599613947" at="30,133,31,190" concept="4" />
-      <node id="1177403636225" at="33,105,34,302" concept="4" />
-      <node id="3786816536599823257" at="34,302,35,195" concept="1" />
+      <node id="1177403636225" at="33,105,34,297" concept="4" />
+      <node id="3786816536599823257" at="34,297,35,195" concept="1" />
       <node id="1177403662437" at="35,195,36,26" concept="5" />
       <node id="3786816536599653676" at="38,60,39,24" concept="5" />
       <node id="3786816536599613947" at="42,103,43,75" concept="4" />
@@ -116,44 +81,24 @@
         <var name="_context" id="3786816536599613947" />
         <var name="operationContext" id="3786816536599613947" />
       </scope>
-      <unit id="3786816536599613947" at="32,38,47,9" name="jetbrains.mps.console.blCommand.actions.QueriesGenerated$1" />
-    </file>
-  </root>
-  <root nodeRef="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.console.blCommand.actions)/4307205004138627839">
-    <file name="QueryExpression_NodeFactories.java">
-      <node id="4307205004139671546" at="15,208,16,531" concept="1" />
-      <node id="4307205004141606430" at="17,14,18,185" concept="1" />
-      <node id="4307205004141606087" at="17,12,19,7" concept="0" />
-      <node id="4307205004138627845" at="14,91,19,7" concept="2" />
-      <node id="4307205004138627840" at="14,0,21,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
-      <scope id="4307205004138627846" at="15,208,16,531" />
-      <scope id="4307205004141606088" at="17,14,18,185" />
-      <scope id="4307205004138627840" at="14,91,19,7" />
-      <scope id="4307205004138627840" at="14,0,21,0">
-        <var name="enclosingNode" id="4307205004138627840" />
-        <var name="model" id="4307205004138627840" />
-        <var name="newNode" id="4307205004138627840" />
-        <var name="sampleNode" id="4307205004138627840" />
-      </scope>
-      <unit id="4307205004138627840" at="13,0,22,0" name="jetbrains.mps.console.blCommand.actions.QueryExpression_NodeFactories$NodeFactory_4307205004138627840" />
-      <unit id="4307205004138627839" at="12,0,23,0" name="jetbrains.mps.console.blCommand.actions.QueryExpression_NodeFactories" />
+      <unit id="3786816536599613947" at="32,38,47,9" name="jetbrains.mps.console.base.actions.QueriesGenerated$1" />
     </file>
   </root>
-  <root nodeRef="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.console.blCommand.actions)/4615018937607083682">
+  <root nodeRef="r:e2e0d663-5267-4842-83ca-f12fcca33264(jetbrains.mps.console.base.actions)/4615018937607083682">
     <file name="PasteWrappers.java">
       <node id="4615018937607084454" at="28,55,29,257" concept="5" />
       <node id="1433263869220695697" at="39,55,40,204" concept="5" />
       <node id="1433263869220697094" at="50,55,51,428" concept="5" />
       <node id="4615018937607084452" at="56,67,57,63" concept="4" />
-      <node id="4615018937607084452" at="57,63,58,231" concept="4" />
+      <node id="4615018937607084452" at="57,63,58,226" concept="4" />
       <node id="4615018937607084452" at="59,21,60,167" concept="1" />
       <node id="4615018937607084452" at="61,5,62,14" concept="5" />
       <node id="1433263869220697092" at="64,74,65,63" concept="4" />
       <node id="1433263869220697092" at="65,63,66,227" concept="4" />
       <node id="1433263869220697092" at="67,21,68,155" concept="1" />
       <node id="1433263869220697092" at="69,5,70,14" concept="5" />
-      <node id="4615018937607084452" at="58,231,61,5" concept="0" />
-      <node id="4615018937607084452" at="58,231,61,5" concept="2" />
+      <node id="4615018937607084452" at="58,226,61,5" concept="0" />
+      <node id="4615018937607084452" at="58,226,61,5" concept="2" />
       <node id="1433263869220697092" at="66,227,69,5" concept="0" />
       <node id="1433263869220697092" at="66,227,69,5" concept="2" />
       <node id="4615018937607084452" at="56,0,64,0" concept="6" trace="createBLExpression_sma98h_a0a0a#(Ljava/lang/Object;)Lorg/jetbrains/mps/openapi/model/SNode;" />
@@ -163,7 +108,7 @@
       <scope id="6081287228602317649" at="50,55,51,428" />
       <scope id="4615018937607084452" at="59,21,60,167" />
       <scope id="1433263869220697092" at="67,21,68,155" />
-      <scope id="4615018937607084452" at="58,231,61,5" />
+      <scope id="4615018937607084452" at="58,226,61,5" />
       <scope id="1433263869220697092" at="66,227,69,5" />
       <scope id="4615018937607084452" at="56,67,62,14">
         <var name="facade" id="4615018937607084452" />
@@ -181,12 +126,12 @@
       </scope>
     </file>
   </root>
-  <root nodeRef="r:9cef28f0-1d60-4407-a18b-c9fc83b30f67(jetbrains.mps.console.blCommand.actions)/7284872370241013666">
+  <root nodeRef="r:e2e0d663-5267-4842-83ca-f12fcca33264(jetbrains.mps.console.base.actions)/7284872370241013666">
     <file name="printStatement_NodeFactories.java">
-      <node id="7284872370241018755" at="15,216,16,533" concept="1" />
+      <node id="7284872370241018755" at="15,211,16,528" concept="1" />
       <node id="7284872370241013751" at="14,91,17,7" concept="2" />
       <node id="7284872370241013667" at="14,0,19,0" concept="3" trace="setup#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SModel;)V" />
-      <scope id="7284872370241013752" at="15,216,16,533" />
+      <scope id="7284872370241013752" at="15,211,16,528" />
       <scope id="7284872370241013667" at="14,91,17,7" />
       <scope id="7284872370241013667" at="14,0,19,0">
         <var name="enclosingNode" id="7284872370241013667" />
@@ -194,8 +139,8 @@
         <var name="newNode" id="7284872370241013667" />
         <var name="sampleNode" id="7284872370241013667" />
       </scope>
-      <unit id="7284872370241013667" at="13,0,20,0" name="jetbrains.mps.console.blCommand.actions.printStatement_NodeFactories$NodeFactory_7284872370241013667" />
-      <unit id="7284872370241013666" at="12,0,21,0" name="jetbrains.mps.console.blCommand.actions.printStatement_NodeFactories" />
+      <unit id="7284872370241013667" at="13,0,20,0" name="jetbrains.mps.console.base.actions.printStatement_NodeFactories$NodeFactory_7284872370241013667" />
+      <unit id="7284872370241013666" at="12,0,21,0" name="jetbrains.mps.console.base.actions.printStatement_NodeFactories" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_Behavior.java
similarity index 87%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_Behavior.java
index 0446914668f6..5323b6bdc8f2 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_BehaviorDescriptor.java
similarity index 81%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_BehaviorDescriptor.java
index 155405591ada..b097385829c3 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
@@ -13,6 +13,6 @@ public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression";
+    return "jetbrains.mps.console.base.structure.AbstractPrintExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_Behavior.java
similarity index 95%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_Behavior.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_Behavior.java
index cde2f556395c..f3d1fdf8df28 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_Behavior.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
@@ -20,7 +20,7 @@ public static SNode virtual_getExpectedRetType_1239354342632(SNode thisNode) {
     return _quotation_createNode_1tnz54_a0a0();
   }
   public static SNode virtual_getBody_1239354440022(SNode thisNode) {
-    return SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"));
+    return SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"));
   }
   public static List<SNode> virtual_getThrowableTypes_6204026822016975623(SNode thisNode) {
     List<SNode> result = new ArrayList<SNode>();
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_BehaviorDescriptor.java
similarity index 92%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_BehaviorDescriptor.java
index 664883ff5b48..3aa653d40a15 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_BehaviorDescriptor.java
@@ -1,8 +1,7 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
-import jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor;
 import jetbrains.mps.baseLanguage.behavior.IMethodLike_BehaviorDescriptor;
 import jetbrains.mps.baseLanguage.behavior.IStatementListContainer_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.model.SNode;
@@ -49,6 +48,6 @@ public boolean virtual_suppress_3393165121846091591(SNode thisNode, SNode child)
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.BLCommand";
+    return "jetbrains.mps.console.base.structure.BLCommand";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_Behavior.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_Behavior.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_Behavior.java
index 987685f596bc..01b01a39bb0f 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_Behavior.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_BehaviorDescriptor.java
similarity index 78%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_BehaviorDescriptor.java
index 2455f7b5fd1a..e19496bef04b 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_BehaviorDescriptor.java
@@ -1,8 +1,7 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
-import jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor;
 import jetbrains.mps.lang.core.behavior.IWrapper_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
 
@@ -17,6 +16,6 @@ public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.BLExpression";
+    return "jetbrains.mps.console.base.structure.BLExpression";
   }
 }
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java
index a97651f23425..1cf6f2624616 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java
@@ -11,39 +11,59 @@ public BehaviorAspectDescriptor() {
   }
   public BehaviorDescriptor getDescriptor(String fqName) {
     switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) {
-      case 4:
+      case 7:
         return new History_BehaviorDescriptor();
-      case 0:
+      case 2:
         return new CommandHolder_BehaviorDescriptor();
-      case 10:
+      case 13:
         return new NodeWithClosure_BehaviorDescriptor();
-      case 12:
+      case 15:
         return new PastedNodeReference_BehaviorDescriptor();
-      case 8:
+      case 11:
         return new NodeReferenceString_BehaviorDescriptor();
-      case 7:
+      case 10:
         return new NodeReferencePresentation_BehaviorDescriptor();
-      case 5:
+      case 8:
         return new ModifiedCommandHistoryItem_BehaviorDescriptor();
-      case 2:
+      case 5:
         return new HelpCommand_BehaviorDescriptor();
-      case 1:
+      case 3:
         return new ConsoleRoot_BehaviorDescriptor();
-      case 13:
+      case 23:
         return new Response_BehaviorDescriptor();
-      case 9:
+      case 12:
         return new NodeResponseItem_BehaviorDescriptor();
-      case 14:
+      case 24:
         return new TextResponseItem_BehaviorDescriptor();
-      case 6:
+      case 9:
         return new NewLineResponseItem_BehaviorDescriptor();
-      case 3:
+      case 6:
         return new HelpConceptReference_BehaviorDescriptor();
-      case 11:
+      case 14:
         return new OutputConsoleRoot_BehaviorDescriptor();
+      case 4:
+        return new ExceptionHolder_BehaviorDescriptor();
+      case 0:
+        return new BLCommand_BehaviorDescriptor();
+      case 1:
+        return new BLExpression_BehaviorDescriptor();
+      case 16:
+        return new PrintExpression_BehaviorDescriptor();
+      case 17:
+        return new PrintNodeExpression_BehaviorDescriptor();
+      case 18:
+        return new PrintNodeReferenceExpression_BehaviorDescriptor();
+      case 19:
+        return new PrintSequenceExpression_BehaviorDescriptor();
+      case 20:
+        return new PrintTextExpression_BehaviorDescriptor();
+      case 22:
+        return new ProjectScope_BehaviorDescriptor();
+      case 21:
+        return new ProjectExpression_BehaviorDescriptor();
       default:
         return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName);
     }
   }
-  private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"};
+  private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.PrintExpression", "jetbrains.mps.console.base.structure.PrintNodeExpression", "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.base.structure.PrintSequenceExpression", "jetbrains.mps.console.base.structure.PrintTextExpression", "jetbrains.mps.console.base.structure.ProjectExpression", "jetbrains.mps.console.base.structure.ProjectScope", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"};
 }
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java
index 74769a153c51..a091fe0df318 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java
@@ -3,31 +3,33 @@
 /*Generated by MPS */
 
 import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior;
 import org.jetbrains.mps.openapi.model.SNode;
 import jetbrains.mps.console.tool.ConsoleContext;
 import jetbrains.mps.console.tool.ConsoleStream;
 
-public abstract class Command_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements ConsoleHelpProvider_BehaviorDescriptor {
+public abstract class Command_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements HelpProvider_BehaviorDescriptor {
   public Command_BehaviorDescriptor() {
   }
   public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
+    return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
   }
   public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
   }
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
+    return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
   }
   public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
     return Command_Behavior.virtual_getKind_7006261637493126084(thisConcept);
   }
   public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
   }
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
   }
   @Override
   public String getConceptFqName() {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_Behavior.java
similarity index 81%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_Behavior.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_Behavior.java
index ddf4595196b0..dc620768b93e 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_Behavior.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
@@ -14,12 +14,12 @@ public class ExceptionHolder_Behavior {
   public static void init(SNode thisNode) {
   }
   public static void virtual_execute_8517397753922085153(SNode thisNode, Project project) {
-    StringSelection contents = new StringSelection(SPropertyOperations.getString(thisNode, MetaAdapterFactory.getProperty(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace")));
+    StringSelection contents = new StringSelection(SPropertyOperations.getString(thisNode, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace")));
     CopyPasteManagerEx.getInstanceEx().setContents(contents);
     final AnalyzeStacktraceDialog dialog = new AnalyzeStacktraceDialog(project);
     dialog.show();
   }
   public static boolean virtual_canExecute_3282455643657932881(SNode thisNode) {
-    return SPropertyOperations.getString(thisNode, MetaAdapterFactory.getProperty(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace")) != null;
+    return SPropertyOperations.getString(thisNode, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace")) != null;
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_BehaviorDescriptor.java
similarity index 79%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_BehaviorDescriptor.java
index ff95f7e2ba8c..58973362fc84 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_BehaviorDescriptor.java
@@ -1,9 +1,8 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
 import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
-import jetbrains.mps.console.base.behavior.IClickable_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.model.SNode;
 import com.intellij.openapi.project.Project;
 
@@ -18,6 +17,6 @@ public void virtual_execute_8517397753922085153(SNode thisNode, Project project)
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ExceptionHolder";
+    return "jetbrains.mps.console.base.structure.ExceptionHolder";
   }
 }
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java
index c613c6bbfe2d..f24121bf0537 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java
@@ -7,6 +7,7 @@
 import jetbrains.mps.console.tool.ConsoleStream;
 import com.intellij.openapi.application.ApplicationManager;
 import org.jetbrains.mps.openapi.model.SModel;
+import jetbrains.mps.console.tool.BaseConsoleTab;
 import jetbrains.mps.console.tool.ConsoleUtil;
 import javax.swing.SwingUtilities;
 import org.jetbrains.mps.openapi.module.SModule;
@@ -24,7 +25,7 @@ public static void init(SNode thisNode) {
   public static void virtual_execute_6854397602732226506(SNode thisNode, final ConsoleContext context, final ConsoleStream console, final Runnable beforeCallback, final Runnable afterCallback) {
     ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
       public void run() {
-        final SModel model = context.getConsoleTab().getConsoleModel();
+        final SModel model = ((BaseConsoleTab) context.getOutputWindow()).getConsoleModel();
         boolean result = ConsoleUtil.make(context.getProject(), model);
         if (!(result)) {
           return;
@@ -33,7 +34,7 @@ public void run() {
           public void run() {
             try {
               SModule module = model.getModule();
-              String name = ConsoleUtil.getGeneratedModelName(context);
+              String name = model.getModelName() + ".Main";
               Class<?> aClass = ClassLoaderManager.getInstance().getClass(module, name);
               if (aClass == null) {
                 throw new ClassNotFoundException("No class " + name + " for module " + module);
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java
index ed07c01f0d46..7b63001e0370 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java
@@ -9,6 +9,7 @@
 import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
 import jetbrains.mps.internal.collections.runtime.ListSequence;
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations;
+import jetbrains.mps.console.tool.BaseConsoleTab;
 import jetbrains.mps.internal.collections.runtime.IWhereFilter;
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
 import jetbrains.mps.lang.structure.behavior.AbstractConceptDeclaration_Behavior;
@@ -33,7 +34,7 @@ public static void init(SNode thisNode) {
   }
   public static void virtual_doExecute_3321948346081469500(SNode thisNode, ConsoleContext context, ConsoleStream console) {
     if ((SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")) == null)) {
-      Iterable<SNode> constructions = ListSequence.fromList(SConceptOperations.getAllSubConcepts(MetaAdapterFactory.getInterfaceConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L, "jetbrains.mps.console.base.structure.ConsoleHelpProvider").getDeclarationNode(), context.getConsoleTab().getConsoleModel())).where(new IWhereFilter<SNode>() {
+      Iterable<SNode> constructions = ListSequence.fromList(SConceptOperations.getAllSubConcepts(MetaAdapterFactory.getInterfaceConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L, "jetbrains.mps.lang.smodel.query.structure.HelpProvider").getDeclarationNode(), ((BaseConsoleTab) context.getOutputWindow()).getConsoleModel())).where(new IWhereFilter<SNode>() {
         public boolean accept(SNode it) {
           return SNodeOperations.isInstanceOf(SNodeOperations.asNode(it), MetaAdapterFactory.getConcept(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0xf979ba0450L, "jetbrains.mps.lang.structure.structure.ConceptDeclaration")) && AbstractConceptDeclaration_Behavior.call_isDefaultSubstitutable_7429110134803670673(SNodeOperations.asNode(it));
         }
@@ -107,7 +108,7 @@ public Integer combine(Integer it, Integer s) {
       }
       console.addText("Constructions available in console:\n\n");
       console.addText(output.toString());
-    } else if (AbstractConceptDeclaration_Behavior.call_isSubconceptOf_8134325418312549386(SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")), SNodeOperations.getNode("r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)", "473081947981012231"))) {
+    } else if (AbstractConceptDeclaration_Behavior.call_isSubconceptOf_8134325418312549386(SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")), SNodeOperations.getNode("r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)", "473081947981012231"))) {
       String helpPage;
       try {
         SNode chp = (SNode) (SNode) SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command"));
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java
index 3c2c395434ef..06a5b207087a 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java
@@ -2,28 +2,30 @@
 
 /*Generated by MPS */
 
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.model.SNode;
 import jetbrains.mps.console.tool.ConsoleContext;
 import jetbrains.mps.console.tool.ConsoleStream;
 import org.jetbrains.mps.openapi.language.SConcept;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior;
 
-public class HelpCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements ConsoleHelpProvider_BehaviorDescriptor {
+public class HelpCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements HelpProvider_BehaviorDescriptor {
   public HelpCommand_BehaviorDescriptor() {
   }
   public void virtual_doExecute_3321948346081469500(SNode thisNode, ConsoleContext context, ConsoleStream console) {
     HelpCommand_Behavior.virtual_doExecute_3321948346081469500(thisNode, context, console);
   }
   public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
+    return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
   }
   public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
   }
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
     return HelpCommand_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
   }
   public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
   }
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
     return HelpCommand_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_Behavior.java
similarity index 87%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_Behavior.java
index f478e8483526..576a3b95a79b 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_BehaviorDescriptor.java
new file mode 100644
index 000000000000..cb11f9bf3d40
--- /dev/null
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_BehaviorDescriptor.java
@@ -0,0 +1,35 @@
+package jetbrains.mps.console.base.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor;
+import org.jetbrains.mps.openapi.language.SConcept;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior;
+
+public class PrintExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor {
+  public PrintExpression_BehaviorDescriptor() {
+  }
+  public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
+    return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
+  }
+  public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+  }
+  public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
+    return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
+  }
+  public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
+    return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept);
+  }
+  public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+  }
+  public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
+    return PrintExpression_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
+  }
+  @Override
+  public String getConceptFqName() {
+    return "jetbrains.mps.console.base.structure.PrintExpression";
+  }
+}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeExpression_BehaviorDescriptor.java
similarity index 65%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeExpression_BehaviorDescriptor.java
index 3565be43463c..d53acec00c60 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public PrintNodeExpression_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.PrintNodeExpression";
+    return "jetbrains.mps.console.base.structure.PrintNodeExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java
similarity index 65%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java
index 1795b7f05a13..09d785fd4e2a 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public PrintNodeReferenceExpression_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression";
+    return "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintSequenceExpression_BehaviorDescriptor.java
similarity index 65%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintSequenceExpression_BehaviorDescriptor.java
index 1bd820f93fb2..7d505d815d26 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintSequenceExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public PrintSequenceExpression_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression";
+    return "jetbrains.mps.console.base.structure.PrintSequenceExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintTextExpression_BehaviorDescriptor.java
similarity index 65%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintTextExpression_BehaviorDescriptor.java
index f9f38413ebe9..5a753f4d301f 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintTextExpression_BehaviorDescriptor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
@@ -8,6 +8,6 @@ public PrintTextExpression_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.PrintTextExpression";
+    return "jetbrains.mps.console.base.structure.PrintTextExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_Behavior.java
similarity index 87%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_Behavior.java
index 2f991d4a4e5e..7d12187d687d 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_BehaviorDescriptor.java
similarity index 72%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_BehaviorDescriptor.java
index 22e2f443ecbb..2849ef980a44 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_BehaviorDescriptor.java
@@ -1,7 +1,8 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
+import jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.model.SNode;
 import org.jetbrains.mps.openapi.language.SConcept;
 
@@ -13,6 +14,6 @@ public Iterable<SNode> virtual_getSupportedParameters_4307205004146936444(SConce
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ProjectExpression";
+    return "jetbrains.mps.console.base.structure.ProjectExpression";
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectScope_BehaviorDescriptor.java
similarity index 53%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectScope_BehaviorDescriptor.java
index 53324fc66cdd..02ef1fa1b6a5 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectScope_BehaviorDescriptor.java
@@ -1,13 +1,14 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.base.behavior;
 
 /*Generated by MPS */
 
+import jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor;
 
 public class ProjectScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor {
   public ProjectScope_BehaviorDescriptor() {
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ProjectScope";
+    return "jetbrains.mps.console.base.structure.ProjectScope";
   }
 }
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info
index 88d9094619da..f18c562a57d5 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info
@@ -14,26 +14,35 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.ThrowStatement" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.TryCatchStatement" />
   <root>
+    <file name="AbstractPrintExpression_BehaviorDescriptor.java">
+      <unit at="8,0,19,0" name="jetbrains.mps.console.base.behavior.AbstractPrintExpression_BehaviorDescriptor" />
+    </file>
+    <file name="BLCommand_BehaviorDescriptor.java">
+      <unit at="13,0,54,0" name="jetbrains.mps.console.base.behavior.BLCommand_BehaviorDescriptor" />
+    </file>
+    <file name="BLExpression_BehaviorDescriptor.java">
+      <unit at="8,0,22,0" name="jetbrains.mps.console.base.behavior.BLExpression_BehaviorDescriptor" />
+    </file>
     <file name="BehaviorAspectDescriptor.java">
-      <unit at="9,0,50,0" name="jetbrains.mps.console.base.behavior.BehaviorAspectDescriptor" />
+      <unit at="9,0,70,0" name="jetbrains.mps.console.base.behavior.BehaviorAspectDescriptor" />
     </file>
     <file name="CommandHolder_BehaviorDescriptor.java">
       <unit at="10,0,24,0" name="jetbrains.mps.console.base.behavior.CommandHolder_BehaviorDescriptor" />
     </file>
     <file name="Command_BehaviorDescriptor.java">
-      <unit at="11,0,38,0" name="jetbrains.mps.console.base.behavior.Command_BehaviorDescriptor" />
-    </file>
-    <file name="ConsoleHelpProvider_BehaviorDescriptor.java">
-      <unit at="7,0,15,0" name="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor" />
+      <unit at="13,0,40,0" name="jetbrains.mps.console.base.behavior.Command_BehaviorDescriptor" />
     </file>
     <file name="ConsoleRoot_BehaviorDescriptor.java">
       <unit at="7,0,15,0" name="jetbrains.mps.console.base.behavior.ConsoleRoot_BehaviorDescriptor" />
     </file>
+    <file name="ExceptionHolder_BehaviorDescriptor.java">
+      <unit at="9,0,23,0" name="jetbrains.mps.console.base.behavior.ExceptionHolder_BehaviorDescriptor" />
+    </file>
     <file name="GeneratedCommand_BehaviorDescriptor.java">
       <unit at="9,0,20,0" name="jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor" />
     </file>
     <file name="HelpCommand_BehaviorDescriptor.java">
-      <unit at="10,0,36,0" name="jetbrains.mps.console.base.behavior.HelpCommand_BehaviorDescriptor" />
+      <unit at="12,0,38,0" name="jetbrains.mps.console.base.behavior.HelpCommand_BehaviorDescriptor" />
     </file>
     <file name="HelpConceptReference_BehaviorDescriptor.java">
       <unit at="7,0,15,0" name="jetbrains.mps.console.base.behavior.HelpConceptReference_BehaviorDescriptor" />
@@ -80,6 +89,27 @@
     <file name="PastedNodeReference_BehaviorDescriptor.java">
       <unit at="10,0,30,0" name="jetbrains.mps.console.base.behavior.PastedNodeReference_BehaviorDescriptor" />
     </file>
+    <file name="PrintExpression_BehaviorDescriptor.java">
+      <unit at="10,0,36,0" name="jetbrains.mps.console.base.behavior.PrintExpression_BehaviorDescriptor" />
+    </file>
+    <file name="PrintNodeExpression_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.console.base.behavior.PrintNodeExpression_BehaviorDescriptor" />
+    </file>
+    <file name="PrintNodeReferenceExpression_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.console.base.behavior.PrintNodeReferenceExpression_BehaviorDescriptor" />
+    </file>
+    <file name="PrintSequenceExpression_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.console.base.behavior.PrintSequenceExpression_BehaviorDescriptor" />
+    </file>
+    <file name="PrintTextExpression_BehaviorDescriptor.java">
+      <unit at="6,0,14,0" name="jetbrains.mps.console.base.behavior.PrintTextExpression_BehaviorDescriptor" />
+    </file>
+    <file name="ProjectExpression_BehaviorDescriptor.java">
+      <unit at="9,0,20,0" name="jetbrains.mps.console.base.behavior.ProjectExpression_BehaviorDescriptor" />
+    </file>
+    <file name="ProjectScope_BehaviorDescriptor.java">
+      <unit at="7,0,15,0" name="jetbrains.mps.console.base.behavior.ProjectScope_BehaviorDescriptor" />
+    </file>
     <file name="ResponseItem_BehaviorDescriptor.java">
       <unit at="6,0,8,0" name="jetbrains.mps.console.base.behavior.ResponseItem_BehaviorDescriptor" />
     </file>
@@ -92,98 +122,98 @@
   </root>
   <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/1769790395579662700">
     <file name="GeneratedCommand_Behavior.java">
-      <node id="1868797401534226287" at="26,25,27,71" concept="6" />
-      <node id="2921639075324765954" at="27,71,28,71" concept="6" />
-      <node id="2921639075324836207" at="29,24,30,17" concept="7" />
-      <node id="6822470975757273810" at="34,17,35,49" concept="6" />
-      <node id="2034046503373010526" at="35,49,36,71" concept="6" />
-      <node id="6822470975757313641" at="36,71,37,88" concept="6" />
-      <node id="6822470975757423455" at="38,35,39,95" concept="11" />
-      <node id="2034046503373010538" at="40,15,41,53" concept="6" />
-      <node id="4374601616592242315" at="43,57,44,39" concept="1" />
-      <node id="2034046503373010562" at="47,27,48,76" concept="1" />
-      <node id="2034046503373010583" at="50,60,51,74" concept="1" />
-      <node id="2034046503373010592" at="54,60,55,74" concept="1" />
-      <node id="3321948346082003251" at="59,21,60,38" concept="1" />
-      <node id="2034046503373010576" at="64,50,65,64" concept="1" />
-      <node id="1769790395579662700" at="73,0,74,0" concept="9" trace="LOG" />
-      <node id="1769790395579662700" at="22,0,24,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="2921639075324783254" at="28,71,31,9" concept="4" />
-      <node id="6822470975757413472" at="37,88,40,15" concept="4" />
-      <node id="2034046503373010583" at="49,63,52,25" concept="0" />
-      <node id="2034046503373010583" at="49,63,52,25" concept="4" />
-      <node id="2034046503373010592" at="53,66,56,25" concept="0" />
-      <node id="2034046503373010592" at="53,66,56,25" concept="4" />
-      <node id="2034046503373010576" at="63,53,66,15" concept="0" />
-      <node id="2034046503373010576" at="63,53,66,15" concept="4" />
-      <node id="4110587197470799629" at="46,39,57,23" concept="12" />
-      <node id="4110587197470667499" at="46,0,59,0" concept="5" trace="run#()V" />
-      <node id="4110587197470667497" at="44,39,59,21" concept="1" />
-      <node id="2034046503373010553" at="42,51,61,17" concept="4" />
-      <node id="2034046503373010548" at="41,53,62,15" concept="3" />
-      <node id="2034046503373010512" at="33,29,67,13" concept="12" />
-      <node id="1868797401535268429" at="33,0,69,0" concept="5" trace="run#()V" />
-      <node id="1868797401535190894" at="31,9,69,11" concept="1" />
-      <node id="1868797401535606493" at="26,0,71,0" concept="5" trace="run#()V" />
-      <node id="1868797401535557939" at="24,194,71,7" concept="1" />
-      <node id="1769790395579662700" at="24,0,73,0" concept="10" trace="virtual_execute_6854397602732226506#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/console/tool/ConsoleContext;Ljetbrains/mps/console/tool/ConsoleStream;Ljava/lang/Runnable;Ljava/lang/Runnable;)V" />
-      <scope id="1769790395579662862" at="22,43,22,43" />
-      <scope id="2921639075324783257" at="29,24,30,17" />
-      <scope id="6822470975757413475" at="38,35,39,95" />
-      <scope id="4110587197470799631" at="47,27,48,76" />
-      <scope id="2034046503373010583" at="50,60,51,74" />
-      <scope id="2034046503373010592" at="54,60,55,74" />
-      <scope id="2034046503373010576" at="64,50,65,64" />
-      <scope id="1769790395579662700" at="22,0,24,0">
+      <node id="1868797401534226287" at="27,25,28,92" concept="6" />
+      <node id="2921639075324765954" at="28,92,29,71" concept="6" />
+      <node id="2921639075324836207" at="30,24,31,17" concept="7" />
+      <node id="6822470975757273810" at="35,17,36,49" concept="6" />
+      <node id="4598452390224788762" at="36,49,37,59" concept="6" />
+      <node id="6822470975757313641" at="37,59,38,88" concept="6" />
+      <node id="6822470975757423455" at="39,35,40,95" concept="11" />
+      <node id="2034046503373010538" at="41,15,42,53" concept="6" />
+      <node id="4374601616592242315" at="44,57,45,39" concept="1" />
+      <node id="2034046503373010562" at="48,27,49,76" concept="1" />
+      <node id="2034046503373010583" at="51,60,52,74" concept="1" />
+      <node id="2034046503373010592" at="55,60,56,74" concept="1" />
+      <node id="3321948346082003251" at="60,21,61,38" concept="1" />
+      <node id="2034046503373010576" at="65,50,66,64" concept="1" />
+      <node id="1769790395579662700" at="74,0,75,0" concept="9" trace="LOG" />
+      <node id="1769790395579662700" at="23,0,25,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="2921639075324783254" at="29,71,32,9" concept="4" />
+      <node id="6822470975757413472" at="38,88,41,15" concept="4" />
+      <node id="2034046503373010583" at="50,63,53,25" concept="0" />
+      <node id="2034046503373010583" at="50,63,53,25" concept="4" />
+      <node id="2034046503373010592" at="54,66,57,25" concept="0" />
+      <node id="2034046503373010592" at="54,66,57,25" concept="4" />
+      <node id="2034046503373010576" at="64,53,67,15" concept="0" />
+      <node id="2034046503373010576" at="64,53,67,15" concept="4" />
+      <node id="4110587197470799629" at="47,39,58,23" concept="12" />
+      <node id="4110587197470667499" at="47,0,60,0" concept="5" trace="run#()V" />
+      <node id="4110587197470667497" at="45,39,60,21" concept="1" />
+      <node id="2034046503373010553" at="43,51,62,17" concept="4" />
+      <node id="2034046503373010548" at="42,53,63,15" concept="3" />
+      <node id="2034046503373010512" at="34,29,68,13" concept="12" />
+      <node id="1868797401535268429" at="34,0,70,0" concept="5" trace="run#()V" />
+      <node id="1868797401535190894" at="32,9,70,11" concept="1" />
+      <node id="1868797401535606493" at="27,0,72,0" concept="5" trace="run#()V" />
+      <node id="1868797401535557939" at="25,194,72,7" concept="1" />
+      <node id="1769790395579662700" at="25,0,74,0" concept="10" trace="virtual_execute_6854397602732226506#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/console/tool/ConsoleContext;Ljetbrains/mps/console/tool/ConsoleStream;Ljava/lang/Runnable;Ljava/lang/Runnable;)V" />
+      <scope id="1769790395579662862" at="23,43,23,43" />
+      <scope id="2921639075324783257" at="30,24,31,17" />
+      <scope id="6822470975757413475" at="39,35,40,95" />
+      <scope id="4110587197470799631" at="48,27,49,76" />
+      <scope id="2034046503373010583" at="51,60,52,74" />
+      <scope id="2034046503373010592" at="55,60,56,74" />
+      <scope id="2034046503373010576" at="65,50,66,64" />
+      <scope id="1769790395579662700" at="23,0,25,0">
         <var name="thisNode" id="1769790395579662700" />
       </scope>
-      <scope id="2034046503373010579" at="49,0,52,25">
+      <scope id="2034046503373010579" at="50,0,53,25">
         <var name="ignore" id="2034046503373010580" />
       </scope>
-      <scope id="2034046503373010582" at="49,63,52,25" />
-      <scope id="2034046503373010583" at="49,63,52,25" />
-      <scope id="2034046503373010587" at="53,0,56,25">
+      <scope id="2034046503373010582" at="50,63,53,25" />
+      <scope id="2034046503373010583" at="50,63,53,25" />
+      <scope id="2034046503373010587" at="54,0,57,25">
         <var name="ignore" id="2034046503373010589" />
       </scope>
-      <scope id="2034046503373010591" at="53,66,56,25" />
-      <scope id="2034046503373010592" at="53,66,56,25" />
-      <scope id="2034046503373010571" at="63,0,66,15">
+      <scope id="2034046503373010591" at="54,66,57,25" />
+      <scope id="2034046503373010592" at="54,66,57,25" />
+      <scope id="2034046503373010571" at="64,0,67,15">
         <var name="ignore" id="2034046503373010572" />
       </scope>
-      <scope id="2034046503373010575" at="63,53,66,15" />
-      <scope id="2034046503373010576" at="63,53,66,15" />
-      <scope id="4110587197470667501" at="46,39,57,23" />
-      <scope id="4110587197470667499" at="46,0,59,0" />
-      <scope id="2034046503373010561" at="43,57,60,38" />
-      <scope id="2034046503373010552" at="42,51,61,17" />
-      <scope id="2034046503373010548" at="41,53,62,15">
+      <scope id="2034046503373010575" at="64,53,67,15" />
+      <scope id="2034046503373010576" at="64,53,67,15" />
+      <scope id="4110587197470667501" at="47,39,58,23" />
+      <scope id="4110587197470667499" at="47,0,60,0" />
+      <scope id="2034046503373010561" at="44,57,61,38" />
+      <scope id="2034046503373010552" at="43,51,62,17" />
+      <scope id="2034046503373010548" at="42,53,63,15">
         <var name="method" id="2034046503373010551" />
       </scope>
-      <scope id="2034046503373010513" at="34,17,62,15">
+      <scope id="2034046503373010513" at="35,17,63,15">
         <var name="aClass" id="6822470975757313642" />
         <var name="methods" id="2034046503373010539" />
         <var name="module" id="6822470975757273811" />
-        <var name="name" id="2034046503373010527" />
+        <var name="name" id="4598452390224788763" />
       </scope>
-      <scope id="1868797401535268430" at="33,29,67,13" />
-      <scope id="1868797401535268429" at="33,0,69,0" />
-      <scope id="1868797401535606497" at="26,25,69,11">
+      <scope id="1868797401535268430" at="34,29,68,13" />
+      <scope id="1868797401535268429" at="34,0,70,0" />
+      <scope id="1868797401535606497" at="27,25,70,11">
         <var name="model" id="1868797401534226288" />
         <var name="result" id="2921639075324765955" />
       </scope>
-      <scope id="1868797401535606493" at="26,0,71,0" />
-      <scope id="5464054275389859618" at="24,194,71,7" />
-      <scope id="1769790395579662700" at="24,0,73,0">
+      <scope id="1868797401535606493" at="27,0,72,0" />
+      <scope id="5464054275389859618" at="25,194,72,7" />
+      <scope id="1769790395579662700" at="25,0,74,0">
         <var name="afterCallback" id="3321948346081687306" />
         <var name="beforeCallback" id="4374601616592181629" />
         <var name="console" id="4374601616592181627" />
         <var name="context" id="4374601616592181625" />
         <var name="thisNode" id="1769790395579662700" />
       </scope>
-      <unit id="4110587197470667499" at="45,69,59,19" name="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior$3" />
-      <unit id="1868797401535268429" at="32,39,69,9" name="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior$2" />
-      <unit id="1868797401535606491" at="25,66,71,5" name="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior$1" />
-      <unit id="1769790395579662700" at="21,0,75,0" name="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior" />
+      <unit id="4110587197470667499" at="46,69,60,19" name="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior$3" />
+      <unit id="1868797401535268429" at="33,39,70,9" name="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior$2" />
+      <unit id="1868797401535606491" at="26,66,72,5" name="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior$1" />
+      <unit id="1769790395579662700" at="22,0,76,0" name="jetbrains.mps.console.base.behavior.GeneratedCommand_Behavior" />
     </file>
   </root>
   <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/2348043250037383206">
@@ -197,6 +227,77 @@
       <unit id="2348043250037383206" at="11,0,16,0" name="jetbrains.mps.console.base.behavior.NodeReferencePresentation_Behavior" />
     </file>
   </root>
+  <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/2699636778858778743">
+    <file name="BLCommand_Behavior.java">
+      <node id="2699636778858790466" at="19,80,20,47" concept="7" />
+      <node id="2699636778858790750" at="22,69,23,178" concept="7" />
+      <node id="2699636778858876361" at="25,91,26,48" concept="6" />
+      <node id="2699636778858878821" at="26,48,27,84" concept="1" />
+      <node id="2699636778858801153" at="27,84,28,18" concept="7" />
+      <node id="7006261637493130861" at="30,94,31,38" concept="7" />
+      <node id="7006261637493131792" at="33,104,34,30" concept="7" />
+      <node id="2699636778858790492" at="36,60,37,63" concept="6" />
+      <node id="2699636778858790492" at="37,63,38,30" concept="6" />
+      <node id="2699636778858790492" at="38,30,39,220" concept="0" />
+      <node id="2699636778858790492" at="38,30,39,220" concept="0" />
+      <node id="2699636778858790492" at="38,30,39,220" concept="1" />
+      <node id="2699636778858790492" at="39,220,40,24" concept="7" />
+      <node id="2699636778858912197" at="42,62,43,63" concept="6" />
+      <node id="2699636778858912197" at="43,63,44,30" concept="6" />
+      <node id="2699636778858912197" at="44,30,45,227" concept="1" />
+      <node id="2699636778858912197" at="45,227,46,438" concept="1" />
+      <node id="2699636778858912197" at="46,438,47,24" concept="7" />
+      <node id="2699636778858778743" at="17,0,19,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="2699636778858912197" at="44,30,46,438" concept="0" />
+      <node id="2699636778858912197" at="44,30,46,438" concept="0" />
+      <node id="2699636778858778743" at="19,0,22,0" concept="10" trace="virtual_getExpectedRetType_1239354342632#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="2699636778858778743" at="22,0,25,0" concept="10" trace="virtual_getBody_1239354440022#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="2699636778858778743" at="30,0,33,0" concept="10" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="2699636778858778743" at="33,0,36,0" concept="10" trace="virtual_getShortDisplayString_7006261637493126103#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="2699636778858778743" at="25,0,30,0" concept="10" trace="virtual_getThrowableTypes_6204026822016975623#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/util/List;" />
+      <node id="2699636778858790492" at="36,0,42,0" concept="10" trace="_quotation_createNode_1tnz54_a0a0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="2699636778858912197" at="42,0,49,0" concept="10" trace="_quotation_createNode_1tnz54_a0a1a2#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="2699636778858778896" at="17,43,17,43" />
+      <scope id="2699636778858779397" at="19,80,20,47" />
+      <scope id="2699636778858779403" at="22,69,23,178" />
+      <scope id="7006261637493130711" at="30,94,31,38" />
+      <scope id="7006261637493131068" at="33,104,34,30" />
+      <scope id="2699636778858790492" at="38,30,39,220" />
+      <scope id="2699636778858778743" at="17,0,19,0">
+        <var name="thisNode" id="2699636778858778743" />
+      </scope>
+      <scope id="2699636778858912197" at="44,30,46,438" />
+      <scope id="2699636778858778743" at="19,0,22,0">
+        <var name="thisNode" id="2699636778858778743" />
+      </scope>
+      <scope id="2699636778858778743" at="22,0,25,0">
+        <var name="thisNode" id="2699636778858778743" />
+      </scope>
+      <scope id="2699636778858779409" at="25,91,28,18">
+        <var name="result" id="2699636778858876364" />
+      </scope>
+      <scope id="2699636778858778743" at="30,0,33,0">
+        <var name="thisConcept" id="2699636778858778743" />
+      </scope>
+      <scope id="2699636778858778743" at="33,0,36,0">
+        <var name="thisConcept" id="2699636778858778743" />
+      </scope>
+      <scope id="2699636778858790492" at="36,60,40,24">
+        <var name="facade" id="2699636778858790492" />
+        <var name="quotedNode_1" id="2699636778858790492" />
+      </scope>
+      <scope id="2699636778858778743" at="25,0,30,0">
+        <var name="thisNode" id="2699636778858778743" />
+      </scope>
+      <scope id="2699636778858912197" at="42,62,47,24">
+        <var name="facade" id="2699636778858912197" />
+        <var name="quotedNode_1" id="2699636778858912197" />
+      </scope>
+      <scope id="2699636778858790492" at="36,0,42,0" />
+      <scope id="2699636778858912197" at="42,0,49,0" />
+      <unit id="2699636778858778743" at="16,0,50,0" name="jetbrains.mps.console.base.behavior.BLCommand_Behavior" />
+    </file>
+  </root>
   <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/3002373989556540709">
     <file name="CommandHolder_Behavior.java">
       <node id="7455880135461190242" at="11,43,12,169" concept="1" />
@@ -317,265 +418,233 @@
       <unit id="3939645998855102457" at="14,0,32,0" name="jetbrains.mps.console.base.behavior.INodeWithReference_Behavior" />
     </file>
   </root>
+  <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/4225915845891297187">
+    <file name="AbstractPrintExpression_Behavior.java">
+      <node id="4225915845891297203" at="11,100,12,16" concept="7" />
+      <node id="4225915845891297187" at="9,0,11,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4225915845891297187" at="11,0,14,0" concept="10" trace="virtual_legalAsStatement_1262430001741498032#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Z" />
+      <scope id="4225915845891297189" at="9,43,9,43" />
+      <scope id="4225915845891297193" at="11,100,12,16" />
+      <scope id="4225915845891297187" at="9,0,11,0">
+        <var name="thisNode" id="4225915845891297187" />
+      </scope>
+      <scope id="4225915845891297187" at="11,0,14,0">
+        <var name="thisConcept" id="4225915845891297187" />
+      </scope>
+      <unit id="4225915845891297187" at="8,0,15,0" name="jetbrains.mps.console.base.behavior.AbstractPrintExpression_Behavior" />
+    </file>
+  </root>
   <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/473081947980701637">
     <file name="HelpCommand_Behavior.java">
-      <node id="6928665434436813463" at="37,41,38,338" concept="7" />
-      <node id="6928665434441819863" at="41,40,42,158" concept="7" />
-      <node id="6928665434441933129" at="45,40,46,157" concept="7" />
-      <node id="5932042262275306661" at="49,40,50,165" concept="7" />
-      <node id="7185170375690254627" at="52,15,53,104" concept="6" />
-      <node id="7185170375690453459" at="55,247,56,86" concept="1" />
-      <node id="7185170375690496282" at="57,9,58,81" concept="1" />
-      <node id="7006261637497467664" at="62,15,63,374" concept="7" />
-      <node id="473081947986262001" at="65,47,66,242" concept="1" />
-      <node id="7006261637498557561" at="68,17,69,235" concept="7" />
-      <node id="6928665434436626873" at="70,43,71,229" concept="7" />
-      <node id="7006261637499677206" at="75,10,76,79" concept="6" />
-      <node id="748410583115909756" at="78,48,79,51" concept="7" />
-      <node id="748410583115984103" at="82,55,83,33" concept="7" />
-      <node id="7006261637499275416" at="85,16,86,26" concept="6" />
-      <node id="7006261637499380687" at="87,68,88,90" concept="6" />
-      <node id="7006261637499380699" at="89,35,90,31" concept="1" />
-      <node id="7006261637499724808" at="92,9,93,61" concept="1" />
-      <node id="7006261637501117441" at="94,7,95,0" concept="8" />
-      <node id="7006261637500072679" at="95,0,96,49" concept="6" />
-      <node id="7006261637500077234" at="98,74,99,124" concept="1" />
-      <node id="7006261637500352229" at="101,155,102,33" concept="1" />
-      <node id="7006261637500093481" at="105,9,106,28" concept="1" />
-      <node id="748410583119129775" at="107,7,108,65" concept="1" />
-      <node id="3448341583993589079" at="108,65,109,41" concept="1" />
-      <node id="6928665434439673819" at="110,548,111,22" concept="6" />
-      <node id="6928665434439691294" at="112,11,113,363" concept="6" />
-      <node id="6928665434439674790" at="113,363,114,164" concept="1" />
-      <node id="1433263869220324265" at="114,164,115,481" concept="6" />
-      <node id="6928665434439684406" at="116,58,117,56" concept="1" />
-      <node id="6928665434440004412" at="118,16,119,36" concept="1" />
-      <node id="748410583119152993" at="125,94,126,69" concept="7" />
-      <node id="7185170375691175706" at="128,94,129,179" concept="7" />
-      <node id="473081947980701637" at="131,0,132,0" concept="9" trace="LOG" />
-      <node id="7185170375690669461" at="133,36,134,169" concept="7" />
-      <node id="7185170375690669461" at="135,5,136,16" concept="7" />
-      <node id="748410583116024892" at="139,36,140,40" concept="7" />
-      <node id="748410583116024892" at="141,5,142,13" concept="7" />
-      <node id="1114206087961102593" at="145,36,146,40" concept="7" />
-      <node id="1114206087961102593" at="147,5,148,13" concept="7" />
-      <node id="473081947980701637" at="32,0,34,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="6928665434440001583" at="118,14,120,9" concept="0" />
-      <node id="6928665434436790709" at="37,0,40,0" concept="5" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
-      <node id="6928665434441795895" at="41,0,44,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/String;" />
-      <node id="6928665434441908595" at="45,0,48,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/String;" />
-      <node id="5932042262275287360" at="49,0,52,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/String;" />
-      <node id="7185170375690375999" at="54,60,57,9" concept="4" />
-      <node id="473081947986262001" at="64,40,67,13" concept="0" />
-      <node id="473081947986262001" at="64,40,67,13" concept="4" />
-      <node id="748410583115907546" at="78,0,81,0" concept="5" trace="select#(Ljava/util/List;)Ljava/lang/Integer;" />
-      <node id="748410583115980109" at="82,0,85,0" concept="5" trace="combine#(Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Integer;" />
-      <node id="7006261637499380697" at="88,90,91,11" concept="4" />
-      <node id="7006261637500126800" at="100,63,103,13" concept="2" />
-      <node id="473081947980701637" at="125,0,128,0" concept="10" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="473081947980701637" at="128,0,131,0" concept="10" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="7185170375690669461" at="132,73,135,5" concept="4" />
-      <node id="748410583116024892" at="138,73,141,5" concept="4" />
-      <node id="1114206087961102593" at="144,75,147,5" concept="4" />
-      <node id="748410583118390906" at="67,13,72,13" concept="12" />
-      <node id="748410583117702051" at="99,124,104,11" concept="4" />
-      <node id="6928665434439882323" at="115,481,120,9" concept="4" />
-      <node id="7185170375690345297" at="53,104,59,7" concept="3" />
-      <node id="7006261637499380683" at="86,26,92,9" concept="3" />
-      <node id="7185170375690669461" at="132,0,138,0" concept="10" trace="check_x46ur7_a0a0c0a0a#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/String;" />
-      <node id="748410583116024892" at="138,0,144,0" concept="10" trace="check_x46ur7_a0a0b0f0a0a#(Ljava/lang/String;)I" />
-      <node id="1114206087961102593" at="144,0,150,0" concept="10" trace="check_x46ur7_a0a0b0a0i0a0a#(Ljava/lang/String;)I" />
-      <node id="748410583116912243" at="97,66,105,9" concept="2" />
-      <node id="7006261637498594250" at="96,49,107,7" concept="3" />
-      <node id="6928665434439673438" at="111,22,122,7" concept="12" />
-      <node id="473081947986135948" at="61,55,73,11" concept="12" />
-      <node id="6928665434435324984" at="61,0,75,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/internal/collections/runtime/IListSequence;" />
-      <node id="748410583115738436" at="59,7,75,10" concept="6" />
-      <node id="6928665434434403639" at="35,188,52,15" concept="6" />
-      <node id="748410583115848789" at="76,79,94,7" concept="2" />
-      <node id="6928665434439181588" at="34,123,123,5" concept="4" />
-      <node id="473081947980701637" at="34,0,125,0" concept="10" trace="virtual_doExecute_3321948346081469500#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/console/tool/ConsoleContext;Ljetbrains/mps/console/tool/ConsoleStream;)V" />
-      <scope id="473081947980701790" at="32,43,32,43" />
-      <scope id="6928665434439673441" at="121,0,121,42">
+      <node id="6928665434436813463" at="38,41,39,338" concept="7" />
+      <node id="6928665434441819863" at="42,40,43,158" concept="7" />
+      <node id="6928665434441933129" at="46,40,47,157" concept="7" />
+      <node id="5932042262275306661" at="50,40,51,165" concept="7" />
+      <node id="7185170375690254627" at="53,15,54,104" concept="6" />
+      <node id="7185170375690453459" at="56,247,57,86" concept="1" />
+      <node id="7185170375690496282" at="58,9,59,81" concept="1" />
+      <node id="7006261637497467664" at="63,15,64,374" concept="7" />
+      <node id="473081947986262001" at="66,47,67,242" concept="1" />
+      <node id="7006261637498557561" at="69,17,70,235" concept="7" />
+      <node id="6928665434436626873" at="71,43,72,229" concept="7" />
+      <node id="7006261637499677206" at="76,10,77,79" concept="6" />
+      <node id="748410583115909756" at="79,48,80,51" concept="7" />
+      <node id="748410583115984103" at="83,55,84,33" concept="7" />
+      <node id="7006261637499275416" at="86,16,87,26" concept="6" />
+      <node id="7006261637499380687" at="88,68,89,90" concept="6" />
+      <node id="7006261637499380699" at="90,35,91,31" concept="1" />
+      <node id="7006261637499724808" at="93,9,94,61" concept="1" />
+      <node id="7006261637501117441" at="95,7,96,0" concept="8" />
+      <node id="7006261637500072679" at="96,0,97,49" concept="6" />
+      <node id="7006261637500077234" at="99,74,100,124" concept="1" />
+      <node id="7006261637500352229" at="102,155,103,33" concept="1" />
+      <node id="7006261637500093481" at="106,9,107,28" concept="1" />
+      <node id="748410583119129775" at="108,7,109,65" concept="1" />
+      <node id="3448341583993589079" at="109,65,110,41" concept="1" />
+      <node id="6928665434439673819" at="111,553,112,22" concept="6" />
+      <node id="6928665434439691294" at="113,11,114,363" concept="6" />
+      <node id="6928665434439674790" at="114,363,115,164" concept="1" />
+      <node id="1433263869220324265" at="115,164,116,481" concept="6" />
+      <node id="6928665434439684406" at="117,58,118,56" concept="1" />
+      <node id="6928665434440004412" at="119,16,120,36" concept="1" />
+      <node id="748410583119152993" at="126,94,127,69" concept="7" />
+      <node id="7185170375691175706" at="129,94,130,179" concept="7" />
+      <node id="473081947980701637" at="132,0,133,0" concept="9" trace="LOG" />
+      <node id="7185170375690669461" at="134,36,135,169" concept="7" />
+      <node id="7185170375690669461" at="136,5,137,16" concept="7" />
+      <node id="748410583116024892" at="140,36,141,40" concept="7" />
+      <node id="748410583116024892" at="142,5,143,13" concept="7" />
+      <node id="1114206087961102593" at="146,36,147,40" concept="7" />
+      <node id="1114206087961102593" at="148,5,149,13" concept="7" />
+      <node id="473081947980701637" at="33,0,35,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="6928665434440001583" at="119,14,121,9" concept="0" />
+      <node id="6928665434436790709" at="38,0,41,0" concept="5" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
+      <node id="6928665434441795895" at="42,0,45,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/String;" />
+      <node id="6928665434441908595" at="46,0,49,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/String;" />
+      <node id="5932042262275287360" at="50,0,53,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/String;" />
+      <node id="7185170375690375999" at="55,60,58,9" concept="4" />
+      <node id="473081947986262001" at="65,40,68,13" concept="0" />
+      <node id="473081947986262001" at="65,40,68,13" concept="4" />
+      <node id="748410583115907546" at="79,0,82,0" concept="5" trace="select#(Ljava/util/List;)Ljava/lang/Integer;" />
+      <node id="748410583115980109" at="83,0,86,0" concept="5" trace="combine#(Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Integer;" />
+      <node id="7006261637499380697" at="89,90,92,11" concept="4" />
+      <node id="7006261637500126800" at="101,63,104,13" concept="2" />
+      <node id="473081947980701637" at="126,0,129,0" concept="10" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="473081947980701637" at="129,0,132,0" concept="10" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="7185170375690669461" at="133,73,136,5" concept="4" />
+      <node id="748410583116024892" at="139,73,142,5" concept="4" />
+      <node id="1114206087961102593" at="145,75,148,5" concept="4" />
+      <node id="748410583118390906" at="68,13,73,13" concept="12" />
+      <node id="748410583117702051" at="100,124,105,11" concept="4" />
+      <node id="6928665434439882323" at="116,481,121,9" concept="4" />
+      <node id="7185170375690345297" at="54,104,60,7" concept="3" />
+      <node id="7006261637499380683" at="87,26,93,9" concept="3" />
+      <node id="7185170375690669461" at="133,0,139,0" concept="10" trace="check_x46ur7_a0a0c0a0a#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/String;" />
+      <node id="748410583116024892" at="139,0,145,0" concept="10" trace="check_x46ur7_a0a0b0f0a0a#(Ljava/lang/String;)I" />
+      <node id="1114206087961102593" at="145,0,151,0" concept="10" trace="check_x46ur7_a0a0b0a0i0a0a#(Ljava/lang/String;)I" />
+      <node id="748410583116912243" at="98,66,106,9" concept="2" />
+      <node id="7006261637498594250" at="97,49,108,7" concept="3" />
+      <node id="6928665434439673438" at="112,22,123,7" concept="12" />
+      <node id="473081947986135948" at="62,55,74,11" concept="12" />
+      <node id="6928665434435324984" at="62,0,76,0" concept="5" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/internal/collections/runtime/IListSequence;" />
+      <node id="748410583115738436" at="60,7,76,10" concept="6" />
+      <node id="6928665434434403639" at="36,188,53,15" concept="6" />
+      <node id="748410583115848789" at="77,79,95,7" concept="2" />
+      <node id="6928665434439181588" at="35,123,124,5" concept="4" />
+      <node id="473081947980701637" at="35,0,126,0" concept="10" trace="virtual_doExecute_3321948346081469500#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/console/tool/ConsoleContext;Ljetbrains/mps/console/tool/ConsoleStream;)V" />
+      <scope id="473081947980701790" at="33,43,33,43" />
+      <scope id="6928665434439673441" at="122,0,122,42">
         <var name="ignored" id="6928665434439673443" />
       </scope>
-      <scope id="6928665434439673447" at="121,42,121,42" />
-      <scope id="6928665434436790710" at="37,41,38,338" />
-      <scope id="6928665434441795896" at="41,40,42,158" />
-      <scope id="6928665434441908596" at="45,40,46,157" />
-      <scope id="5932042262275287361" at="49,40,50,165" />
-      <scope id="7185170375690376000" at="55,247,56,86" />
-      <scope id="473081947986135950" at="62,15,63,374" />
-      <scope id="473081947986262001" at="65,47,66,242" />
-      <scope id="748410583118390908" at="68,17,69,235" />
-      <scope id="748410583118390909" at="70,0,71,229">
+      <scope id="6928665434439673447" at="122,42,122,42" />
+      <scope id="6928665434436790710" at="38,41,39,338" />
+      <scope id="6928665434441795896" at="42,40,43,158" />
+      <scope id="6928665434441908596" at="46,40,47,157" />
+      <scope id="5932042262275287361" at="50,40,51,165" />
+      <scope id="7185170375690376000" at="56,247,57,86" />
+      <scope id="473081947986135950" at="63,15,64,374" />
+      <scope id="473081947986262001" at="66,47,67,242" />
+      <scope id="748410583118390908" at="69,17,70,235" />
+      <scope id="748410583118390909" at="71,0,72,229">
         <var name="e1" id="748410583118390911" />
       </scope>
-      <scope id="748410583118390915" at="70,43,71,229" />
-      <scope id="748410583115907547" at="78,48,79,51" />
-      <scope id="748410583115980110" at="82,55,83,33" />
-      <scope id="7006261637499380698" at="89,35,90,31" />
-      <scope id="7006261637500126803" at="101,155,102,33" />
-      <scope id="6928665434439882326" at="116,58,117,56" />
-      <scope id="6928665434440001584" at="118,16,119,36" />
-      <scope id="473081947983370828" at="125,94,126,69" />
-      <scope id="7185170375691171353" at="128,94,129,179" />
-      <scope id="7185170375690669461" at="133,36,134,169" />
-      <scope id="748410583116024892" at="139,36,140,40" />
-      <scope id="1114206087961102593" at="145,36,146,40" />
-      <scope id="473081947980701637" at="32,0,34,0">
+      <scope id="748410583118390915" at="71,43,72,229" />
+      <scope id="748410583115907547" at="79,48,80,51" />
+      <scope id="748410583115980110" at="83,55,84,33" />
+      <scope id="7006261637499380698" at="90,35,91,31" />
+      <scope id="7006261637500126803" at="102,155,103,33" />
+      <scope id="6928665434439882326" at="117,58,118,56" />
+      <scope id="6928665434440001584" at="119,16,120,36" />
+      <scope id="473081947983370828" at="126,94,127,69" />
+      <scope id="7185170375691171353" at="129,94,130,179" />
+      <scope id="7185170375690669461" at="134,36,135,169" />
+      <scope id="748410583116024892" at="140,36,141,40" />
+      <scope id="1114206087961102593" at="146,36,147,40" />
+      <scope id="473081947980701637" at="33,0,35,0">
         <var name="thisNode" id="473081947980701637" />
       </scope>
-      <scope id="6928665434436790709" at="37,0,40,0">
+      <scope id="6928665434436790709" at="38,0,41,0">
         <var name="it" id="6928665434436790709" />
       </scope>
-      <scope id="6928665434441795895" at="41,0,44,0">
+      <scope id="6928665434441795895" at="42,0,45,0">
         <var name="it" id="6928665434441795895" />
       </scope>
-      <scope id="6928665434441908595" at="45,0,48,0">
+      <scope id="6928665434441908595" at="46,0,49,0">
         <var name="it" id="6928665434441908595" />
       </scope>
-      <scope id="5932042262275287360" at="49,0,52,0">
+      <scope id="5932042262275287360" at="50,0,53,0">
         <var name="it" id="5932042262275287360" />
       </scope>
-      <scope id="473081947986262001" at="64,40,67,13" />
-      <scope id="748410583115907546" at="78,0,81,0">
+      <scope id="473081947986262001" at="65,40,68,13" />
+      <scope id="748410583115907546" at="79,0,82,0">
         <var name="it" id="748410583115907546" />
       </scope>
-      <scope id="748410583115980109" at="82,0,85,0">
+      <scope id="748410583115980109" at="83,0,86,0">
         <var name="it" id="748410583115980109" />
         <var name="s" id="748410583115980109" />
       </scope>
-      <scope id="7006261637500126800" at="100,63,103,13">
+      <scope id="7006261637500126800" at="101,63,104,13">
         <var name="j" id="7006261637500126806" />
       </scope>
-      <scope id="748410583117702054" at="100,63,103,13" />
-      <scope id="473081947980701637" at="125,0,128,0">
+      <scope id="748410583117702054" at="101,63,104,13" />
+      <scope id="473081947980701637" at="126,0,129,0">
         <var name="thisConcept" id="473081947980701637" />
       </scope>
-      <scope id="473081947980701637" at="128,0,131,0">
+      <scope id="473081947980701637" at="129,0,132,0">
         <var name="thisConcept" id="473081947980701637" />
       </scope>
-      <scope id="7185170375690345303" at="54,60,58,81" />
-      <scope id="7006261637499380686" at="87,68,91,11">
+      <scope id="7185170375690345303" at="55,60,59,81" />
+      <scope id="7006261637499380686" at="88,68,92,11">
         <var name="length" id="7006261637499380688" />
       </scope>
-      <scope id="7185170375690669461" at="132,73,136,16" />
-      <scope id="748410583116024892" at="138,73,142,13" />
-      <scope id="1114206087961102593" at="144,75,148,13" />
-      <scope id="7185170375690345297" at="53,104,59,7">
+      <scope id="7185170375690669461" at="133,73,137,16" />
+      <scope id="748410583116024892" at="139,73,143,13" />
+      <scope id="1114206087961102593" at="145,75,149,13" />
+      <scope id="7185170375690345297" at="54,104,60,7">
         <var name="e" id="7185170375690345299" />
       </scope>
-      <scope id="7006261637499380683" at="86,26,92,9">
+      <scope id="7006261637499380683" at="87,26,93,9">
         <var name="row" id="7006261637499380684" />
       </scope>
-      <scope id="748410583116912246" at="98,74,104,11" />
-      <scope id="7185170375690669461" at="132,0,138,0">
+      <scope id="748410583116912246" at="99,74,105,11" />
+      <scope id="7185170375690669461" at="133,0,139,0">
         <var name="checkedDotOperand" id="7185170375690669461" />
       </scope>
-      <scope id="748410583116024892" at="138,0,144,0">
+      <scope id="748410583116024892" at="139,0,145,0">
         <var name="checkedDotOperand" id="748410583116024892" />
       </scope>
-      <scope id="1114206087961102593" at="144,0,150,0">
+      <scope id="1114206087961102593" at="145,0,151,0">
         <var name="checkedDotOperand" id="1114206087961102593" />
       </scope>
-      <scope id="473081947986135951" at="64,0,72,13">
+      <scope id="473081947986135951" at="65,0,73,13">
         <var name="e" id="473081947986135953" />
       </scope>
-      <scope id="473081947986135957" at="64,40,72,13" />
-      <scope id="748410583115848792" at="85,16,93,61">
+      <scope id="473081947986135957" at="65,40,73,13" />
+      <scope id="748410583115848792" at="86,16,94,61">
         <var name="maxLength" id="7006261637499275419" />
       </scope>
-      <scope id="748410583116912243" at="97,66,105,9">
+      <scope id="748410583116912243" at="98,66,106,9">
         <var name="i" id="748410583116912249" />
       </scope>
-      <scope id="6928665434439673440" at="112,11,120,9">
+      <scope id="6928665434439673440" at="113,11,121,9">
         <var name="chp" id="6928665434439691297" />
         <var name="helpHead" id="1433263869220324266" />
       </scope>
-      <scope id="7006261637498594256" at="97,66,106,28" />
-      <scope id="7006261637498594250" at="96,49,107,7">
+      <scope id="7006261637498594256" at="98,66,107,28" />
+      <scope id="7006261637498594250" at="97,49,108,7">
         <var name="row" id="7006261637498594252" />
       </scope>
-      <scope id="6928665434435324985" at="61,55,73,11" />
-      <scope id="6928665434439380119" at="110,548,122,7">
+      <scope id="6928665434435324985" at="62,55,74,11" />
+      <scope id="6928665434439380119" at="111,553,123,7">
         <var name="helpPage" id="6928665434439673822" />
       </scope>
-      <scope id="6928665434435324984" at="61,0,75,0">
+      <scope id="6928665434435324984" at="62,0,76,0">
         <var name="it" id="6928665434435324984" />
       </scope>
-      <scope id="748410583115848789" at="76,79,94,7">
+      <scope id="748410583115848789" at="77,79,95,7">
         <var name="i" id="748410583115848795" />
       </scope>
-      <scope id="6928665434439181591" at="35,188,109,41">
+      <scope id="6928665434439181591" at="36,188,110,41">
         <var name="constructions" id="6928665434434403642" />
         <var name="groupedConstructions" id="7185170375690254630" />
         <var name="maxLens" id="7006261637499677209" />
         <var name="output" id="7006261637500072680" />
         <var name="resultList" id="748410583115738439" />
       </scope>
-      <scope id="473081947980702287" at="34,123,123,5" />
-      <scope id="473081947980701637" at="34,0,125,0">
+      <scope id="473081947980702287" at="35,123,124,5" />
+      <scope id="473081947980701637" at="35,0,126,0">
         <var name="console" id="473081947980702290" />
         <var name="context" id="473081947980702288" />
         <var name="thisNode" id="473081947980701637" />
       </scope>
-      <unit id="6928665434436790709" at="36,334,40,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$1" />
-      <unit id="6928665434441795895" at="40,18,44,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$2" />
-      <unit id="6928665434441908595" at="44,28,48,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$3" />
-      <unit id="5932042262275287360" at="48,28,52,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$4" />
-      <unit id="748410583115907546" at="77,71,81,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$6" />
-      <unit id="748410583115980109" at="81,26,85,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$7" />
-      <unit id="6928665434435324984" at="60,171,75,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$5" />
-      <unit id="473081947980701637" at="31,0,151,0" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/473081947982699336">
-    <file name="ConsoleHelpProvider_Behavior.java">
-      <node id="1433263869219891526" at="16,94,17,278" concept="7" />
-      <node id="7006261637493128366" at="19,94,20,16" concept="7" />
-      <node id="6928665434441165614" at="22,91,23,163" concept="7" />
-      <node id="6928665434437563301" at="25,104,26,275" concept="6" />
-      <node id="6928665434437576073" at="27,48,28,19" concept="7" />
-      <node id="6928665434437576528" at="29,12,30,256" concept="7" />
-      <node id="6891027939994894629" at="33,99,34,236" concept="7" />
-      <node id="473081947982699336" at="14,0,16,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="6928665434437576376" at="29,10,31,5" concept="0" />
-      <node id="473081947982699336" at="16,0,19,0" concept="10" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="473081947982699336" at="19,0,22,0" concept="10" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="473081947982699336" at="22,0,25,0" concept="10" trace="virtual_getGroup_6928665434441162387#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="473081947982699336" at="33,0,36,0" concept="10" trace="virtual_getDisplayString_6891027939994892943#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="6928665434437564316" at="26,275,31,5" concept="4" />
-      <node id="473081947982699336" at="25,0,33,0" concept="10" trace="virtual_getShortDisplayString_7006261637493126103#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="473081947982699338" at="14,43,14,43" />
-      <scope id="473081947982699342" at="16,94,17,278" />
-      <scope id="7006261637493125454" at="19,94,20,16" />
-      <scope id="6928665434441162390" at="22,91,23,163" />
-      <scope id="6928665434437564319" at="27,48,28,19" />
-      <scope id="6928665434437576377" at="29,12,30,256" />
-      <scope id="6891027939994892946" at="33,99,34,236" />
-      <scope id="473081947982699336" at="14,0,16,0">
-        <var name="thisNode" id="473081947982699336" />
-      </scope>
-      <scope id="473081947982699336" at="16,0,19,0">
-        <var name="thisConcept" id="473081947982699336" />
-      </scope>
-      <scope id="473081947982699336" at="19,0,22,0">
-        <var name="thisConcept" id="473081947982699336" />
-      </scope>
-      <scope id="473081947982699336" at="22,0,25,0">
-        <var name="thisConcept" id="473081947982699336" />
-      </scope>
-      <scope id="473081947982699336" at="33,0,36,0">
-        <var name="thisConcept" id="473081947982699336" />
-      </scope>
-      <scope id="7006261637493126106" at="25,104,31,5">
-        <var name="alias" id="6928665434437563304" />
-      </scope>
-      <scope id="473081947982699336" at="25,0,33,0">
-        <var name="thisConcept" id="473081947982699336" />
-      </scope>
-      <unit id="473081947982699336" at="13,0,37,0" name="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
+      <unit id="6928665434436790709" at="37,353,41,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$1" />
+      <unit id="6928665434441795895" at="41,18,45,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$2" />
+      <unit id="6928665434441908595" at="45,28,49,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$3" />
+      <unit id="5932042262275287360" at="49,28,53,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$4" />
+      <unit id="748410583115907546" at="78,71,82,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$6" />
+      <unit id="748410583115980109" at="82,26,86,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$7" />
+      <unit id="6928665434435324984" at="61,171,76,7" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior$5" />
+      <unit id="473081947980701637" at="32,0,152,0" name="jetbrains.mps.console.base.behavior.HelpCommand_Behavior" />
     </file>
   </root>
   <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/5842059399443118726">
@@ -638,6 +707,35 @@
       <unit id="5842059399443118726" at="13,0,43,0" name="jetbrains.mps.console.base.behavior.PastedNodeReference_Behavior" />
     </file>
   </root>
+  <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/6558068108108193352">
+    <file name="ExceptionHolder_Behavior.java">
+      <node id="4221956679900513485" at="16,91,17,222" concept="6" />
+      <node id="4221956679900513493" at="17,222,18,61" concept="1" />
+      <node id="4221956679900513501" at="18,61,19,80" concept="6" />
+      <node id="4221956679900513512" at="19,80,20,18" concept="1" />
+      <node id="6558068108108282033" at="22,80,23,189" concept="7" />
+      <node id="6558068108108193352" at="14,0,16,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="6558068108108193352" at="22,0,25,0" concept="10" trace="virtual_canExecute_3282455643657932881#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
+      <node id="6558068108108193352" at="16,0,22,0" concept="10" trace="virtual_execute_8517397753922085153#(Lorg/jetbrains/mps/openapi/model/SNode;Lcom/intellij/openapi/project/Project;)V" />
+      <scope id="6558068108108193505" at="14,43,14,43" />
+      <scope id="6558068108108193832" at="22,80,23,189" />
+      <scope id="6558068108108193352" at="14,0,16,0">
+        <var name="thisNode" id="6558068108108193352" />
+      </scope>
+      <scope id="6558068108108193352" at="22,0,25,0">
+        <var name="thisNode" id="6558068108108193352" />
+      </scope>
+      <scope id="6558068108108193824" at="16,91,20,18">
+        <var name="contents" id="4221956679900513486" />
+        <var name="dialog" id="4221956679900513502" />
+      </scope>
+      <scope id="6558068108108193352" at="16,0,22,0">
+        <var name="project" id="6558068108108193825" />
+        <var name="thisNode" id="6558068108108193352" />
+      </scope>
+      <unit id="6558068108108193352" at="13,0,26,0" name="jetbrains.mps.console.base.behavior.ExceptionHolder_Behavior" />
+    </file>
+  </root>
   <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/6854397602732226001">
     <file name="Command_Behavior.java">
       <node id="7006261637493129681" at="11,90,12,21" concept="7" />
@@ -670,6 +768,60 @@
       <unit id="691634242167805890" at="9,0,16,0" name="jetbrains.mps.console.base.behavior.ModifiedCommandHistoryItem_Behavior" />
     </file>
   </root>
+  <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/7006261637493132074">
+    <file name="BLExpression_Behavior.java">
+      <node id="7006261637493132088" at="11,94,12,57" concept="7" />
+      <node id="7006261637493135794" at="14,104,15,26" concept="7" />
+      <node id="7006261637493132074" at="9,0,11,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7006261637493132074" at="11,0,14,0" concept="10" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <node id="7006261637493132074" at="14,0,17,0" concept="10" trace="virtual_getShortDisplayString_7006261637493126103#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="7006261637493132076" at="9,43,9,43" />
+      <scope id="7006261637493132081" at="11,94,12,57" />
+      <scope id="7006261637493135778" at="14,104,15,26" />
+      <scope id="7006261637493132074" at="9,0,11,0">
+        <var name="thisNode" id="7006261637493132074" />
+      </scope>
+      <scope id="7006261637493132074" at="11,0,14,0">
+        <var name="thisConcept" id="7006261637493132074" />
+      </scope>
+      <scope id="7006261637493132074" at="14,0,17,0">
+        <var name="thisConcept" id="7006261637493132074" />
+      </scope>
+      <unit id="7006261637493132074" at="8,0,18,0" name="jetbrains.mps.console.base.behavior.BLExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/7006261637496586602">
+    <file name="PrintExpression_Behavior.java">
+      <node id="7006261637496599738" at="11,94,12,43" concept="7" />
+      <node id="7006261637496586602" at="9,0,11,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7006261637496586602" at="11,0,14,0" concept="10" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="7006261637496586604" at="9,43,9,43" />
+      <scope id="7006261637496586609" at="11,94,12,43" />
+      <scope id="7006261637496586602" at="9,0,11,0">
+        <var name="thisNode" id="7006261637496586602" />
+      </scope>
+      <scope id="7006261637496586602" at="11,0,14,0">
+        <var name="thisConcept" id="7006261637496586602" />
+      </scope>
+      <unit id="7006261637496586602" at="8,0,15,0" name="jetbrains.mps.console.base.behavior.PrintExpression_Behavior" />
+    </file>
+  </root>
+  <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/7284872370239343379">
+    <file name="ProjectExpression_Behavior.java">
+      <node id="4225915845891119382" at="11,114,12,16" concept="7" />
+      <node id="7284872370239343379" at="9,0,11,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7284872370239343379" at="11,0,14,0" concept="10" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
+      <scope id="7284872370239343381" at="9,43,9,43" />
+      <scope id="7284872370239343433" at="11,114,12,16" />
+      <scope id="7284872370239343379" at="9,0,11,0">
+        <var name="thisNode" id="7284872370239343379" />
+      </scope>
+      <scope id="7284872370239343379" at="11,0,14,0">
+        <var name="thisConcept" id="7284872370239343379" />
+      </scope>
+      <unit id="7284872370239343379" at="8,0,15,0" name="jetbrains.mps.console.base.behavior.ProjectExpression_Behavior" />
+    </file>
+  </root>
   <root nodeRef="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)/8517397753921951854">
     <file name="IActionHolder_Behavior.java">
       <node id="8517397753921951854" at="8,0,10,0" concept="10" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java
index 9822a23710cd..8db45403187b 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java
@@ -56,7 +56,7 @@ public SNodeReference getSearchScopeValidatorNode() {
           }
           @Override
           public Scope createScope(final IOperationContext operationContext, final ReferenceConstraintsContext _context) {
-            return new FilteringScope(new SubconceptsScope(MetaAdapterFactory.getInterfaceConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L, "jetbrains.mps.console.base.structure.ConsoleHelpProvider").getDeclarationNode(), _context.getModel()) {
+            return new FilteringScope(new SubconceptsScope(MetaAdapterFactory.getInterfaceConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L, "jetbrains.mps.lang.smodel.query.structure.HelpProvider").getDeclarationNode(), _context.getModel()) {
               public String getName(SNode child) {
                 return BehaviorReflection.invokeVirtualStatic(String.class, SNodeOperations.asSConcept(((SNode) child)), "virtual_getShortDisplayString_7006261637493126103", new Object[]{});
               }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Actions.java
similarity index 86%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Actions.java
index a1a4ef1d82cc..0ce398e39139 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Actions.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.console.base.editor;
 
 /*Generated by MPS */
 
@@ -25,7 +25,7 @@ public void execute(EditorContext editorContext) {
       this.execute_internal(editorContext, this.myNode);
     }
     public void execute_internal(EditorContext editorContext, SNode node) {
-      SNodeOperations.replaceWithAnother(node, SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
+      SNodeOperations.replaceWithAnother(node, SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
     }
   }
   public static class AbstractPrintExpression_Actions_BACKSPACE extends AbstractCellAction {
@@ -37,7 +37,7 @@ public void execute(EditorContext editorContext) {
       this.execute_internal(editorContext, this.myNode);
     }
     public void execute_internal(EditorContext editorContext, SNode node) {
-      SNodeOperations.replaceWithAnother(node, SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
+      SNodeOperations.replaceWithAnother(node, SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
     }
   }
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Editor.java
similarity index 95%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Editor.java
index 9dde009944e0..49c30cbd4807 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.console.base.editor;
 
 /*Generated by MPS */
 
@@ -41,11 +41,11 @@ public static class ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0 ext
     public ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0() {
     }
     public String getReplacementConceptName() {
-      return "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression";
+      return "jetbrains.mps.console.base.structure.AbstractPrintExpression";
     }
   }
   private EditorCell createRefNode_9ckmec_b0(EditorContext editorContext, SNode node) {
-    SingleRoleCellProvider provider = new AbstractPrintExpression_Editor.objectSingleRoleHandler_9ckmec_b0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), editorContext);
+    SingleRoleCellProvider provider = new AbstractPrintExpression_Editor.objectSingleRoleHandler_9ckmec_b0(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), editorContext);
     return provider.createCell();
   }
   private class objectSingleRoleHandler_9ckmec_b0 extends SingleRoleCellProvider {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLCommand_Editor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLCommand_Editor.java
similarity index 97%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLCommand_Editor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLCommand_Editor.java
index a90fba8ab033..538bde505d0b 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLCommand_Editor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLCommand_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.console.base.editor;
 
 /*Generated by MPS */
 
@@ -63,7 +63,7 @@ private EditorCell createConstant_zc016d_a0a(EditorContext editorContext, SNode
     return editorCell;
   }
   private EditorCell createRefNode_zc016d_b0a(EditorContext editorContext, SNode node) {
-    SingleRoleCellProvider provider = new BLCommand_Editor.bodySingleRoleHandler_zc016d_b0a(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), editorContext);
+    SingleRoleCellProvider provider = new BLCommand_Editor.bodySingleRoleHandler_zc016d_b0a(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), editorContext);
     return provider.createCell();
   }
   private class bodySingleRoleHandler_zc016d_b0a extends SingleRoleCellProvider {
@@ -110,7 +110,7 @@ private EditorCell createConstant_zc016d_c0a(EditorContext editorContext, SNode
     return editorCell;
   }
   private EditorCell createRefNode_zc016d_a0(EditorContext editorContext, SNode node) {
-    SingleRoleCellProvider provider = new BLCommand_Editor.bodySingleRoleHandler_zc016d_a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), editorContext);
+    SingleRoleCellProvider provider = new BLCommand_Editor.bodySingleRoleHandler_zc016d_a0(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), editorContext);
     return provider.createCell();
   }
   private class bodySingleRoleHandler_zc016d_a0 extends SingleRoleCellProvider {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Actions.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Actions.java
similarity index 82%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Actions.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Actions.java
index 39d8789f36a6..877c72bfe524 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Actions.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Actions.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.console.base.editor;
 
 /*Generated by MPS */
 
@@ -27,10 +27,10 @@ public void execute(EditorContext editorContext) {
       this.execute_internal(editorContext, this.myNode);
     }
     public void execute_internal(EditorContext editorContext, SNode node) {
-      SNode blCommand = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand")));
-      SLinkOperations.setTarget(blCommand, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"))));
-      SLinkOperations.addNewChild(SLinkOperations.getTarget(blCommand, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement")));
-      SLinkOperations.setTarget(SNodeOperations.cast(ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(blCommand, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"))).first(), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression")));
+      SNode blCommand = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, "jetbrains.mps.console.base.structure.BLCommand")));
+      SLinkOperations.setTarget(blCommand, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"))));
+      SLinkOperations.addNewChild(SLinkOperations.getTarget(blCommand, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement")));
+      SLinkOperations.setTarget(SNodeOperations.cast(ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(blCommand, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"))).first(), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression")));
       SNodeOperations.replaceWithAnother(node, blCommand);
     }
   }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Editor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Editor.java
similarity index 96%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Editor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Editor.java
index 54c2f6108321..3177125a0d93 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Editor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.console.base.editor;
 
 /*Generated by MPS */
 
@@ -27,7 +27,7 @@ private EditorCell createCollection_f3ggz9_a(EditorContext editorContext, SNode
     return editorCell;
   }
   private EditorCell createRefNode_f3ggz9_a0(EditorContext editorContext, SNode node) {
-    SingleRoleCellProvider provider = new BLExpression_Editor.expressionSingleRoleHandler_f3ggz9_a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), editorContext);
+    SingleRoleCellProvider provider = new BLExpression_Editor.expressionSingleRoleHandler_f3ggz9_a0(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), editorContext);
     return provider.createCell();
   }
   private class expressionSingleRoleHandler_f3ggz9_a0 extends SingleRoleCellProvider {
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java
index d6c3822aab15..4e055a92b97c 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java
@@ -15,32 +15,40 @@ public class EditorAspectDescriptorImpl implements EditorAspectDescriptor {
   public Collection<ConceptEditor> getEditors(ConceptDescriptor descriptor) {
     switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0b, descriptor.getConceptFqName())) {
       case 0:
-        return Collections.<ConceptEditor>singletonList(new CommandHolder_Editor());
+        return Collections.<ConceptEditor>singletonList(new AbstractPrintExpression_Editor());
       case 1:
-        return Collections.<ConceptEditor>singletonList(new ConsoleRoot_Editor());
+        return Collections.<ConceptEditor>singletonList(new BLCommand_Editor());
       case 2:
-        return Collections.<ConceptEditor>singletonList(new HelpCommand_Editor());
+        return Collections.<ConceptEditor>singletonList(new BLExpression_Editor());
       case 3:
-        return Collections.<ConceptEditor>singletonList(new HelpConceptReference_Editor());
+        return Collections.<ConceptEditor>singletonList(new CommandHolder_Editor());
       case 4:
-        return Collections.<ConceptEditor>singletonList(new History_Editor());
+        return Collections.<ConceptEditor>singletonList(new ConsoleRoot_Editor());
       case 5:
-        return Collections.<ConceptEditor>singletonList(new IClickable_Editor());
+        return Collections.<ConceptEditor>singletonList(new ExceptionHolder_Editor());
       case 6:
-        return Collections.<ConceptEditor>singletonList(new INodeWithReference_Editor());
+        return Collections.<ConceptEditor>singletonList(new HelpCommand_Editor());
       case 7:
-        return Collections.<ConceptEditor>singletonList(new InterpretedCommand_Editor());
+        return Collections.<ConceptEditor>singletonList(new HelpConceptReference_Editor());
       case 8:
-        return Collections.<ConceptEditor>singletonList(new NewLineResponseItem_Editor());
+        return Collections.<ConceptEditor>singletonList(new History_Editor());
       case 9:
-        return Collections.<ConceptEditor>singletonList(new NodeResponseItem_Editor());
+        return Collections.<ConceptEditor>singletonList(new IClickable_Editor());
       case 10:
-        return Collections.<ConceptEditor>singletonList(new OutputConsoleRoot_Editor());
+        return Collections.<ConceptEditor>singletonList(new INodeWithReference_Editor());
       case 11:
-        return Collections.<ConceptEditor>singletonList(new PastedNodeReference_Editor());
+        return Collections.<ConceptEditor>singletonList(new InterpretedCommand_Editor());
       case 12:
-        return Collections.<ConceptEditor>singletonList(new Response_Editor());
+        return Collections.<ConceptEditor>singletonList(new NewLineResponseItem_Editor());
       case 13:
+        return Collections.<ConceptEditor>singletonList(new NodeResponseItem_Editor());
+      case 14:
+        return Collections.<ConceptEditor>singletonList(new OutputConsoleRoot_Editor());
+      case 15:
+        return Collections.<ConceptEditor>singletonList(new PastedNodeReference_Editor());
+      case 16:
+        return Collections.<ConceptEditor>singletonList(new Response_Editor());
+      case 17:
         return Collections.<ConceptEditor>singletonList(new TextResponseItem_Editor());
       default:
     }
@@ -64,6 +72,6 @@ public Collection<ConceptEditorComponent> getEditorComponents(ConceptDescriptor
   }
 
 
-  private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"};
+  private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.base.structure.AbstractPrintExpression", "jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"};
   private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference"};
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ExceptionHolder_Editor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/ExceptionHolder_Editor.java
similarity index 97%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ExceptionHolder_Editor.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/ExceptionHolder_Editor.java
index 29c02406447e..b2055e0d0a3c 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ExceptionHolder_Editor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/ExceptionHolder_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.console.base.editor;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info
index 4f6a4e72c9d5..90dd1e7a0cc2 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info
@@ -3,6 +3,7 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.FieldDeclaration" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
@@ -11,44 +12,44 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" />
   <root>
     <file name="EditorAspectDescriptorImpl.java">
-      <unit at="13,0,70,0" name="jetbrains.mps.console.base.editor.EditorAspectDescriptorImpl" />
+      <unit at="13,0,78,0" name="jetbrains.mps.console.base.editor.EditorAspectDescriptorImpl" />
     </file>
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/1377757278865717185">
     <file name="OutputConsoleRoot_Editor.java">
-      <node id="1377757278865717185" at="20,79,21,63" concept="6" />
-      <node id="1377757278865717185" at="23,89,24,96" concept="5" />
+      <node id="1377757278865717185" at="20,79,21,63" concept="7" />
+      <node id="1377757278865717185" at="23,89,24,96" concept="6" />
       <node id="1377757278865717185" at="24,96,25,48" concept="2" />
       <node id="1377757278865717185" at="25,48,26,28" concept="2" />
       <node id="1377757278865717185" at="26,28,27,79" concept="2" />
       <node id="1377757278865717185" at="27,79,28,80" concept="0" />
       <node id="1377757278865717185" at="27,79,28,80" concept="2" />
-      <node id="1377757278865717185" at="28,80,29,22" concept="6" />
-      <node id="1377757278865717185" at="31,87,32,257" concept="5" />
-      <node id="1377757278865717185" at="32,257,33,33" concept="6" />
-      <node id="1377757278865717185" at="36,121,37,49" concept="8" />
-      <node id="1377757278865717185" at="39,81,40,74" concept="5" />
+      <node id="1377757278865717185" at="28,80,29,22" concept="7" />
+      <node id="1377757278865717185" at="31,87,32,257" concept="6" />
+      <node id="1377757278865717185" at="32,257,33,33" concept="7" />
+      <node id="1377757278865717185" at="36,121,37,49" concept="9" />
+      <node id="1377757278865717185" at="39,81,40,74" concept="6" />
       <node id="1377757278865717185" at="40,74,41,41" concept="2" />
-      <node id="1377757278865717185" at="41,41,42,24" concept="6" />
+      <node id="1377757278865717185" at="41,41,42,24" concept="7" />
       <node id="1377757278865717185" at="44,69,45,137" concept="2" />
       <node id="1377757278865717185" at="46,41,47,38" concept="2" />
-      <node id="1377757278865717185" at="48,7,49,36" concept="5" />
+      <node id="1377757278865717185" at="48,7,49,36" concept="6" />
       <node id="1377757278865717185" at="49,36,50,64" concept="2" />
       <node id="1377757278865717185" at="50,64,51,42" concept="2" />
-      <node id="1377757278865717185" at="56,44,57,54" concept="5" />
+      <node id="1377757278865717185" at="56,44,57,54" concept="6" />
       <node id="1377757278865717185" at="57,54,58,44" concept="2" />
       <node id="1377757278865717185" at="58,44,59,40" concept="2" />
-      <node id="1377757278865717185" at="59,40,60,24" concept="6" />
-      <node id="1377757278865717185" at="63,40,64,28" concept="6" />
-      <node id="1377757278865717185" at="20,0,23,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1377757278865717185" at="59,40,60,24" concept="7" />
+      <node id="1377757278865717185" at="63,40,64,28" concept="7" />
+      <node id="1377757278865717185" at="20,0,23,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="1377757278865717185" at="36,0,39,0" concept="1" trace="historySingleRoleHandler_ktrdy2_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="1377757278865717185" at="45,137,48,7" concept="3" />
-      <node id="1377757278865717185" at="63,0,66,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="1377757278865717185" at="31,0,35,0" concept="4" trace="createRefNode_ktrdy2_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1377757278865717185" at="39,0,44,0" concept="4" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1377757278865717185" at="55,0,62,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1377757278865717185" at="23,0,31,0" concept="4" trace="createCollection_ktrdy2_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1377757278865717185" at="44,0,53,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="1377757278865717185" at="45,137,48,7" concept="4" />
+      <node id="1377757278865717185" at="63,0,66,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="1377757278865717185" at="31,0,35,0" concept="5" trace="createRefNode_ktrdy2_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1377757278865717185" at="39,0,44,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1377757278865717185" at="55,0,62,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1377757278865717185" at="23,0,31,0" concept="5" trace="createCollection_ktrdy2_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1377757278865717185" at="44,0,53,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
       <scope id="1377757278865717185" at="20,79,21,63" />
       <scope id="1377757278865717185" at="27,79,28,80" />
       <scope id="1377757278865717185" at="36,121,37,49" />
@@ -102,12 +103,12 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/1583916890557930443">
     <file name="ConsoleRoot_Editor.java">
-      <node id="1583916890557930443" at="23,79,24,63" concept="6" />
-      <node id="1583916890557930443" at="26,89,27,97" concept="5" />
+      <node id="1583916890557930443" at="23,79,24,63" concept="7" />
+      <node id="1583916890557930443" at="26,89,27,97" concept="6" />
       <node id="1583916890557930443" at="27,97,28,48" concept="2" />
       <node id="1583916890557930443" at="28,48,29,28" concept="2" />
-      <node id="1583916890557930443" at="29,28,30,34" concept="5" />
-      <node id="1583916890557930443" at="31,5,32,23" concept="5" />
+      <node id="1583916890557930443" at="29,28,30,34" concept="6" />
+      <node id="1583916890557930443" at="31,5,32,23" concept="6" />
       <node id="1583916890557930443" at="32,23,33,35" concept="2" />
       <node id="1583916890557930443" at="33,35,34,69" concept="2" />
       <node id="1583916890557930443" at="34,69,35,34" concept="2" />
@@ -125,89 +126,89 @@
       <node id="1583916890557930443" at="42,81,43,80" concept="2" />
       <node id="1583916890557930443" at="43,80,44,80" concept="0" />
       <node id="1583916890557930443" at="43,80,44,80" concept="2" />
-      <node id="1583916890557930443" at="44,80,45,22" concept="6" />
-      <node id="6783870023039364043" at="47,88,48,132" concept="5" />
+      <node id="1583916890557930443" at="44,80,45,22" concept="7" />
+      <node id="6783870023039364043" at="47,88,48,132" concept="6" />
       <node id="6783870023039364043" at="48,132,49,47" concept="2" />
-      <node id="6783870023039364043" at="49,47,50,34" concept="5" />
+      <node id="6783870023039364043" at="49,47,50,34" concept="6" />
       <node id="6783870023039364043" at="50,34,51,61" concept="2" />
       <node id="6783870023039364043" at="51,61,52,40" concept="2" />
       <node id="6783870023039364043" at="52,40,53,34" concept="2" />
-      <node id="6783870023039364043" at="53,34,54,22" concept="6" />
-      <node id="6783870023039364047" at="56,88,57,116" concept="5" />
+      <node id="6783870023039364043" at="53,34,54,22" concept="7" />
+      <node id="6783870023039364047" at="56,88,57,116" concept="6" />
       <node id="6783870023039364047" at="57,116,58,47" concept="2" />
-      <node id="6783870023039364047" at="58,47,59,34" concept="5" />
+      <node id="6783870023039364047" at="58,47,59,34" concept="6" />
       <node id="6783870023039364047" at="59,34,60,61" concept="2" />
       <node id="6783870023039364047" at="60,61,61,40" concept="2" />
       <node id="6783870023039364047" at="61,40,62,34" concept="2" />
-      <node id="6783870023039364047" at="62,34,63,22" concept="6" />
-      <node id="6783870023039464457" at="65,88,66,122" concept="5" />
+      <node id="6783870023039364047" at="62,34,63,22" concept="7" />
+      <node id="6783870023039464457" at="65,88,66,122" concept="6" />
       <node id="6783870023039464457" at="66,122,67,47" concept="2" />
-      <node id="6783870023039464457" at="67,47,68,34" concept="5" />
+      <node id="6783870023039464457" at="67,47,68,34" concept="6" />
       <node id="6783870023039464457" at="68,34,69,61" concept="2" />
       <node id="6783870023039464457" at="69,61,70,40" concept="2" />
       <node id="6783870023039464457" at="70,40,71,34" concept="2" />
-      <node id="6783870023039464457" at="71,34,72,22" concept="6" />
-      <node id="2388219800763587730" at="74,88,75,145" concept="5" />
+      <node id="6783870023039464457" at="71,34,72,22" concept="7" />
+      <node id="2388219800763587730" at="74,88,75,145" concept="6" />
       <node id="2388219800763587730" at="75,145,76,47" concept="2" />
-      <node id="2388219800763587730" at="76,47,77,34" concept="5" />
+      <node id="2388219800763587730" at="76,47,77,34" concept="6" />
       <node id="2388219800763587730" at="77,34,78,61" concept="2" />
       <node id="2388219800763587730" at="78,61,79,40" concept="2" />
       <node id="2388219800763587730" at="79,40,80,34" concept="2" />
-      <node id="2388219800763587730" at="80,34,81,22" concept="6" />
-      <node id="1583916890557930443" at="83,87,84,251" concept="5" />
-      <node id="1583916890557930443" at="84,251,85,33" concept="6" />
-      <node id="1583916890557930443" at="88,121,89,49" concept="8" />
-      <node id="1583916890557930443" at="91,81,92,74" concept="5" />
+      <node id="2388219800763587730" at="80,34,81,22" concept="7" />
+      <node id="1583916890557930443" at="83,87,84,251" concept="6" />
+      <node id="1583916890557930443" at="84,251,85,33" concept="7" />
+      <node id="1583916890557930443" at="88,121,89,49" concept="9" />
+      <node id="1583916890557930443" at="91,81,92,74" concept="6" />
       <node id="1583916890557930443" at="92,74,93,41" concept="2" />
-      <node id="1583916890557930443" at="93,41,94,24" concept="6" />
+      <node id="1583916890557930443" at="93,41,94,24" concept="7" />
       <node id="1583916890557930443" at="96,69,97,137" concept="2" />
       <node id="1583916890557930443" at="98,41,99,38" concept="2" />
-      <node id="1583916890557930443" at="105,44,106,54" concept="5" />
+      <node id="1583916890557930443" at="105,44,106,54" concept="6" />
       <node id="1583916890557930443" at="106,54,107,44" concept="2" />
       <node id="1583916890557930443" at="107,44,108,40" concept="2" />
-      <node id="1583916890557930443" at="108,40,109,24" concept="6" />
-      <node id="1583916890557930443" at="112,40,113,28" concept="6" />
-      <node id="1583916890557930443" at="117,87,118,263" concept="5" />
-      <node id="1583916890557930443" at="118,263,119,33" concept="6" />
-      <node id="1583916890557930443" at="122,127,123,49" concept="8" />
-      <node id="1583916890557930443" at="125,81,126,74" concept="5" />
+      <node id="1583916890557930443" at="108,40,109,24" concept="7" />
+      <node id="1583916890557930443" at="112,40,113,28" concept="7" />
+      <node id="1583916890557930443" at="117,87,118,263" concept="6" />
+      <node id="1583916890557930443" at="118,263,119,33" concept="7" />
+      <node id="1583916890557930443" at="122,127,123,49" concept="9" />
+      <node id="1583916890557930443" at="125,81,126,74" concept="6" />
       <node id="1583916890557930443" at="126,74,127,41" concept="2" />
-      <node id="1583916890557930443" at="127,41,128,24" concept="6" />
+      <node id="1583916890557930443" at="127,41,128,24" concept="7" />
       <node id="1583916890557930443" at="130,69,131,137" concept="2" />
       <node id="1583916890557930443" at="132,41,133,44" concept="2" />
-      <node id="1583916890557930443" at="134,7,135,36" concept="5" />
-      <node id="1583916890557930443" at="136,7,137,25" concept="5" />
+      <node id="1583916890557930443" at="134,7,135,36" concept="6" />
+      <node id="1583916890557930443" at="136,7,137,25" concept="6" />
       <node id="1583916890557930443" at="137,25,138,37" concept="2" />
       <node id="1583916890557930443" at="138,37,139,71" concept="2" />
       <node id="1583916890557930443" at="139,71,140,36" concept="2" />
       <node id="1583916890557930443" at="141,7,142,42" concept="2" />
-      <node id="1583916890557930443" at="147,44,148,54" concept="5" />
+      <node id="1583916890557930443" at="147,44,148,54" concept="6" />
       <node id="1583916890557930443" at="148,54,149,50" concept="2" />
       <node id="1583916890557930443" at="149,50,150,40" concept="2" />
-      <node id="1583916890557930443" at="150,40,151,24" concept="6" />
-      <node id="1583916890557930443" at="154,40,155,34" concept="6" />
-      <node id="1583916890557930443" at="23,0,26,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1583916890557930443" at="150,40,151,24" concept="7" />
+      <node id="1583916890557930443" at="154,40,155,34" concept="7" />
+      <node id="1583916890557930443" at="23,0,26,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="1583916890557930443" at="88,0,91,0" concept="1" trace="historySingleRoleHandler_drvoix_e0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="1583916890557930443" at="97,137,100,7" concept="3" />
-      <node id="1583916890557930443" at="112,0,115,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="1583916890557930443" at="97,137,100,7" concept="4" />
+      <node id="1583916890557930443" at="112,0,115,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
       <node id="1583916890557930443" at="122,0,125,0" concept="1" trace="commandHolderSingleRoleHandler_drvoix_f0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="1583916890557930443" at="131,137,134,7" concept="3" />
-      <node id="1583916890557930443" at="154,0,157,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="1583916890557930443" at="83,0,87,0" concept="4" trace="createRefNode_drvoix_e0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1583916890557930443" at="117,0,121,0" concept="4" trace="createRefNode_drvoix_f0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1583916890557930443" at="91,0,96,0" concept="4" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1583916890557930443" at="125,0,130,0" concept="4" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1583916890557930443" at="131,137,134,7" concept="4" />
+      <node id="1583916890557930443" at="154,0,157,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="1583916890557930443" at="83,0,87,0" concept="5" trace="createRefNode_drvoix_e0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1583916890557930443" at="117,0,121,0" concept="5" trace="createRefNode_drvoix_f0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1583916890557930443" at="91,0,96,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1583916890557930443" at="125,0,130,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="1583916890557930443" at="30,34,36,5" concept="0" />
-      <node id="1583916890557930443" at="96,0,102,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="1583916890557930443" at="96,0,102,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
       <node id="1583916890557930443" at="135,36,141,7" concept="0" />
-      <node id="1583916890557930443" at="104,0,111,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1583916890557930443" at="146,0,153,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6783870023039364043" at="47,0,56,0" concept="4" trace="createConstant_drvoix_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6783870023039364047" at="56,0,65,0" concept="4" trace="createConstant_drvoix_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6783870023039464457" at="65,0,74,0" concept="4" trace="createConstant_drvoix_c0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="2388219800763587730" at="74,0,83,0" concept="4" trace="createConstant_drvoix_d0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="1583916890557930443" at="130,0,144,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="1583916890557930443" at="26,0,47,0" concept="4" trace="createCollection_drvoix_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1583916890557930443" at="104,0,111,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1583916890557930443" at="146,0,153,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6783870023039364043" at="47,0,56,0" concept="5" trace="createConstant_drvoix_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6783870023039364047" at="56,0,65,0" concept="5" trace="createConstant_drvoix_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6783870023039464457" at="65,0,74,0" concept="5" trace="createConstant_drvoix_c0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="2388219800763587730" at="74,0,83,0" concept="5" trace="createConstant_drvoix_d0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1583916890557930443" at="130,0,144,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="1583916890557930443" at="26,0,47,0" concept="5" trace="createCollection_drvoix_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="1583916890557930443" at="23,79,24,63" />
       <scope id="1583916890557930443" at="38,79,39,81" />
       <scope id="1583916890557930443" at="39,81,40,81" />
@@ -338,15 +339,15 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/2348043250037292762">
     <file name="IClickable_Editor.java">
-      <node id="2348043250037292762" at="14,79,15,62" concept="6" />
-      <node id="6558068108108761650" at="17,88,18,153" concept="5" />
-      <node id="6558068108108761650" at="18,153,19,67" concept="5" />
+      <node id="2348043250037292762" at="14,79,15,62" concept="7" />
+      <node id="6558068108108761650" at="17,88,18,153" concept="6" />
+      <node id="6558068108108761650" at="18,153,19,67" concept="6" />
       <node id="6558068108108761650" at="20,26,21,27" concept="2" />
       <node id="6558068108108761650" at="22,5,23,79" concept="2" />
-      <node id="6558068108108761650" at="23,79,24,22" concept="6" />
-      <node id="2348043250037292762" at="14,0,17,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6558068108108761650" at="19,67,22,5" concept="3" />
-      <node id="6558068108108761650" at="17,0,26,0" concept="4" trace="createComponent_lz8kqh_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6558068108108761650" at="23,79,24,22" concept="7" />
+      <node id="2348043250037292762" at="14,0,17,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6558068108108761650" at="19,67,22,5" concept="4" />
+      <node id="6558068108108761650" at="17,0,26,0" concept="5" trace="createComponent_lz8kqh_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="2348043250037292762" at="14,79,15,62" />
       <scope id="6558068108108761650" at="20,26,21,27" />
       <scope id="2348043250037292762" at="14,0,17,0">
@@ -366,15 +367,15 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/328850564588044261">
     <file name="INodeWithReference_Editor.java">
-      <node id="328850564588044261" at="14,79,15,62" concept="6" />
-      <node id="328850564594391489" at="17,88,18,163" concept="5" />
-      <node id="328850564594391489" at="18,163,19,67" concept="5" />
+      <node id="328850564588044261" at="14,79,15,62" concept="7" />
+      <node id="328850564594391489" at="17,88,18,163" concept="6" />
+      <node id="328850564594391489" at="18,163,19,67" concept="6" />
       <node id="328850564594391489" at="20,26,21,27" concept="2" />
       <node id="328850564594391489" at="22,5,23,79" concept="2" />
-      <node id="328850564594391489" at="23,79,24,22" concept="6" />
-      <node id="328850564588044261" at="14,0,17,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="328850564594391489" at="19,67,22,5" concept="3" />
-      <node id="328850564594391489" at="17,0,26,0" concept="4" trace="createComponent_fx5jqx_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594391489" at="23,79,24,22" concept="7" />
+      <node id="328850564588044261" at="14,0,17,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594391489" at="19,67,22,5" concept="4" />
+      <node id="328850564594391489" at="17,0,26,0" concept="5" trace="createComponent_fx5jqx_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="328850564588044261" at="14,79,15,62" />
       <scope id="328850564594391489" at="20,26,21,27" />
       <scope id="328850564588044261" at="14,0,17,0">
@@ -394,68 +395,68 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/328850564594145441">
     <file name="INodeWithReference_EditorComponent.java">
-      <node id="328850564594145441" at="29,47,30,35" concept="6" />
-      <node id="328850564594145441" at="32,79,33,64" concept="6" />
-      <node id="328850564594145441" at="35,90,36,40" concept="5" />
+      <node id="328850564594145441" at="29,47,30,35" concept="7" />
+      <node id="328850564594145441" at="32,79,33,64" concept="7" />
+      <node id="328850564594145441" at="35,90,36,40" concept="6" />
       <node id="328850564594145441" at="36,40,37,112" concept="2" />
-      <node id="328850564594145441" at="37,112,38,33" concept="5" />
+      <node id="328850564594145441" at="37,112,38,33" concept="6" />
       <node id="328850564594145441" at="39,31,40,69" concept="2" />
       <node id="328850564594145441" at="41,12,42,83" concept="2" />
-      <node id="328850564594145441" at="43,5,44,22" concept="6" />
-      <node id="328850564594145530" at="46,96,47,122" concept="6" />
-      <node id="328850564594145441" at="49,87,50,81" concept="5" />
+      <node id="328850564594145441" at="43,5,44,22" concept="7" />
+      <node id="328850564594145530" at="46,96,47,122" concept="7" />
+      <node id="328850564594145441" at="49,87,50,81" concept="6" />
       <node id="328850564594145441" at="50,81,51,31" concept="2" />
       <node id="328850564594145441" at="51,31,52,44" concept="2" />
-      <node id="328850564594145441" at="52,44,53,26" concept="5" />
+      <node id="328850564594145441" at="52,44,53,26" concept="6" />
       <node id="328850564594145441" at="53,26,54,99" concept="2" />
       <node id="328850564594145441" at="54,99,55,58" concept="2" />
       <node id="328850564594145441" at="56,39,57,40" concept="2" />
       <node id="328850564594145441" at="57,40,58,35" concept="2" />
       <node id="328850564594145441" at="59,5,60,73" concept="2" />
-      <node id="328850564594145441" at="60,73,61,57" concept="5" />
-      <node id="328850564594145441" at="61,57,62,59" concept="5" />
-      <node id="328850564594145441" at="63,35,64,82" concept="5" />
-      <node id="328850564594145441" at="64,82,65,94" concept="6" />
-      <node id="328850564594145441" at="66,10,67,22" concept="6" />
-      <node id="328850564594145535" at="70,33,71,14" concept="8" />
-      <node id="328850564594145535" at="73,69,74,67" concept="6" />
-      <node id="328850564594145535" at="76,81,77,79" concept="6" />
-      <node id="328850564594394064" at="79,105,80,123" concept="5" />
+      <node id="328850564594145441" at="60,73,61,57" concept="6" />
+      <node id="328850564594145441" at="61,57,62,59" concept="6" />
+      <node id="328850564594145441" at="63,35,64,82" concept="6" />
+      <node id="328850564594145441" at="64,82,65,94" concept="7" />
+      <node id="328850564594145441" at="66,10,67,22" concept="7" />
+      <node id="328850564594145535" at="70,33,71,14" concept="9" />
+      <node id="328850564594145535" at="73,69,74,67" concept="7" />
+      <node id="328850564594145535" at="76,81,77,79" concept="7" />
+      <node id="328850564594394064" at="79,105,80,123" concept="6" />
       <node id="328850564594394064" at="80,123,81,64" concept="2" />
-      <node id="328850564594394064" at="81,64,82,36" concept="5" />
+      <node id="328850564594394064" at="81,64,82,36" concept="6" />
       <node id="328850564594394064" at="82,36,83,112" concept="2" />
       <node id="328850564594394064" at="83,112,84,53" concept="2" />
       <node id="328850564594394064" at="84,53,85,52" concept="2" />
       <node id="328850564594394064" at="85,52,86,57" concept="2" />
       <node id="328850564594394064" at="86,57,87,42" concept="2" />
-      <node id="328850564594394064" at="87,42,88,24" concept="6" />
-      <node id="328850564594145551" at="93,31,94,132" concept="6" />
-      <node id="328850564594145547" at="98,44,99,46" concept="6" />
+      <node id="328850564594394064" at="87,42,88,24" concept="7" />
+      <node id="328850564594145551" at="93,31,94,132" concept="7" />
+      <node id="328850564594145547" at="98,44,99,46" concept="7" />
       <node id="328850564594145547" at="101,13,102,79" concept="2" />
       <node id="328850564594145547" at="102,79,103,82" concept="2" />
       <node id="328850564594145547" at="103,82,104,60" concept="2" />
-      <node id="328850564594145547" at="104,60,105,34" concept="5" />
+      <node id="328850564594145547" at="104,60,105,34" concept="6" />
       <node id="328850564594145547" at="105,34,106,109" concept="2" />
       <node id="328850564594145547" at="106,109,107,40" concept="2" />
-      <node id="328850564594145547" at="107,40,108,22" concept="6" />
+      <node id="328850564594145547" at="107,40,108,22" concept="7" />
       <node id="328850564594145441" at="41,10,43,5" concept="0" />
-      <node id="328850564594145547" at="96,0,98,0" concept="4" trace="setText#(Ljava/lang/String;)V" />
-      <node id="328850564594145441" at="29,0,32,0" concept="4" trace="getContextHints#()Ljava/util/Collection;" />
-      <node id="328850564594145441" at="32,0,35,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="328850564594145528" at="46,0,49,0" concept="7" trace="renderingCondition_clzyhh_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)Z" />
+      <node id="328850564594145547" at="96,0,98,0" concept="5" trace="setText#(Ljava/lang/String;)V" />
+      <node id="328850564594145441" at="29,0,32,0" concept="5" trace="getContextHints#()Ljava/util/Collection;" />
+      <node id="328850564594145441" at="32,0,35,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594145528" at="46,0,49,0" concept="8" trace="renderingCondition_clzyhh_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)Z" />
       <node id="328850564594145535" at="70,0,73,0" concept="1" trace="_Inline_clzyhh_a0a#()V" />
-      <node id="328850564594145535" at="73,0,76,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="328850564594145535" at="76,0,79,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="328850564594145547" at="93,0,96,0" concept="4" trace="getText#()Ljava/lang/String;" />
-      <node id="328850564594145547" at="98,0,101,0" concept="4" trace="isValidText#(Ljava/lang/String;)Z" />
-      <node id="328850564594145441" at="55,58,59,5" concept="3" />
-      <node id="328850564594145441" at="38,33,43,5" concept="3" />
-      <node id="328850564594145441" at="62,59,67,22" concept="3" />
-      <node id="328850564594145547" at="91,113,101,13" concept="5" />
-      <node id="328850564594145441" at="35,0,46,0" concept="4" trace="createAlternation_clzyhh_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="328850564594394064" at="79,0,90,0" concept="4" trace="createReferencePresentation_clzyhh_a0a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="328850564594145547" at="91,0,110,0" concept="4" trace="createReadOnlyModelAccessor_clzyhh_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="328850564594145441" at="49,0,69,0" concept="4" trace="createRefCell_clzyhh_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594145535" at="73,0,76,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594145535" at="76,0,79,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594145547" at="93,0,96,0" concept="5" trace="getText#()Ljava/lang/String;" />
+      <node id="328850564594145547" at="98,0,101,0" concept="5" trace="isValidText#(Ljava/lang/String;)Z" />
+      <node id="328850564594145441" at="55,58,59,5" concept="4" />
+      <node id="328850564594145441" at="38,33,43,5" concept="4" />
+      <node id="328850564594145441" at="62,59,67,22" concept="4" />
+      <node id="328850564594145547" at="91,113,101,13" concept="6" />
+      <node id="328850564594145441" at="35,0,46,0" concept="5" trace="createAlternation_clzyhh_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594394064" at="79,0,90,0" concept="5" trace="createReferencePresentation_clzyhh_a0a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594145547" at="91,0,110,0" concept="5" trace="createReadOnlyModelAccessor_clzyhh_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="328850564594145441" at="49,0,69,0" concept="5" trace="createRefCell_clzyhh_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="328850564594145547" at="96,37,96,37" />
       <scope id="328850564594145441" at="29,47,30,35" />
       <scope id="328850564594145441" at="32,79,33,64" />
@@ -536,11 +537,11 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/351968380916615485">
     <file name="CommandHolder_Editor.java">
-      <node id="351968380916615485" at="22,79,23,63" concept="6" />
-      <node id="351968380916615485" at="25,89,26,99" concept="5" />
+      <node id="351968380916615485" at="22,79,23,63" concept="7" />
+      <node id="351968380916615485" at="25,89,26,99" concept="6" />
       <node id="351968380916615485" at="26,99,27,48" concept="2" />
       <node id="351968380916615485" at="27,48,28,28" concept="2" />
-      <node id="351968380916615485" at="28,28,29,34" concept="5" />
+      <node id="351968380916615485" at="28,28,29,34" concept="6" />
       <node id="351968380916615485" at="29,34,30,50" concept="2" />
       <node id="351968380916615485" at="30,50,31,40" concept="2" />
       <node id="351968380916615485" at="31,40,32,79" concept="2" />
@@ -548,41 +549,41 @@
       <node id="351968380916615485" at="32,79,33,81" concept="2" />
       <node id="351968380916615485" at="33,81,34,80" concept="0" />
       <node id="351968380916615485" at="33,81,34,80" concept="2" />
-      <node id="351968380916615485" at="34,80,35,22" concept="6" />
-      <node id="351968380916616964" at="37,88,38,88" concept="5" />
+      <node id="351968380916615485" at="34,80,35,22" concept="7" />
+      <node id="351968380916616964" at="37,88,38,88" concept="6" />
       <node id="351968380916616964" at="38,88,39,47" concept="2" />
-      <node id="351968380916616964" at="39,47,40,34" concept="5" />
+      <node id="351968380916616964" at="39,47,40,34" concept="6" />
       <node id="351968380916616964" at="40,34,41,52" concept="2" />
       <node id="351968380916616964" at="41,52,42,58" concept="2" />
       <node id="351968380916616964" at="42,58,43,40" concept="2" />
       <node id="351968380916616964" at="43,40,44,34" concept="2" />
-      <node id="351968380916616964" at="44,34,45,22" concept="6" />
-      <node id="351968380916615485" at="47,87,48,251" concept="5" />
-      <node id="351968380916615485" at="48,251,49,33" concept="6" />
-      <node id="351968380916615485" at="52,121,53,49" concept="8" />
-      <node id="351968380916615485" at="55,81,56,74" concept="5" />
+      <node id="351968380916616964" at="44,34,45,22" concept="7" />
+      <node id="351968380916615485" at="47,87,48,251" concept="6" />
+      <node id="351968380916615485" at="48,251,49,33" concept="7" />
+      <node id="351968380916615485" at="52,121,53,49" concept="9" />
+      <node id="351968380916615485" at="55,81,56,74" concept="6" />
       <node id="351968380916615485" at="56,74,57,41" concept="2" />
-      <node id="351968380916615485" at="57,41,58,24" concept="6" />
+      <node id="351968380916615485" at="57,41,58,24" concept="7" />
       <node id="351968380916615485" at="60,69,61,137" concept="2" />
       <node id="351968380916615485" at="62,41,63,38" concept="2" />
-      <node id="351968380916615485" at="64,7,65,36" concept="5" />
+      <node id="351968380916615485" at="64,7,65,36" concept="6" />
       <node id="351968380916615485" at="65,36,66,53" concept="2" />
       <node id="351968380916615485" at="66,53,67,42" concept="2" />
-      <node id="351968380916615485" at="72,44,73,54" concept="5" />
+      <node id="351968380916615485" at="72,44,73,54" concept="6" />
       <node id="351968380916615485" at="73,54,74,44" concept="2" />
       <node id="351968380916615485" at="74,44,75,40" concept="2" />
-      <node id="351968380916615485" at="75,40,76,24" concept="6" />
-      <node id="351968380916615485" at="79,40,80,28" concept="6" />
-      <node id="351968380916615485" at="22,0,25,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="351968380916615485" at="75,40,76,24" concept="7" />
+      <node id="351968380916615485" at="79,40,80,28" concept="7" />
+      <node id="351968380916615485" at="22,0,25,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="351968380916615485" at="52,0,55,0" concept="1" trace="commandSingleRoleHandler_nvbf9m_b0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="351968380916615485" at="61,137,64,7" concept="3" />
-      <node id="351968380916615485" at="79,0,82,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="351968380916615485" at="47,0,51,0" concept="4" trace="createRefNode_nvbf9m_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="351968380916615485" at="55,0,60,0" concept="4" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="351968380916615485" at="71,0,78,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="351968380916615485" at="60,0,69,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="351968380916616964" at="37,0,47,0" concept="4" trace="createConstant_nvbf9m_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="351968380916615485" at="25,0,37,0" concept="4" trace="createCollection_nvbf9m_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="351968380916615485" at="61,137,64,7" concept="4" />
+      <node id="351968380916615485" at="79,0,82,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="351968380916615485" at="47,0,51,0" concept="5" trace="createRefNode_nvbf9m_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="351968380916615485" at="55,0,60,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="351968380916615485" at="71,0,78,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="351968380916615485" at="60,0,69,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="351968380916616964" at="37,0,47,0" concept="5" trace="createConstant_nvbf9m_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="351968380916615485" at="25,0,37,0" concept="5" trace="createCollection_nvbf9m_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="351968380916615485" at="22,79,23,63" />
       <scope id="351968380916615485" at="32,79,33,81" />
       <scope id="351968380916615485" at="33,81,34,80" />
@@ -646,51 +647,51 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/4457873968123391941">
     <file name="History_Editor.java">
-      <node id="4457873968123391941" at="22,79,23,63" concept="6" />
-      <node id="4457873968123391941" at="25,89,26,96" concept="5" />
+      <node id="4457873968123391941" at="22,79,23,63" concept="7" />
+      <node id="4457873968123391941" at="25,89,26,96" concept="6" />
       <node id="4457873968123391941" at="26,96,27,48" concept="2" />
       <node id="4457873968123391941" at="27,48,28,28" concept="2" />
       <node id="4457873968123391941" at="28,28,29,79" concept="2" />
       <node id="4457873968123391941" at="29,79,30,84" concept="0" />
       <node id="4457873968123391941" at="29,79,30,84" concept="2" />
-      <node id="4457873968123391941" at="30,84,31,22" concept="6" />
-      <node id="4457873968123391941" at="33,91,34,112" concept="5" />
-      <node id="4457873968123391941" at="34,112,35,108" concept="5" />
+      <node id="4457873968123391941" at="30,84,31,22" concept="7" />
+      <node id="4457873968123391941" at="33,91,34,112" concept="6" />
+      <node id="4457873968123391941" at="34,112,35,108" concept="6" />
       <node id="4457873968123391941" at="35,108,36,45" concept="2" />
       <node id="4457873968123391941" at="36,45,37,49" concept="2" />
-      <node id="4457873968123391941" at="37,49,38,22" concept="6" />
-      <node id="4457873968123391941" at="41,96,42,50" concept="8" />
-      <node id="4457873968123391941" at="44,66,45,41" concept="5" />
-      <node id="4457873968123391941" at="45,41,46,93" concept="6" />
-      <node id="4457873968123391941" at="48,86,49,80" concept="5" />
+      <node id="4457873968123391941" at="37,49,38,22" concept="7" />
+      <node id="4457873968123391941" at="41,96,42,50" concept="9" />
+      <node id="4457873968123391941" at="44,66,45,41" concept="6" />
+      <node id="4457873968123391941" at="45,41,46,93" concept="7" />
+      <node id="4457873968123391941" at="48,86,49,80" concept="6" />
       <node id="4457873968123391941" at="49,80,50,95" concept="2" />
-      <node id="4457873968123391941" at="50,95,51,25" concept="6" />
-      <node id="4457873968123391941" at="53,68,54,34" concept="5" />
+      <node id="4457873968123391941" at="50,95,51,25" concept="7" />
+      <node id="4457873968123391941" at="53,68,54,34" concept="6" />
       <node id="4457873968123391941" at="54,34,55,80" concept="2" />
       <node id="4457873968123391941" at="55,80,56,87" concept="2" />
-      <node id="4457873968123391941" at="56,87,57,23" concept="6" />
-      <node id="4457873968123391941" at="59,89,60,65" concept="6" />
+      <node id="4457873968123391941" at="56,87,57,23" concept="7" />
+      <node id="4457873968123391941" at="59,89,60,65" concept="7" />
       <node id="4457873968123391941" at="63,96,64,134" concept="2" />
       <node id="4457873968123391941" at="65,34,66,95" concept="2" />
       <node id="4457873968123391941" at="66,95,67,98" concept="2" />
       <node id="4457873968123391941" at="69,122,70,139" concept="2" />
-      <node id="3210622965583572491" at="74,91,75,89" concept="5" />
+      <node id="3210622965583572491" at="74,91,75,89" concept="6" />
       <node id="3210622965583572491" at="75,89,76,50" concept="2" />
       <node id="3210622965583572491" at="76,50,77,36" concept="2" />
-      <node id="3210622965583572491" at="77,36,78,24" concept="6" />
-      <node id="4457873968123391941" at="22,0,25,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="3210622965583572491" at="77,36,78,24" concept="7" />
+      <node id="4457873968123391941" at="22,0,25,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="4457873968123391941" at="41,0,44,0" concept="1" trace="itemListHandler_ff9cd8_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljava/lang/String;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="4457873968123391941" at="59,0,62,0" concept="4" trace="createEmptyCell_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="4457873968123391941" at="68,9,71,9" concept="3" />
-      <node id="4457873968123391941" at="44,0,48,0" concept="4" trace="createNodeToInsert#(Ljetbrains/mps/openapi/editor/EditorContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4457873968123391941" at="64,134,68,9" concept="3" />
-      <node id="4457873968123391941" at="48,0,53,0" concept="4" trace="createNodeCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="4457873968123391941" at="53,0,59,0" concept="4" trace="createEmptyCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="3210622965583572491" at="74,0,80,0" concept="4" trace="createConstant_ff9cd8_a0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="4457873968123391941" at="33,0,40,0" concept="4" trace="createRefNodeList_ff9cd8_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="4457873968123391941" at="25,0,33,0" concept="4" trace="createCollection_ff9cd8_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="4457873968123391941" at="62,132,72,7" concept="3" />
-      <node id="4457873968123391941" at="62,0,74,0" concept="4" trace="installElementCellActions#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="4457873968123391941" at="59,0,62,0" concept="5" trace="createEmptyCell_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="4457873968123391941" at="68,9,71,9" concept="4" />
+      <node id="4457873968123391941" at="44,0,48,0" concept="5" trace="createNodeToInsert#(Ljetbrains/mps/openapi/editor/EditorContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="4457873968123391941" at="64,134,68,9" concept="4" />
+      <node id="4457873968123391941" at="48,0,53,0" concept="5" trace="createNodeCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="4457873968123391941" at="53,0,59,0" concept="5" trace="createEmptyCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="3210622965583572491" at="74,0,80,0" concept="5" trace="createConstant_ff9cd8_a0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="4457873968123391941" at="33,0,40,0" concept="5" trace="createRefNodeList_ff9cd8_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="4457873968123391941" at="25,0,33,0" concept="5" trace="createCollection_ff9cd8_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="4457873968123391941" at="62,132,72,7" concept="4" />
+      <node id="4457873968123391941" at="62,0,74,0" concept="5" trace="installElementCellActions#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
       <scope id="4457873968123391941" at="22,79,23,63" />
       <scope id="4457873968123391941" at="29,79,30,84" />
       <scope id="4457873968123391941" at="41,96,42,50" />
@@ -763,10 +764,219 @@
       <unit id="4457873968123391941" at="21,0,82,0" name="jetbrains.mps.console.base.editor.History_Editor" />
     </file>
   </root>
+  <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/5464054275389851713">
+    <file name="BLCommand_Editor.java">
+      <node id="5464054275389851713" at="25,79,26,64" concept="7" />
+      <node id="5464054275389851713" at="28,90,29,40" concept="6" />
+      <node id="5464054275389851713" at="29,40,30,94" concept="2" />
+      <node id="5464054275389851713" at="30,94,31,33" concept="6" />
+      <node id="5464054275389851713" at="32,31,33,72" concept="2" />
+      <node id="5464054275389851713" at="34,12,35,69" concept="2" />
+      <node id="5464054275389851713" at="36,5,37,67" concept="6" />
+      <node id="5464054275389851713" at="38,26,39,27" concept="2" />
+      <node id="5464054275389851713" at="40,5,41,79" concept="2" />
+      <node id="5464054275389851713" at="41,79,42,22" concept="7" />
+      <node id="6766461360451875779" at="44,96,45,212" concept="7" />
+      <node id="5464054275389851713" at="47,90,48,96" concept="6" />
+      <node id="5464054275389851713" at="48,96,49,49" concept="2" />
+      <node id="5464054275389851713" at="49,49,50,82" concept="0" />
+      <node id="5464054275389851713" at="49,49,50,82" concept="2" />
+      <node id="5464054275389851713" at="50,82,51,81" concept="0" />
+      <node id="5464054275389851713" at="50,82,51,81" concept="2" />
+      <node id="5464054275389851713" at="51,81,52,82" concept="0" />
+      <node id="5464054275389851713" at="51,81,52,82" concept="2" />
+      <node id="5464054275389851713" at="52,82,53,22" concept="7" />
+      <node id="6766461360451874005" at="55,89,56,87" concept="6" />
+      <node id="6766461360451874005" at="56,87,57,48" concept="2" />
+      <node id="6766461360451874005" at="57,48,58,34" concept="6" />
+      <node id="6766461360451874005" at="58,34,59,68" concept="2" />
+      <node id="6766461360451874005" at="59,68,60,63" concept="2" />
+      <node id="6766461360451874005" at="60,63,61,40" concept="2" />
+      <node id="6766461360451874005" at="61,40,62,34" concept="2" />
+      <node id="6766461360451874005" at="62,34,63,22" concept="7" />
+      <node id="5464054275389851713" at="65,88,66,244" concept="6" />
+      <node id="5464054275389851713" at="66,244,67,33" concept="7" />
+      <node id="5464054275389851713" at="70,119,71,49" concept="9" />
+      <node id="5464054275389851713" at="73,81,74,74" concept="6" />
+      <node id="5464054275389851713" at="74,74,75,41" concept="2" />
+      <node id="5464054275389851713" at="75,41,76,24" concept="7" />
+      <node id="5464054275389851713" at="78,69,79,137" concept="2" />
+      <node id="5464054275389851713" at="80,41,81,35" concept="2" />
+      <node id="5464054275389851713" at="82,7,83,36" concept="6" />
+      <node id="5464054275389851713" at="83,36,84,63" concept="2" />
+      <node id="5464054275389851713" at="84,63,85,65" concept="2" />
+      <node id="5464054275389851713" at="85,65,86,42" concept="2" />
+      <node id="5464054275389851713" at="91,44,92,54" concept="6" />
+      <node id="5464054275389851713" at="92,54,93,41" concept="2" />
+      <node id="5464054275389851713" at="93,41,94,40" concept="2" />
+      <node id="5464054275389851713" at="94,40,95,24" concept="7" />
+      <node id="5464054275389851713" at="98,40,99,25" concept="7" />
+      <node id="6766461360451874058" at="103,89,104,87" concept="6" />
+      <node id="6766461360451874058" at="104,87,105,48" concept="2" />
+      <node id="6766461360451874058" at="105,48,106,34" concept="6" />
+      <node id="6766461360451874058" at="106,34,107,69" concept="2" />
+      <node id="6766461360451874058" at="107,69,108,40" concept="2" />
+      <node id="6766461360451874058" at="108,40,109,34" concept="2" />
+      <node id="6766461360451874058" at="109,34,110,22" concept="7" />
+      <node id="5464054275389851713" at="112,87,113,243" concept="6" />
+      <node id="5464054275389851713" at="113,243,114,33" concept="7" />
+      <node id="5464054275389851713" at="117,118,118,49" concept="9" />
+      <node id="5464054275389851713" at="120,81,121,74" concept="6" />
+      <node id="5464054275389851713" at="121,74,122,41" concept="2" />
+      <node id="5464054275389851713" at="122,41,123,24" concept="7" />
+      <node id="5464054275389851713" at="125,69,126,137" concept="2" />
+      <node id="5464054275389851713" at="127,41,128,35" concept="2" />
+      <node id="5464054275389851713" at="134,44,135,54" concept="6" />
+      <node id="5464054275389851713" at="135,54,136,41" concept="2" />
+      <node id="5464054275389851713" at="136,41,137,40" concept="2" />
+      <node id="5464054275389851713" at="137,40,138,24" concept="7" />
+      <node id="5464054275389851713" at="141,40,142,25" concept="7" />
+      <node id="5464054275389851713" at="34,10,36,5" concept="0" />
+      <node id="5464054275389851713" at="25,0,28,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5464054275389851713" at="37,67,40,5" concept="4" />
+      <node id="6766461360451874079" at="44,0,47,0" concept="8" trace="renderingCondition_zc016d_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)Z" />
+      <node id="5464054275389851713" at="70,0,73,0" concept="1" trace="bodySingleRoleHandler_zc016d_b0a#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="5464054275389851713" at="79,137,82,7" concept="4" />
+      <node id="5464054275389851713" at="98,0,101,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="5464054275389851713" at="117,0,120,0" concept="1" trace="bodySingleRoleHandler_zc016d_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="5464054275389851713" at="126,137,129,7" concept="4" />
+      <node id="5464054275389851713" at="141,0,144,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="5464054275389851713" at="65,0,69,0" concept="5" trace="createRefNode_zc016d_b0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5464054275389851713" at="112,0,116,0" concept="5" trace="createRefNode_zc016d_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5464054275389851713" at="31,33,36,5" concept="4" />
+      <node id="5464054275389851713" at="73,0,78,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5464054275389851713" at="120,0,125,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5464054275389851713" at="125,0,131,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="5464054275389851713" at="90,0,97,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5464054275389851713" at="133,0,140,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5464054275389851713" at="47,0,55,0" concept="5" trace="createCollection_zc016d_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6766461360451874058" at="103,0,112,0" concept="5" trace="createConstant_zc016d_c0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6766461360451874005" at="55,0,65,0" concept="5" trace="createConstant_zc016d_a0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5464054275389851713" at="78,0,88,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="5464054275389851713" at="28,0,44,0" concept="5" trace="createAlternation_zc016d_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <scope id="5464054275389851713" at="25,79,26,64" />
+      <scope id="5464054275389851713" at="32,31,33,72" />
+      <scope id="5464054275389851713" at="34,12,35,69" />
+      <scope id="5464054275389851713" at="38,26,39,27" />
+      <scope id="6766461360451874080" at="44,96,45,212" />
+      <scope id="5464054275389851713" at="49,49,50,82" />
+      <scope id="5464054275389851713" at="50,82,51,81" />
+      <scope id="5464054275389851713" at="51,81,52,82" />
+      <scope id="5464054275389851713" at="70,119,71,49" />
+      <scope id="5464054275389851713" at="80,41,81,35" />
+      <scope id="5464054275389851713" at="98,40,99,25" />
+      <scope id="5464054275389851713" at="117,118,118,49" />
+      <scope id="5464054275389851713" at="127,41,128,35" />
+      <scope id="5464054275389851713" at="141,40,142,25" />
+      <scope id="5464054275389851713" at="65,88,67,33">
+        <var name="provider" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="112,87,114,33">
+        <var name="provider" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="25,0,28,0">
+        <var name="editorContext" id="5464054275389851713" />
+        <var name="node" id="5464054275389851713" />
+      </scope>
+      <scope id="6766461360451874079" at="44,0,47,0">
+        <var name="editorContext" id="6766461360451874079" />
+        <var name="node" id="6766461360451874079" />
+      </scope>
+      <scope id="5464054275389851713" at="70,0,73,0">
+        <var name="containmentLink" id="5464054275389851713" />
+        <var name="context" id="5464054275389851713" />
+        <var name="ownerNode" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="73,81,76,24">
+        <var name="editorCell" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="98,0,101,0" />
+      <scope id="5464054275389851713" at="117,0,120,0">
+        <var name="containmentLink" id="5464054275389851713" />
+        <var name="context" id="5464054275389851713" />
+        <var name="ownerNode" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="120,81,123,24">
+        <var name="editorCell" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="141,0,144,0" />
+      <scope id="5464054275389851713" at="65,0,69,0">
+        <var name="editorContext" id="5464054275389851713" />
+        <var name="node" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="91,44,95,24">
+        <var name="editorCell" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="112,0,116,0">
+        <var name="editorContext" id="5464054275389851713" />
+        <var name="node" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="125,69,129,7" />
+      <scope id="5464054275389851713" at="134,44,138,24">
+        <var name="editorCell" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="73,0,78,0">
+        <var name="child" id="5464054275389851713" />
+        <var name="editorContext" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="120,0,125,0">
+        <var name="child" id="5464054275389851713" />
+        <var name="editorContext" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="47,90,53,22">
+        <var name="editorCell" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="125,0,131,0">
+        <var name="child" id="5464054275389851713" />
+        <var name="editorCell" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="90,0,97,0" />
+      <scope id="6766461360451874058" at="103,89,110,22">
+        <var name="editorCell" id="6766461360451874058" />
+        <var name="style" id="6766461360451874058" />
+      </scope>
+      <scope id="5464054275389851713" at="133,0,140,0" />
+      <scope id="5464054275389851713" at="47,0,55,0">
+        <var name="editorContext" id="5464054275389851713" />
+        <var name="node" id="5464054275389851713" />
+      </scope>
+      <scope id="6766461360451874005" at="55,89,63,22">
+        <var name="editorCell" id="6766461360451874005" />
+        <var name="style" id="6766461360451874005" />
+      </scope>
+      <scope id="5464054275389851713" at="78,69,86,42">
+        <var name="style" id="5464054275389851713" />
+      </scope>
+      <scope id="6766461360451874058" at="103,0,112,0">
+        <var name="editorContext" id="6766461360451874058" />
+        <var name="node" id="6766461360451874058" />
+      </scope>
+      <scope id="6766461360451874005" at="55,0,65,0">
+        <var name="editorContext" id="6766461360451874005" />
+        <var name="node" id="6766461360451874005" />
+      </scope>
+      <scope id="5464054275389851713" at="78,0,88,0">
+        <var name="child" id="5464054275389851713" />
+        <var name="editorCell" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="28,90,42,22">
+        <var name="alternationCondition" id="5464054275389851713" />
+        <var name="bigCell" id="5464054275389851713" />
+        <var name="editorCell" id="5464054275389851713" />
+      </scope>
+      <scope id="5464054275389851713" at="28,0,44,0">
+        <var name="editorContext" id="5464054275389851713" />
+        <var name="node" id="5464054275389851713" />
+      </scope>
+      <unit id="5464054275389851713" at="116,0,146,0" name="jetbrains.mps.console.base.editor.BLCommand_Editor$bodySingleRoleHandler_zc016d_a0" />
+      <unit id="5464054275389851713" at="69,0,103,0" name="jetbrains.mps.console.base.editor.BLCommand_Editor$bodySingleRoleHandler_zc016d_b0a" />
+      <unit id="5464054275389851713" at="24,0,147,0" name="jetbrains.mps.console.base.editor.BLCommand_Editor" />
+    </file>
+  </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/5637103006919114630">
     <file name="Response_Editor.java">
-      <node id="5637103006919114630" at="25,79,26,63" concept="6" />
-      <node id="5637103006919114630" at="28,89,29,99" concept="5" />
+      <node id="5637103006919114630" at="25,79,26,63" concept="7" />
+      <node id="5637103006919114630" at="28,89,29,99" concept="6" />
       <node id="5637103006919114630" at="29,99,30,48" concept="2" />
       <node id="5637103006919114630" at="30,48,31,28" concept="2" />
       <node id="5637103006919114630" at="31,28,32,79" concept="2" />
@@ -774,63 +984,63 @@
       <node id="5637103006919114630" at="32,79,33,83" concept="2" />
       <node id="5637103006919114630" at="33,83,34,83" concept="0" />
       <node id="5637103006919114630" at="33,83,34,83" concept="2" />
-      <node id="5637103006919114630" at="34,83,35,22" concept="6" />
-      <node id="5637103006919119974" at="37,90,38,78" concept="5" />
-      <node id="5637103006919119974" at="38,78,39,22" concept="6" />
-      <node id="5637103006919114630" at="41,90,42,99" concept="5" />
+      <node id="5637103006919114630" at="34,83,35,22" concept="7" />
+      <node id="5637103006919119974" at="37,90,38,78" concept="6" />
+      <node id="5637103006919119974" at="38,78,39,22" concept="7" />
+      <node id="5637103006919114630" at="41,90,42,99" concept="6" />
       <node id="5637103006919114630" at="42,99,43,49" concept="2" />
-      <node id="5637103006919114630" at="43,49,44,34" concept="5" />
+      <node id="5637103006919114630" at="43,49,44,34" concept="6" />
       <node id="5637103006919114630" at="44,34,45,52" concept="2" />
       <node id="5637103006919114630" at="45,52,46,40" concept="2" />
       <node id="5637103006919114630" at="46,40,47,84" concept="0" />
       <node id="5637103006919114630" at="46,40,47,84" concept="2" />
       <node id="5637103006919114630" at="47,84,48,84" concept="0" />
       <node id="5637103006919114630" at="47,84,48,84" concept="2" />
-      <node id="5637103006919114630" at="48,84,49,22" concept="6" />
-      <node id="5637103006919114630" at="51,91,52,96" concept="5" />
+      <node id="5637103006919114630" at="48,84,49,22" concept="7" />
+      <node id="5637103006919114630" at="51,91,52,96" concept="6" />
       <node id="5637103006919114630" at="52,96,53,50" concept="2" />
-      <node id="5637103006919114630" at="53,50,54,34" concept="5" />
+      <node id="5637103006919114630" at="53,50,54,34" concept="6" />
       <node id="5637103006919114630" at="54,34,55,52" concept="2" />
       <node id="5637103006919114630" at="55,52,56,40" concept="2" />
       <node id="5637103006919114630" at="56,40,57,86" concept="0" />
       <node id="5637103006919114630" at="56,40,57,86" concept="2" />
-      <node id="5637103006919114630" at="57,86,58,22" concept="6" />
-      <node id="5637103006919114630" at="60,93,61,115" concept="5" />
-      <node id="5637103006919114630" at="61,115,62,106" concept="5" />
+      <node id="5637103006919114630" at="57,86,58,22" concept="7" />
+      <node id="5637103006919114630" at="60,93,61,115" concept="6" />
+      <node id="5637103006919114630" at="61,115,62,106" concept="6" />
       <node id="5637103006919114630" at="62,106,63,45" concept="2" />
       <node id="5637103006919114630" at="63,45,64,49" concept="2" />
-      <node id="5637103006919114630" at="64,49,65,22" concept="6" />
-      <node id="5637103006919114630" at="68,98,69,50" concept="8" />
-      <node id="5637103006919114630" at="71,66,72,41" concept="5" />
-      <node id="5637103006919114630" at="72,41,73,93" concept="6" />
-      <node id="5637103006919114630" at="75,86,76,80" concept="5" />
+      <node id="5637103006919114630" at="64,49,65,22" concept="7" />
+      <node id="5637103006919114630" at="68,98,69,50" concept="9" />
+      <node id="5637103006919114630" at="71,66,72,41" concept="6" />
+      <node id="5637103006919114630" at="72,41,73,93" concept="7" />
+      <node id="5637103006919114630" at="75,86,76,80" concept="6" />
       <node id="5637103006919114630" at="76,80,77,95" concept="2" />
-      <node id="5637103006919114630" at="77,95,78,25" concept="6" />
-      <node id="5637103006919114630" at="80,68,81,34" concept="5" />
+      <node id="5637103006919114630" at="77,95,78,25" concept="7" />
+      <node id="5637103006919114630" at="80,68,81,34" concept="6" />
       <node id="5637103006919114630" at="81,34,82,55" concept="2" />
       <node id="5637103006919114630" at="82,55,83,87" concept="2" />
-      <node id="5637103006919114630" at="83,87,84,23" concept="6" />
+      <node id="5637103006919114630" at="83,87,84,23" concept="7" />
       <node id="5637103006919114630" at="87,96,88,134" concept="2" />
       <node id="5637103006919114630" at="89,34,90,95" concept="2" />
       <node id="5637103006919114630" at="90,95,91,98" concept="2" />
       <node id="5637103006919114630" at="93,122,94,139" concept="2" />
-      <node id="5637103006919119983" at="99,91,100,78" concept="5" />
-      <node id="5637103006919119983" at="100,78,101,22" concept="6" />
-      <node id="5637103006919114630" at="25,0,28,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919119983" at="99,91,100,78" concept="6" />
+      <node id="5637103006919119983" at="100,78,101,22" concept="7" />
+      <node id="5637103006919114630" at="25,0,28,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="5637103006919114630" at="68,0,71,0" concept="1" trace="itemListHandler_mesn11_a0b0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljava/lang/String;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="5637103006919114630" at="92,9,95,9" concept="3" />
-      <node id="5637103006919119974" at="37,0,41,0" concept="4" trace="createIndentCell_mesn11_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919114630" at="71,0,75,0" concept="4" trace="createNodeToInsert#(Ljetbrains/mps/openapi/editor/EditorContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5637103006919114630" at="88,134,92,9" concept="3" />
-      <node id="5637103006919119983" at="99,0,103,0" concept="4" trace="createIndentCell_mesn11_b1a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919114630" at="75,0,80,0" concept="4" trace="createNodeCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919114630" at="80,0,86,0" concept="4" trace="createEmptyCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919114630" at="60,0,67,0" concept="4" trace="createRefNodeList_mesn11_a0b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919114630" at="28,0,37,0" concept="4" trace="createCollection_mesn11_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919114630" at="51,0,60,0" concept="4" trace="createCollection_mesn11_a1a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919114630" at="41,0,51,0" concept="4" trace="createCollection_mesn11_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919114630" at="86,132,96,7" concept="3" />
-      <node id="5637103006919114630" at="86,0,98,0" concept="4" trace="installElementCellActions#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="5637103006919114630" at="92,9,95,9" concept="4" />
+      <node id="5637103006919119974" at="37,0,41,0" concept="5" trace="createIndentCell_mesn11_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919114630" at="71,0,75,0" concept="5" trace="createNodeToInsert#(Ljetbrains/mps/openapi/editor/EditorContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5637103006919114630" at="88,134,92,9" concept="4" />
+      <node id="5637103006919119983" at="99,0,103,0" concept="5" trace="createIndentCell_mesn11_b1a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919114630" at="75,0,80,0" concept="5" trace="createNodeCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919114630" at="80,0,86,0" concept="5" trace="createEmptyCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919114630" at="60,0,67,0" concept="5" trace="createRefNodeList_mesn11_a0b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919114630" at="28,0,37,0" concept="5" trace="createCollection_mesn11_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919114630" at="51,0,60,0" concept="5" trace="createCollection_mesn11_a1a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919114630" at="41,0,51,0" concept="5" trace="createCollection_mesn11_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919114630" at="86,132,96,7" concept="4" />
+      <node id="5637103006919114630" at="86,0,98,0" concept="5" trace="installElementCellActions#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
       <scope id="5637103006919114630" at="25,79,26,63" />
       <scope id="5637103006919114630" at="32,79,33,83" />
       <scope id="5637103006919114630" at="33,83,34,83" />
@@ -927,36 +1137,36 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/5637103006919121966">
     <file name="NodeResponseItem_Editor.java">
-      <node id="5637103006919121966" at="18,79,19,63" concept="6" />
-      <node id="5637103006919121966" at="21,89,22,96" concept="5" />
+      <node id="5637103006919121966" at="18,79,19,63" concept="7" />
+      <node id="5637103006919121966" at="21,89,22,96" concept="6" />
       <node id="5637103006919121966" at="22,96,23,48" concept="2" />
       <node id="5637103006919121966" at="23,48,24,28" concept="2" />
       <node id="5637103006919121966" at="24,28,25,79" concept="2" />
       <node id="5637103006919121966" at="25,79,26,80" concept="0" />
       <node id="5637103006919121966" at="25,79,26,80" concept="2" />
-      <node id="5637103006919121966" at="26,80,27,22" concept="6" />
-      <node id="5637103006919121966" at="29,87,30,250" concept="5" />
-      <node id="5637103006919121966" at="30,250,31,33" concept="6" />
-      <node id="5637103006919121966" at="34,118,35,49" concept="8" />
-      <node id="5637103006919121966" at="37,81,38,74" concept="5" />
+      <node id="5637103006919121966" at="26,80,27,22" concept="7" />
+      <node id="5637103006919121966" at="29,87,30,250" concept="6" />
+      <node id="5637103006919121966" at="30,250,31,33" concept="7" />
+      <node id="5637103006919121966" at="34,118,35,49" concept="9" />
+      <node id="5637103006919121966" at="37,81,38,74" concept="6" />
       <node id="5637103006919121966" at="38,74,39,41" concept="2" />
-      <node id="5637103006919121966" at="39,41,40,24" concept="6" />
+      <node id="5637103006919121966" at="39,41,40,24" concept="7" />
       <node id="5637103006919121966" at="42,69,43,137" concept="2" />
       <node id="5637103006919121966" at="44,41,45,35" concept="2" />
-      <node id="5637103006919121966" at="51,44,52,54" concept="5" />
+      <node id="5637103006919121966" at="51,44,52,54" concept="6" />
       <node id="5637103006919121966" at="52,54,53,41" concept="2" />
       <node id="5637103006919121966" at="53,41,54,40" concept="2" />
-      <node id="5637103006919121966" at="54,40,55,24" concept="6" />
-      <node id="5637103006919121966" at="58,40,59,25" concept="6" />
-      <node id="5637103006919121966" at="18,0,21,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919121966" at="54,40,55,24" concept="7" />
+      <node id="5637103006919121966" at="58,40,59,25" concept="7" />
+      <node id="5637103006919121966" at="18,0,21,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="5637103006919121966" at="34,0,37,0" concept="1" trace="nodeSingleRoleHandler_rjs2cb_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="5637103006919121966" at="43,137,46,7" concept="3" />
-      <node id="5637103006919121966" at="58,0,61,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="5637103006919121966" at="29,0,33,0" concept="4" trace="createRefNode_rjs2cb_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919121966" at="37,0,42,0" concept="4" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919121966" at="42,0,48,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="5637103006919121966" at="50,0,57,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919121966" at="21,0,29,0" concept="4" trace="createCollection_rjs2cb_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919121966" at="43,137,46,7" concept="4" />
+      <node id="5637103006919121966" at="58,0,61,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="5637103006919121966" at="29,0,33,0" concept="5" trace="createRefNode_rjs2cb_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919121966" at="37,0,42,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919121966" at="42,0,48,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="5637103006919121966" at="50,0,57,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919121966" at="21,0,29,0" concept="5" trace="createCollection_rjs2cb_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="5637103006919121966" at="18,79,19,63" />
       <scope id="5637103006919121966" at="25,79,26,80" />
       <scope id="5637103006919121966" at="34,118,35,49" />
@@ -1008,24 +1218,24 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/5637103006919122218">
     <file name="TextResponseItem_Editor.java">
-      <node id="5637103006919122218" at="16,79,17,61" concept="6" />
-      <node id="5637103006919122220" at="19,87,20,82" concept="5" />
+      <node id="5637103006919122218" at="16,79,17,61" concept="7" />
+      <node id="5637103006919122220" at="19,87,20,82" concept="6" />
       <node id="5637103006919122220" at="20,82,21,29" concept="2" />
       <node id="5637103006919122220" at="21,29,22,42" concept="2" />
-      <node id="5637103006919122220" at="22,42,23,26" concept="5" />
+      <node id="5637103006919122220" at="22,42,23,26" concept="6" />
       <node id="5637103006919122220" at="23,26,24,58" concept="2" />
       <node id="5637103006919122220" at="24,58,25,42" concept="2" />
       <node id="5637103006919122220" at="25,42,26,28" concept="2" />
       <node id="5637103006919122220" at="26,28,27,79" concept="2" />
       <node id="5637103006919122220" at="27,79,28,73" concept="2" />
-      <node id="5637103006919122220" at="28,73,29,57" concept="5" />
-      <node id="5637103006919122220" at="29,57,30,59" concept="5" />
-      <node id="5637103006919122220" at="31,35,32,82" concept="5" />
-      <node id="5637103006919122220" at="32,82,33,94" concept="6" />
-      <node id="5637103006919122220" at="34,10,35,22" concept="6" />
-      <node id="5637103006919122218" at="16,0,19,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919122220" at="30,59,35,22" concept="3" />
-      <node id="5637103006919122220" at="19,0,37,0" concept="4" trace="createProperty_szksb9_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919122220" at="28,73,29,57" concept="6" />
+      <node id="5637103006919122220" at="29,57,30,59" concept="6" />
+      <node id="5637103006919122220" at="31,35,32,82" concept="6" />
+      <node id="5637103006919122220" at="32,82,33,94" concept="7" />
+      <node id="5637103006919122220" at="34,10,35,22" concept="7" />
+      <node id="5637103006919122218" at="16,0,19,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919122220" at="30,59,35,22" concept="4" />
+      <node id="5637103006919122220" at="19,0,37,0" concept="5" trace="createProperty_szksb9_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="5637103006919122218" at="16,79,17,61" />
       <scope id="5637103006919122220" at="31,35,33,94">
         <var name="manager" id="5637103006919122220" />
@@ -1049,18 +1259,18 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/5637103006919122491">
     <file name="NewLineResponseItem_Editor.java">
-      <node id="5637103006919122491" at="17,79,18,61" concept="6" />
-      <node id="5637103006919122493" at="20,87,21,86" concept="5" />
+      <node id="5637103006919122491" at="17,79,18,61" concept="7" />
+      <node id="5637103006919122493" at="20,87,21,86" concept="6" />
       <node id="5637103006919122493" at="21,86,22,46" concept="2" />
       <node id="5637103006919122493" at="22,46,23,28" concept="2" />
-      <node id="5637103006919122493" at="23,28,24,34" concept="5" />
+      <node id="5637103006919122493" at="23,28,24,34" concept="6" />
       <node id="5637103006919122493" at="24,34,25,63" concept="2" />
       <node id="5637103006919122493" at="25,63,26,40" concept="2" />
       <node id="5637103006919122493" at="26,40,27,79" concept="2" />
       <node id="5637103006919122493" at="27,79,28,34" concept="2" />
-      <node id="5637103006919122493" at="28,34,29,22" concept="6" />
-      <node id="5637103006919122491" at="17,0,20,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5637103006919122493" at="20,0,31,0" concept="4" trace="createConstant_e0ktqa_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919122493" at="28,34,29,22" concept="7" />
+      <node id="5637103006919122491" at="17,0,20,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5637103006919122493" at="20,0,31,0" concept="5" trace="createConstant_e0ktqa_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="5637103006919122491" at="17,79,18,61" />
       <scope id="5637103006919122491" at="17,0,20,0">
         <var name="editorContext" id="5637103006919122491" />
@@ -1079,23 +1289,23 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/5842059399443118722">
     <file name="PastedNodeReference_Editor.java">
-      <node id="5842059399443118722" at="34,79,35,64" concept="6" />
-      <node id="5842059399443118722" at="37,90,38,40" concept="5" />
+      <node id="5842059399443118722" at="34,79,35,64" concept="7" />
+      <node id="5842059399443118722" at="37,90,38,40" concept="6" />
       <node id="5842059399443118722" at="38,40,39,104" concept="2" />
-      <node id="5842059399443118722" at="39,104,40,33" concept="5" />
+      <node id="5842059399443118722" at="39,104,40,33" concept="6" />
       <node id="5842059399443118722" at="41,31,42,72" concept="2" />
       <node id="5842059399443118722" at="43,12,44,83" concept="2" />
-      <node id="5842059399443118722" at="45,5,46,67" concept="5" />
+      <node id="5842059399443118722" at="45,5,46,67" concept="6" />
       <node id="5842059399443118722" at="47,26,48,27" concept="2" />
-      <node id="5842059399443118722" at="49,5,50,34" concept="5" />
+      <node id="5842059399443118722" at="49,5,50,34" concept="6" />
       <node id="5842059399443118722" at="50,34,51,113" concept="2" />
       <node id="5842059399443118722" at="51,113,52,40" concept="2" />
       <node id="5842059399443118722" at="52,40,53,79" concept="2" />
-      <node id="5842059399443118722" at="53,79,54,22" concept="6" />
-      <node id="5872110852615929507" at="56,96,57,181" concept="6" />
-      <node id="5842059399443118722" at="59,90,60,99" concept="5" />
+      <node id="5842059399443118722" at="53,79,54,22" concept="7" />
+      <node id="5872110852615929507" at="56,96,57,181" concept="7" />
+      <node id="5842059399443118722" at="59,90,60,99" concept="6" />
       <node id="5842059399443118722" at="60,99,61,49" concept="2" />
-      <node id="5842059399443118722" at="61,49,62,34" concept="5" />
+      <node id="5842059399443118722" at="61,49,62,34" concept="6" />
       <node id="5842059399443118722" at="62,34,63,52" concept="2" />
       <node id="5842059399443118722" at="63,52,64,40" concept="2" />
       <node id="5842059399443118722" at="64,40,65,82" concept="0" />
@@ -1104,89 +1314,89 @@
       <node id="5842059399443118722" at="65,82,66,81" concept="2" />
       <node id="5842059399443118722" at="66,81,67,82" concept="0" />
       <node id="5842059399443118722" at="66,81,67,82" concept="2" />
-      <node id="5842059399443118722" at="67,82,68,22" concept="6" />
-      <node id="8710322537168568271" at="70,89,71,87" concept="5" />
+      <node id="5842059399443118722" at="67,82,68,22" concept="7" />
+      <node id="8710322537168568271" at="70,89,71,87" concept="6" />
       <node id="8710322537168568271" at="71,87,72,48" concept="2" />
-      <node id="8710322537168568271" at="72,48,73,34" concept="5" />
+      <node id="8710322537168568271" at="72,48,73,34" concept="6" />
       <node id="8710322537168568271" at="73,34,74,58" concept="2" />
       <node id="8710322537168568271" at="74,58,75,110" concept="2" />
       <node id="8710322537168568271" at="75,110,76,51" concept="2" />
       <node id="8710322537168568271" at="76,51,77,50" concept="2" />
       <node id="8710322537168568271" at="77,50,78,40" concept="2" />
       <node id="8710322537168568271" at="78,40,79,34" concept="2" />
-      <node id="8710322537168568271" at="79,34,80,22" concept="6" />
-      <node id="5842059399443118722" at="82,88,83,81" concept="5" />
+      <node id="8710322537168568271" at="79,34,80,22" concept="7" />
+      <node id="5842059399443118722" at="82,88,83,81" concept="6" />
       <node id="5842059399443118722" at="83,81,84,31" concept="2" />
       <node id="5842059399443118722" at="84,31,85,44" concept="2" />
-      <node id="5842059399443118722" at="85,44,86,26" concept="5" />
+      <node id="5842059399443118722" at="85,44,86,26" concept="6" />
       <node id="5842059399443118722" at="86,26,87,92" concept="2" />
       <node id="5842059399443118722" at="87,92,88,58" concept="2" />
       <node id="5842059399443118722" at="89,39,90,40" concept="2" />
       <node id="5842059399443118722" at="90,40,91,35" concept="2" />
       <node id="5842059399443118722" at="92,5,93,73" concept="2" />
-      <node id="5842059399443118722" at="93,73,94,57" concept="5" />
-      <node id="5842059399443118722" at="94,57,95,59" concept="5" />
-      <node id="5842059399443118722" at="96,35,97,82" concept="5" />
-      <node id="5842059399443118722" at="97,82,98,94" concept="6" />
-      <node id="5842059399443118722" at="99,10,100,22" concept="6" />
-      <node id="8710322537167983273" at="103,34,104,14" concept="8" />
-      <node id="8710322537167983273" at="106,69,107,67" concept="6" />
-      <node id="8710322537167983273" at="109,81,110,80" concept="6" />
-      <node id="8710322537168170176" at="114,33,115,267" concept="6" />
-      <node id="8710322537167984223" at="119,46,120,48" concept="6" />
+      <node id="5842059399443118722" at="93,73,94,57" concept="6" />
+      <node id="5842059399443118722" at="94,57,95,59" concept="6" />
+      <node id="5842059399443118722" at="96,35,97,82" concept="6" />
+      <node id="5842059399443118722" at="97,82,98,94" concept="7" />
+      <node id="5842059399443118722" at="99,10,100,22" concept="7" />
+      <node id="8710322537167983273" at="103,34,104,14" concept="9" />
+      <node id="8710322537167983273" at="106,69,107,67" concept="7" />
+      <node id="8710322537167983273" at="109,81,110,80" concept="7" />
+      <node id="8710322537168170176" at="114,33,115,267" concept="7" />
+      <node id="8710322537167984223" at="119,46,120,48" concept="7" />
       <node id="8710322537167984223" at="122,15,123,81" concept="2" />
       <node id="8710322537167984223" at="123,81,124,84" concept="2" />
       <node id="8710322537167984223" at="124,84,125,65" concept="2" />
-      <node id="8710322537167984223" at="125,65,126,36" concept="5" />
+      <node id="8710322537167984223" at="125,65,126,36" concept="6" />
       <node id="8710322537167984223" at="126,36,127,112" concept="2" />
       <node id="8710322537167984223" at="127,112,128,53" concept="2" />
       <node id="8710322537167984223" at="128,53,129,52" concept="2" />
       <node id="8710322537167984223" at="129,52,130,42" concept="2" />
-      <node id="8710322537167984223" at="130,42,131,24" concept="6" />
-      <node id="8710322537168568347" at="134,89,135,87" concept="5" />
+      <node id="8710322537167984223" at="130,42,131,24" concept="7" />
+      <node id="8710322537168568347" at="134,89,135,87" concept="6" />
       <node id="8710322537168568347" at="135,87,136,48" concept="2" />
-      <node id="8710322537168568347" at="136,48,137,34" concept="5" />
+      <node id="8710322537168568347" at="136,48,137,34" concept="6" />
       <node id="8710322537168568347" at="137,34,138,57" concept="2" />
       <node id="8710322537168568347" at="138,57,139,110" concept="2" />
       <node id="8710322537168568347" at="139,110,140,51" concept="2" />
       <node id="8710322537168568347" at="140,51,141,50" concept="2" />
       <node id="8710322537168568347" at="141,50,142,40" concept="2" />
       <node id="8710322537168568347" at="142,40,143,34" concept="2" />
-      <node id="8710322537168568347" at="143,34,144,22" concept="6" />
-      <node id="5872110852615929521" at="148,31,149,132" concept="6" />
-      <node id="5872110852615929517" at="153,44,154,46" concept="6" />
+      <node id="8710322537168568347" at="143,34,144,22" concept="7" />
+      <node id="5872110852615929521" at="148,31,149,132" concept="7" />
+      <node id="5872110852615929517" at="153,44,154,46" concept="7" />
       <node id="5872110852615929517" at="156,13,157,79" concept="2" />
       <node id="5872110852615929517" at="157,79,158,82" concept="2" />
       <node id="5872110852615929517" at="158,82,159,60" concept="2" />
-      <node id="5872110852615929517" at="159,60,160,34" concept="5" />
+      <node id="5872110852615929517" at="159,60,160,34" concept="6" />
       <node id="5872110852615929517" at="160,34,161,105" concept="2" />
       <node id="5872110852615929517" at="161,105,162,40" concept="2" />
-      <node id="5872110852615929517" at="162,40,163,22" concept="6" />
+      <node id="5872110852615929517" at="162,40,163,22" concept="7" />
       <node id="5842059399443118722" at="43,10,45,5" concept="0" />
-      <node id="8710322537167984223" at="117,0,119,0" concept="4" trace="setText#(Ljava/lang/String;)V" />
-      <node id="5872110852615929517" at="151,0,153,0" concept="4" trace="setText#(Ljava/lang/String;)V" />
-      <node id="5842059399443118722" at="34,0,37,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5842059399443118722" at="46,67,49,5" concept="3" />
-      <node id="5872110852615929505" at="56,0,59,0" concept="7" trace="renderingCondition_7k9x8q_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)Z" />
+      <node id="8710322537167984223" at="117,0,119,0" concept="5" trace="setText#(Ljava/lang/String;)V" />
+      <node id="5872110852615929517" at="151,0,153,0" concept="5" trace="setText#(Ljava/lang/String;)V" />
+      <node id="5842059399443118722" at="34,0,37,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5842059399443118722" at="46,67,49,5" concept="4" />
+      <node id="5872110852615929505" at="56,0,59,0" concept="8" trace="renderingCondition_7k9x8q_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)Z" />
       <node id="8710322537167983273" at="103,0,106,0" concept="1" trace="_Inline_7k9x8q_a1a0#()V" />
-      <node id="8710322537167983273" at="106,0,109,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="8710322537167983273" at="109,0,112,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="8710322537167984223" at="114,0,117,0" concept="4" trace="getText#()Ljava/lang/String;" />
-      <node id="8710322537167984223" at="119,0,122,0" concept="4" trace="isValidText#(Ljava/lang/String;)Z" />
-      <node id="5872110852615929517" at="148,0,151,0" concept="4" trace="getText#()Ljava/lang/String;" />
-      <node id="5872110852615929517" at="153,0,156,0" concept="4" trace="isValidText#(Ljava/lang/String;)Z" />
-      <node id="5842059399443118722" at="88,58,92,5" concept="3" />
-      <node id="5842059399443118722" at="40,33,45,5" concept="3" />
-      <node id="5842059399443118722" at="95,59,100,22" concept="3" />
-      <node id="8710322537167984223" at="112,118,122,15" concept="5" />
-      <node id="5872110852615929517" at="146,113,156,13" concept="5" />
-      <node id="5842059399443118722" at="59,0,70,0" concept="4" trace="createCollection_7k9x8q_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="8710322537168568271" at="70,0,82,0" concept="4" trace="createConstant_7k9x8q_a0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="8710322537168568347" at="134,0,146,0" concept="4" trace="createConstant_7k9x8q_c0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5842059399443118722" at="37,0,56,0" concept="4" trace="createAlternation_7k9x8q_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5872110852615929517" at="146,0,165,0" concept="4" trace="createReadOnlyModelAccessor_7k9x8q_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="5842059399443118722" at="82,0,102,0" concept="4" trace="createRefCell_7k9x8q_b0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="8710322537167984223" at="112,0,133,0" concept="4" trace="createReadOnlyModelAccessor_7k9x8q_a0b0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="8710322537167983273" at="106,0,109,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="8710322537167983273" at="109,0,112,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="8710322537167984223" at="114,0,117,0" concept="5" trace="getText#()Ljava/lang/String;" />
+      <node id="8710322537167984223" at="119,0,122,0" concept="5" trace="isValidText#(Ljava/lang/String;)Z" />
+      <node id="5872110852615929517" at="148,0,151,0" concept="5" trace="getText#()Ljava/lang/String;" />
+      <node id="5872110852615929517" at="153,0,156,0" concept="5" trace="isValidText#(Ljava/lang/String;)Z" />
+      <node id="5842059399443118722" at="88,58,92,5" concept="4" />
+      <node id="5842059399443118722" at="40,33,45,5" concept="4" />
+      <node id="5842059399443118722" at="95,59,100,22" concept="4" />
+      <node id="8710322537167984223" at="112,118,122,15" concept="6" />
+      <node id="5872110852615929517" at="146,113,156,13" concept="6" />
+      <node id="5842059399443118722" at="59,0,70,0" concept="5" trace="createCollection_7k9x8q_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="8710322537168568271" at="70,0,82,0" concept="5" trace="createConstant_7k9x8q_a0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="8710322537168568347" at="134,0,146,0" concept="5" trace="createConstant_7k9x8q_c0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5842059399443118722" at="37,0,56,0" concept="5" trace="createAlternation_7k9x8q_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5872110852615929517" at="146,0,165,0" concept="5" trace="createReadOnlyModelAccessor_7k9x8q_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="5842059399443118722" at="82,0,102,0" concept="5" trace="createRefCell_7k9x8q_b0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="8710322537167984223" at="112,0,133,0" concept="5" trace="createReadOnlyModelAccessor_7k9x8q_a0b0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="8710322537167984223" at="117,39,117,39" />
       <scope id="5872110852615929517" at="151,37,151,37" />
       <scope id="5842059399443118722" at="34,79,35,64" />
@@ -1306,15 +1516,15 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/6224631407134024896">
     <file name="InterpretedCommand_Editor.java">
-      <node id="6224631407134024896" at="14,79,15,62" concept="6" />
-      <node id="9053534423437896051" at="17,88,18,131" concept="5" />
-      <node id="9053534423437896051" at="18,131,19,67" concept="5" />
+      <node id="6224631407134024896" at="14,79,15,62" concept="7" />
+      <node id="9053534423437896051" at="17,88,18,131" concept="6" />
+      <node id="9053534423437896051" at="18,131,19,67" concept="6" />
       <node id="9053534423437896051" at="20,26,21,27" concept="2" />
       <node id="9053534423437896051" at="22,5,23,79" concept="2" />
-      <node id="9053534423437896051" at="23,79,24,22" concept="6" />
-      <node id="6224631407134024896" at="14,0,17,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="9053534423437896051" at="19,67,22,5" concept="3" />
-      <node id="9053534423437896051" at="17,0,26,0" concept="4" trace="createComponent_k55s8m_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="9053534423437896051" at="23,79,24,22" concept="7" />
+      <node id="6224631407134024896" at="14,0,17,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="9053534423437896051" at="19,67,22,5" concept="4" />
+      <node id="9053534423437896051" at="17,0,26,0" concept="5" trace="createComponent_k55s8m_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="6224631407134024896" at="14,79,15,62" />
       <scope id="9053534423437896051" at="20,26,21,27" />
       <scope id="6224631407134024896" at="14,0,17,0">
@@ -1332,37 +1542,94 @@
       <unit id="6224631407134024896" at="13,0,27,0" name="jetbrains.mps.console.base.editor.InterpretedCommand_Editor" />
     </file>
   </root>
+  <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/6558068108108748448">
+    <file name="ExceptionHolder_Editor.java">
+      <node id="6558068108108748448" at="20,79,21,63" concept="7" />
+      <node id="6558068108108748448" at="23,89,24,99" concept="6" />
+      <node id="6558068108108748448" at="24,99,25,48" concept="2" />
+      <node id="6558068108108748448" at="25,48,26,28" concept="2" />
+      <node id="6558068108108748448" at="26,28,27,34" concept="6" />
+      <node id="6558068108108748448" at="27,34,28,111" concept="2" />
+      <node id="6558068108108748448" at="28,111,29,40" concept="2" />
+      <node id="6558068108108748448" at="29,40,30,79" concept="2" />
+      <node id="6558068108108748448" at="30,79,31,81" concept="0" />
+      <node id="6558068108108748448" at="30,79,31,81" concept="2" />
+      <node id="6558068108108748448" at="31,81,32,82" concept="0" />
+      <node id="6558068108108748448" at="31,81,32,82" concept="2" />
+      <node id="6558068108108748448" at="32,82,33,22" concept="7" />
+      <node id="6558068108108761659" at="35,88,36,96" concept="6" />
+      <node id="6558068108108761659" at="36,96,37,47" concept="2" />
+      <node id="6558068108108761659" at="37,47,38,34" concept="2" />
+      <node id="6558068108108761659" at="38,34,39,22" concept="7" />
+      <node id="6558068108108763240" at="41,89,42,153" concept="6" />
+      <node id="6558068108108763240" at="42,153,43,22" concept="7" />
+      <node id="6558068108108748448" at="20,0,23,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6558068108108763240" at="41,0,45,0" concept="5" trace="createComponent_hbc894_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6558068108108761659" at="35,0,41,0" concept="5" trace="createConstant_hbc894_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6558068108108748448" at="23,0,35,0" concept="5" trace="createCollection_hbc894_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <scope id="6558068108108748448" at="20,79,21,63" />
+      <scope id="6558068108108748448" at="30,79,31,81" />
+      <scope id="6558068108108748448" at="31,81,32,82" />
+      <scope id="6558068108108763240" at="41,89,43,22">
+        <var name="editorCell" id="6558068108108763240" />
+      </scope>
+      <scope id="6558068108108748448" at="20,0,23,0">
+        <var name="editorContext" id="6558068108108748448" />
+        <var name="node" id="6558068108108748448" />
+      </scope>
+      <scope id="6558068108108761659" at="35,88,39,22">
+        <var name="editorCell" id="6558068108108761659" />
+      </scope>
+      <scope id="6558068108108763240" at="41,0,45,0">
+        <var name="editorContext" id="6558068108108763240" />
+        <var name="node" id="6558068108108763240" />
+      </scope>
+      <scope id="6558068108108761659" at="35,0,41,0">
+        <var name="editorContext" id="6558068108108761659" />
+        <var name="node" id="6558068108108761659" />
+      </scope>
+      <scope id="6558068108108748448" at="23,89,33,22">
+        <var name="editorCell" id="6558068108108748448" />
+        <var name="style" id="6558068108108748448" />
+      </scope>
+      <scope id="6558068108108748448" at="23,0,35,0">
+        <var name="editorContext" id="6558068108108748448" />
+        <var name="node" id="6558068108108748448" />
+      </scope>
+      <unit id="6558068108108748448" at="19,0,46,0" name="jetbrains.mps.console.base.editor.ExceptionHolder_Editor" />
+    </file>
+  </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/6558068108108754952">
     <file name="ClickableEditorComponent.java">
-      <node id="6558068108108754952" at="23,47,24,35" concept="6" />
-      <node id="6558068108108754952" at="26,79,27,61" concept="6" />
-      <node id="6558068108108754952" at="29,87,30,82" concept="5" />
+      <node id="6558068108108754952" at="23,47,24,35" concept="7" />
+      <node id="6558068108108754952" at="26,79,27,61" concept="7" />
+      <node id="6558068108108754952" at="29,87,30,82" concept="6" />
       <node id="6558068108108754952" at="30,82,31,29" concept="2" />
       <node id="6558068108108754952" at="31,29,32,42" concept="2" />
-      <node id="6558068108108754952" at="32,42,33,26" concept="5" />
+      <node id="6558068108108754952" at="32,42,33,26" concept="6" />
       <node id="6558068108108754952" at="33,26,34,58" concept="2" />
       <node id="6558068108108754952" at="34,58,35,46" concept="2" />
-      <node id="6558068108108754952" at="35,46,36,34" concept="5" />
+      <node id="6558068108108754952" at="35,46,36,34" concept="6" />
       <node id="6558068108108754952" at="36,34,37,264" concept="2" />
       <node id="6558068108108754952" at="37,264,38,220" concept="2" />
       <node id="6558068108108754952" at="38,220,39,40" concept="2" />
       <node id="6558068108108754952" at="39,40,40,73" concept="2" />
-      <node id="6558068108108754952" at="40,73,41,57" concept="5" />
-      <node id="6558068108108754952" at="41,57,42,59" concept="5" />
-      <node id="6558068108108754952" at="43,35,44,82" concept="5" />
-      <node id="6558068108108754952" at="44,82,45,94" concept="6" />
-      <node id="6558068108108754952" at="46,10,47,22" concept="6" />
-      <node id="2348043250037306238" at="50,121,51,33" concept="6" />
-      <node id="2348043250037306245" at="52,12,53,28" concept="6" />
-      <node id="2348043250037306250" at="56,108,57,122" concept="6" />
+      <node id="6558068108108754952" at="40,73,41,57" concept="6" />
+      <node id="6558068108108754952" at="41,57,42,59" concept="6" />
+      <node id="6558068108108754952" at="43,35,44,82" concept="6" />
+      <node id="6558068108108754952" at="44,82,45,94" concept="7" />
+      <node id="6558068108108754952" at="46,10,47,22" concept="7" />
+      <node id="2348043250037306238" at="50,121,51,33" concept="7" />
+      <node id="2348043250037306245" at="52,12,53,28" concept="7" />
+      <node id="2348043250037306250" at="56,108,57,122" concept="7" />
       <node id="2348043250037306243" at="52,10,54,5" concept="0" />
-      <node id="6558068108108754952" at="23,0,26,0" concept="4" trace="getContextHints#()Ljava/util/Collection;" />
-      <node id="6558068108108754952" at="26,0,29,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="2348043250037306248" at="56,0,59,0" concept="7" trace="_StyleParameter_QueryFunction_k1kh9z_a1a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
-      <node id="6558068108108754952" at="42,59,47,22" concept="3" />
-      <node id="2348043250037306236" at="49,106,54,5" concept="3" />
-      <node id="2348043250037306234" at="49,0,56,0" concept="7" trace="_StyleParameter_QueryFunction_k1kh9z_a0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/awt/Color;" />
-      <node id="6558068108108754952" at="29,0,49,0" concept="4" trace="createProperty_k1kh9z_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6558068108108754952" at="23,0,26,0" concept="5" trace="getContextHints#()Ljava/util/Collection;" />
+      <node id="6558068108108754952" at="26,0,29,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="2348043250037306248" at="56,0,59,0" concept="8" trace="_StyleParameter_QueryFunction_k1kh9z_a1a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
+      <node id="6558068108108754952" at="42,59,47,22" concept="4" />
+      <node id="2348043250037306236" at="49,106,54,5" concept="4" />
+      <node id="2348043250037306234" at="49,0,56,0" concept="8" trace="_StyleParameter_QueryFunction_k1kh9z_a0a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/awt/Color;" />
+      <node id="6558068108108754952" at="29,0,49,0" concept="5" trace="createProperty_k1kh9z_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="6558068108108754952" at="23,47,24,35" />
       <scope id="6558068108108754952" at="26,79,27,61" />
       <scope id="2348043250037306237" at="50,121,51,33" />
@@ -1401,8 +1668,8 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/6928665434432986486">
     <file name="HelpCommand_Editor.java">
-      <node id="6928665434432986486" at="22,79,23,63" concept="6" />
-      <node id="6928665434432986486" at="25,89,26,96" concept="5" />
+      <node id="6928665434432986486" at="22,79,23,63" concept="7" />
+      <node id="6928665434432986486" at="25,89,26,96" concept="6" />
       <node id="6928665434432986486" at="26,96,27,48" concept="2" />
       <node id="6928665434432986486" at="27,48,28,28" concept="2" />
       <node id="6928665434432986486" at="28,28,29,79" concept="2" />
@@ -1412,41 +1679,41 @@
       <node id="6928665434432986486" at="30,82,31,81" concept="2" />
       <node id="6928665434432986486" at="31,81,32,80" concept="0" />
       <node id="6928665434432986486" at="31,81,32,80" concept="2" />
-      <node id="6928665434432986486" at="32,80,33,22" concept="6" />
-      <node id="6928665434433027810" at="35,89,36,131" concept="5" />
-      <node id="6928665434433027810" at="36,131,37,34" concept="5" />
+      <node id="6928665434432986486" at="32,80,33,22" concept="7" />
+      <node id="6928665434433027810" at="35,89,36,131" concept="6" />
+      <node id="6928665434433027810" at="36,131,37,34" concept="6" />
       <node id="6928665434433027810" at="37,34,38,50" concept="2" />
       <node id="6928665434433027810" at="38,50,39,58" concept="2" />
       <node id="6928665434433027810" at="39,58,40,40" concept="2" />
-      <node id="6928665434433027810" at="40,40,41,22" concept="6" />
-      <node id="6928665434439099360" at="43,88,44,86" concept="5" />
+      <node id="6928665434433027810" at="40,40,41,22" concept="7" />
+      <node id="6928665434439099360" at="43,88,44,86" concept="6" />
       <node id="6928665434439099360" at="44,86,45,47" concept="2" />
       <node id="6928665434439099360" at="45,47,46,34" concept="2" />
-      <node id="6928665434439099360" at="46,34,47,22" concept="6" />
-      <node id="6928665434432986486" at="49,87,50,248" concept="5" />
-      <node id="6928665434432986486" at="50,248,51,33" concept="6" />
-      <node id="6928665434432986486" at="54,120,55,49" concept="8" />
-      <node id="6928665434432986486" at="57,81,58,74" concept="5" />
+      <node id="6928665434439099360" at="46,34,47,22" concept="7" />
+      <node id="6928665434432986486" at="49,87,50,248" concept="6" />
+      <node id="6928665434432986486" at="50,248,51,33" concept="7" />
+      <node id="6928665434432986486" at="54,120,55,49" concept="9" />
+      <node id="6928665434432986486" at="57,81,58,74" concept="6" />
       <node id="6928665434432986486" at="58,74,59,41" concept="2" />
-      <node id="6928665434432986486" at="59,41,60,24" concept="6" />
+      <node id="6928665434432986486" at="59,41,60,24" concept="7" />
       <node id="6928665434432986486" at="62,69,63,137" concept="2" />
       <node id="6928665434432986486" at="64,41,65,37" concept="2" />
-      <node id="6928665434432986486" at="71,44,72,54" concept="5" />
+      <node id="6928665434432986486" at="71,44,72,54" concept="6" />
       <node id="6928665434432986486" at="72,54,73,43" concept="2" />
       <node id="6928665434432986486" at="73,43,74,40" concept="2" />
-      <node id="6928665434432986486" at="74,40,75,24" concept="6" />
-      <node id="6928665434432986486" at="78,40,79,16" concept="6" />
-      <node id="6928665434432986486" at="22,0,25,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434432986486" at="74,40,75,24" concept="7" />
+      <node id="6928665434432986486" at="78,40,79,16" concept="7" />
+      <node id="6928665434432986486" at="22,0,25,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="6928665434432986486" at="54,0,57,0" concept="1" trace="targetSingleRoleHandler_qkizq9_c0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
-      <node id="6928665434432986486" at="63,137,66,7" concept="3" />
-      <node id="6928665434432986486" at="78,0,81,0" concept="4" trace="getNoTargetText#()Ljava/lang/String;" />
-      <node id="6928665434432986486" at="49,0,53,0" concept="4" trace="createRefNode_qkizq9_c0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434432986486" at="57,0,62,0" concept="4" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434439099360" at="43,0,49,0" concept="4" trace="createConstant_qkizq9_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434432986486" at="62,0,68,0" concept="4" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
-      <node id="6928665434432986486" at="70,0,77,0" concept="4" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434433027810" at="35,0,43,0" concept="4" trace="createComponent_qkizq9_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434432986486" at="25,0,35,0" concept="4" trace="createCollection_qkizq9_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434432986486" at="63,137,66,7" concept="4" />
+      <node id="6928665434432986486" at="78,0,81,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="6928665434432986486" at="49,0,53,0" concept="5" trace="createRefNode_qkizq9_c0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434432986486" at="57,0,62,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434439099360" at="43,0,49,0" concept="5" trace="createConstant_qkizq9_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434432986486" at="62,0,68,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="6928665434432986486" at="70,0,77,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434433027810" at="35,0,43,0" concept="5" trace="createComponent_qkizq9_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434432986486" at="25,0,35,0" concept="5" trace="createCollection_qkizq9_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="6928665434432986486" at="22,79,23,63" />
       <scope id="6928665434432986486" at="29,79,30,82" />
       <scope id="6928665434432986486" at="30,82,31,81" />
@@ -1515,46 +1782,46 @@
   </root>
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/6928665434433761876">
     <file name="HelpConceptReference_Editor.java">
-      <node id="6928665434433761876" at="23,79,24,63" concept="6" />
-      <node id="6928665434433761876" at="26,89,27,96" concept="5" />
+      <node id="6928665434433761876" at="23,79,24,63" concept="7" />
+      <node id="6928665434433761876" at="26,89,27,96" concept="6" />
       <node id="6928665434433761876" at="27,96,28,48" concept="2" />
       <node id="6928665434433761876" at="28,48,29,28" concept="2" />
       <node id="6928665434433761876" at="29,28,30,79" concept="2" />
       <node id="6928665434433761876" at="30,79,31,80" concept="0" />
       <node id="6928665434433761876" at="30,79,31,80" concept="2" />
-      <node id="6928665434433761876" at="31,80,32,22" concept="6" />
-      <node id="6928665434433761876" at="34,87,35,81" concept="5" />
+      <node id="6928665434433761876" at="31,80,32,22" concept="7" />
+      <node id="6928665434433761876" at="34,87,35,81" concept="6" />
       <node id="6928665434433761876" at="35,81,36,32" concept="2" />
       <node id="6928665434433761876" at="36,32,37,45" concept="2" />
-      <node id="6928665434433761876" at="37,45,38,26" concept="5" />
+      <node id="6928665434433761876" at="37,45,38,26" concept="6" />
       <node id="6928665434433761876" at="38,26,39,92" concept="2" />
       <node id="6928665434433761876" at="39,92,40,58" concept="2" />
       <node id="6928665434433761876" at="41,39,42,40" concept="2" />
       <node id="6928665434433761876" at="42,40,43,36" concept="2" />
       <node id="6928665434433761876" at="44,5,45,73" concept="2" />
-      <node id="6928665434433761876" at="45,73,46,57" concept="5" />
-      <node id="6928665434433761876" at="46,57,47,59" concept="5" />
-      <node id="6928665434433761876" at="48,35,49,82" concept="5" />
-      <node id="6928665434433761876" at="49,82,50,94" concept="6" />
-      <node id="6928665434433761876" at="51,10,52,22" concept="6" />
-      <node id="6928665434433762049" at="55,33,56,14" concept="8" />
-      <node id="6928665434433762049" at="58,69,59,67" concept="6" />
-      <node id="6928665434433762049" at="61,81,62,79" concept="6" />
-      <node id="6928665434433922255" at="64,105,65,124" concept="5" />
+      <node id="6928665434433761876" at="45,73,46,57" concept="6" />
+      <node id="6928665434433761876" at="46,57,47,59" concept="6" />
+      <node id="6928665434433761876" at="48,35,49,82" concept="6" />
+      <node id="6928665434433761876" at="49,82,50,94" concept="7" />
+      <node id="6928665434433761876" at="51,10,52,22" concept="7" />
+      <node id="6928665434433762049" at="55,33,56,14" concept="9" />
+      <node id="6928665434433762049" at="58,69,59,67" concept="7" />
+      <node id="6928665434433762049" at="61,81,62,79" concept="7" />
+      <node id="6928665434433922255" at="64,105,65,124" concept="6" />
       <node id="6928665434433922255" at="65,124,66,64" concept="2" />
-      <node id="6928665434433922255" at="66,64,67,36" concept="5" />
+      <node id="6928665434433922255" at="66,64,67,36" concept="6" />
       <node id="6928665434433922255" at="67,36,68,57" concept="2" />
       <node id="6928665434433922255" at="68,57,69,42" concept="2" />
-      <node id="6928665434433922255" at="69,42,70,24" concept="6" />
-      <node id="6928665434433761876" at="23,0,26,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434433922255" at="69,42,70,24" concept="7" />
+      <node id="6928665434433761876" at="23,0,26,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <node id="6928665434433762049" at="55,0,58,0" concept="1" trace="_Inline_nmmm44_a0a#()V" />
-      <node id="6928665434433762049" at="58,0,61,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434433762049" at="61,0,64,0" concept="4" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434433761876" at="40,58,44,5" concept="3" />
-      <node id="6928665434433761876" at="47,59,52,22" concept="3" />
-      <node id="6928665434433761876" at="26,0,34,0" concept="4" trace="createCollection_nmmm44_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434433922255" at="64,0,72,0" concept="4" trace="createReferencePresentation_nmmm44_a0a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
-      <node id="6928665434433761876" at="34,0,54,0" concept="4" trace="createRefCell_nmmm44_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434433762049" at="58,0,61,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434433762049" at="61,0,64,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434433761876" at="40,58,44,5" concept="4" />
+      <node id="6928665434433761876" at="47,59,52,22" concept="4" />
+      <node id="6928665434433761876" at="26,0,34,0" concept="5" trace="createCollection_nmmm44_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434433922255" at="64,0,72,0" concept="5" trace="createReferencePresentation_nmmm44_a0a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="6928665434433761876" at="34,0,54,0" concept="5" trace="createRefCell_nmmm44_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
       <scope id="6928665434433761876" at="23,79,24,63" />
       <scope id="6928665434433761876" at="30,79,31,80" />
       <scope id="6928665434433762049" at="55,33,56,14" />
@@ -1608,7 +1875,7 @@
   <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/7409036893176441835">
     <file name="ConsoleStyle_StyleSheet.java">
       <node id="7409036893176441835" at="10,73,11,50" concept="2" />
-      <node id="7409036893176441835" at="10,0,13,0" concept="7" trace="apply_ReadOnly#(Ljetbrains/mps/openapi/editor/style/Style;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="7409036893176441835" at="10,0,13,0" concept="8" trace="apply_ReadOnly#(Ljetbrains/mps/openapi/editor/style/Style;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
       <scope id="7409036893176441835" at="10,73,11,50" />
       <scope id="7409036893176441835" at="10,0,13,0">
         <var name="editorCell" id="7409036893176441835" />
@@ -1617,5 +1884,309 @@
       <unit id="7409036893176441835" at="9,0,15,0" name="jetbrains.mps.console.base.editor.ConsoleStyle_StyleSheet" />
     </file>
   </root>
+  <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/7656298970875048514">
+    <file name="AbstractPrintExpression_Actions.java">
+      <node id="7656298970875048514" at="15,95,16,130" concept="2" />
+      <node id="7656298970875048514" at="16,130,17,136" concept="2" />
+      <node id="7656298970875048514" at="20,0,21,0" concept="3" trace="myNode" />
+      <node id="7656298970875048514" at="21,63,22,25" concept="2" />
+      <node id="7656298970875048514" at="24,54,25,56" concept="2" />
+      <node id="7656298970875141821" at="27,75,28,213" concept="2" />
+      <node id="7656298970875048514" at="32,0,33,0" concept="3" trace="myNode" />
+      <node id="7656298970875048514" at="33,66,34,25" concept="2" />
+      <node id="7656298970875048514" at="36,54,37,56" concept="2" />
+      <node id="7656298970875141821" at="39,75,40,213" concept="2" />
+      <node id="7656298970875048514" at="21,0,24,0" concept="1" trace="AbstractPrintExpression_Actions_DELETE#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7656298970875048514" at="24,0,27,0" concept="5" trace="execute#(Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="7656298970875048514" at="27,0,30,0" concept="5" trace="execute_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7656298970875048514" at="33,0,36,0" concept="1" trace="AbstractPrintExpression_Actions_BACKSPACE#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7656298970875048514" at="36,0,39,0" concept="5" trace="execute#(Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="7656298970875048514" at="39,0,42,0" concept="5" trace="execute_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7656298970875048514" at="15,0,19,0" concept="8" trace="setCellActions#(Ljetbrains/mps/openapi/editor/cells/EditorCell;Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <scope id="7656298970875048514" at="21,63,22,25" />
+      <scope id="7656298970875048514" at="24,54,25,56" />
+      <scope id="7656298970875048758" at="27,75,28,213" />
+      <scope id="7656298970875048514" at="33,66,34,25" />
+      <scope id="7656298970875048514" at="36,54,37,56" />
+      <scope id="7656298970875048758" at="39,75,40,213" />
+      <scope id="7656298970875048514" at="15,95,17,136" />
+      <scope id="7656298970875048514" at="21,0,24,0">
+        <var name="node" id="7656298970875048514" />
+      </scope>
+      <scope id="7656298970875048514" at="24,0,27,0">
+        <var name="editorContext" id="7656298970875048514" />
+      </scope>
+      <scope id="7656298970875048514" at="27,0,30,0">
+        <var name="editorContext" id="7656298970875048514" />
+        <var name="node" id="7656298970875048514" />
+      </scope>
+      <scope id="7656298970875048514" at="33,0,36,0">
+        <var name="node" id="7656298970875048514" />
+      </scope>
+      <scope id="7656298970875048514" at="36,0,39,0">
+        <var name="editorContext" id="7656298970875048514" />
+      </scope>
+      <scope id="7656298970875048514" at="39,0,42,0">
+        <var name="editorContext" id="7656298970875048514" />
+        <var name="node" id="7656298970875048514" />
+      </scope>
+      <scope id="7656298970875048514" at="15,0,19,0">
+        <var name="context" id="7656298970875048514" />
+        <var name="editorCell" id="7656298970875048514" />
+        <var name="node" id="7656298970875048514" />
+      </scope>
+      <unit id="7656298970875048514" at="19,0,31,0" name="jetbrains.mps.console.base.editor.AbstractPrintExpression_Actions$AbstractPrintExpression_Actions_DELETE" />
+      <unit id="7656298970875048514" at="31,0,43,0" name="jetbrains.mps.console.base.editor.AbstractPrintExpression_Actions$AbstractPrintExpression_Actions_BACKSPACE" />
+      <unit id="7656298970875048514" at="14,0,44,0" name="jetbrains.mps.console.base.editor.AbstractPrintExpression_Actions" />
+    </file>
+  </root>
+  <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/7656298970878225878">
+    <file name="BLExpression_Editor.java">
+      <node id="7656298970878225878" at="18,79,19,63" concept="7" />
+      <node id="7656298970878225878" at="21,89,22,96" concept="6" />
+      <node id="7656298970878225878" at="22,96,23,48" concept="2" />
+      <node id="7656298970878225878" at="23,48,24,28" concept="2" />
+      <node id="7656298970878225878" at="24,28,25,79" concept="2" />
+      <node id="7656298970878225878" at="25,79,26,80" concept="0" />
+      <node id="7656298970878225878" at="25,79,26,80" concept="2" />
+      <node id="7656298970878225878" at="26,80,27,22" concept="7" />
+      <node id="7656298970878225878" at="29,87,30,258" concept="6" />
+      <node id="7656298970878225878" at="30,258,31,33" concept="7" />
+      <node id="7656298970878225878" at="34,124,35,49" concept="9" />
+      <node id="7656298970878225878" at="37,81,38,74" concept="6" />
+      <node id="7656298970878225878" at="38,74,39,41" concept="2" />
+      <node id="7656298970878225878" at="39,41,40,24" concept="7" />
+      <node id="7656298970878225878" at="42,69,43,137" concept="2" />
+      <node id="7656298970878225878" at="44,41,45,41" concept="2" />
+      <node id="7656298970878225878" at="46,7,47,84" concept="2" />
+      <node id="7656298970878225878" at="52,44,53,54" concept="6" />
+      <node id="7656298970878225878" at="53,54,54,47" concept="2" />
+      <node id="7656298970878225878" at="54,47,55,40" concept="2" />
+      <node id="7656298970878225878" at="55,40,56,24" concept="7" />
+      <node id="7656298970878225878" at="59,40,60,31" concept="7" />
+      <node id="7656298970878225878" at="18,0,21,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7656298970878225878" at="34,0,37,0" concept="1" trace="expressionSingleRoleHandler_f3ggz9_a0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="7656298970878225878" at="43,137,46,7" concept="4" />
+      <node id="7656298970878225878" at="59,0,62,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="7656298970878225878" at="29,0,33,0" concept="5" trace="createRefNode_f3ggz9_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7656298970878225878" at="37,0,42,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7656298970878225878" at="42,0,49,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="7656298970878225878" at="51,0,58,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7656298970878225878" at="21,0,29,0" concept="5" trace="createCollection_f3ggz9_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <scope id="7656298970878225878" at="18,79,19,63" />
+      <scope id="7656298970878225878" at="25,79,26,80" />
+      <scope id="7656298970878225878" at="34,124,35,49" />
+      <scope id="7656298970878225878" at="44,41,45,41" />
+      <scope id="7656298970878225878" at="59,40,60,31" />
+      <scope id="7656298970878225878" at="29,87,31,33">
+        <var name="provider" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="18,0,21,0">
+        <var name="editorContext" id="7656298970878225878" />
+        <var name="node" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="34,0,37,0">
+        <var name="containmentLink" id="7656298970878225878" />
+        <var name="context" id="7656298970878225878" />
+        <var name="ownerNode" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="37,81,40,24">
+        <var name="editorCell" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="59,0,62,0" />
+      <scope id="7656298970878225878" at="29,0,33,0">
+        <var name="editorContext" id="7656298970878225878" />
+        <var name="node" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="52,44,56,24">
+        <var name="editorCell" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="37,0,42,0">
+        <var name="child" id="7656298970878225878" />
+        <var name="editorContext" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="42,69,47,84" />
+      <scope id="7656298970878225878" at="21,89,27,22">
+        <var name="editorCell" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="42,0,49,0">
+        <var name="child" id="7656298970878225878" />
+        <var name="editorCell" id="7656298970878225878" />
+      </scope>
+      <scope id="7656298970878225878" at="51,0,58,0" />
+      <scope id="7656298970878225878" at="21,0,29,0">
+        <var name="editorContext" id="7656298970878225878" />
+        <var name="node" id="7656298970878225878" />
+      </scope>
+      <unit id="7656298970878225878" at="33,0,64,0" name="jetbrains.mps.console.base.editor.BLExpression_Editor$expressionSingleRoleHandler_f3ggz9_a0" />
+      <unit id="7656298970878225878" at="17,0,65,0" name="jetbrains.mps.console.base.editor.BLExpression_Editor" />
+    </file>
+  </root>
+  <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/7820875636626932805">
+    <file name="AbstractPrintExpression_Editor.java">
+      <node id="7820875636626932805" at="22,79,23,63" concept="7" />
+      <node id="7820875636626932805" at="25,89,26,96" concept="6" />
+      <node id="7820875636626932805" at="26,96,27,48" concept="2" />
+      <node id="7820875636626932805" at="27,48,28,28" concept="2" />
+      <node id="7820875636626932805" at="28,28,29,79" concept="2" />
+      <node id="7820875636626932805" at="29,79,30,82" concept="0" />
+      <node id="7820875636626932805" at="29,79,30,82" concept="2" />
+      <node id="7820875636626932805" at="30,82,31,80" concept="0" />
+      <node id="7820875636626932805" at="30,82,31,80" concept="2" />
+      <node id="7820875636626932805" at="31,80,32,22" concept="7" />
+      <node id="7820875636626932805" at="34,89,35,131" concept="6" />
+      <node id="7820875636626932805" at="35,131,36,84" concept="2" />
+      <node id="7820875636626932805" at="36,84,37,229" concept="2" />
+      <node id="7820875636626932805" at="37,229,38,22" concept="7" />
+      <node id="7284872370240936100" at="43,47,44,76" concept="7" />
+      <node id="7820875636626932805" at="47,87,48,261" concept="6" />
+      <node id="7820875636626932805" at="48,261,49,33" concept="7" />
+      <node id="7820875636626932805" at="52,120,53,49" concept="9" />
+      <node id="7820875636626932805" at="55,81,56,74" concept="6" />
+      <node id="7820875636626932805" at="56,74,57,41" concept="2" />
+      <node id="7820875636626932805" at="57,41,58,24" concept="7" />
+      <node id="7820875636626932805" at="60,69,61,137" concept="2" />
+      <node id="7820875636626932805" at="62,41,63,37" concept="2" />
+      <node id="7820875636626932805" at="69,44,70,54" concept="6" />
+      <node id="7820875636626932805" at="70,54,71,43" concept="2" />
+      <node id="7820875636626932805" at="71,43,72,40" concept="2" />
+      <node id="7820875636626932805" at="72,40,73,24" concept="7" />
+      <node id="7820875636626932805" at="76,40,77,27" concept="7" />
+      <node id="7284872370240936100" at="41,0,43,0" concept="1" trace="ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0#()V" />
+      <node id="7820875636626932805" at="22,0,25,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7284872370240936100" at="43,0,46,0" concept="5" trace="getReplacementConceptName#()Ljava/lang/String;" />
+      <node id="7820875636626932805" at="52,0,55,0" concept="1" trace="objectSingleRoleHandler_9ckmec_b0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="7820875636626932805" at="61,137,64,7" concept="4" />
+      <node id="7820875636626932805" at="76,0,79,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="7820875636626932805" at="47,0,51,0" concept="5" trace="createRefNode_9ckmec_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7820875636626932805" at="55,0,60,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7820875636626932805" at="34,0,40,0" concept="5" trace="createComponent_9ckmec_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7820875636626932805" at="60,0,66,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="7820875636626932805" at="68,0,75,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="7820875636626932805" at="25,0,34,0" concept="5" trace="createCollection_9ckmec_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <scope id="7284872370240936100" at="41,71,41,71" />
+      <scope id="7820875636626932805" at="22,79,23,63" />
+      <scope id="7820875636626932805" at="29,79,30,82" />
+      <scope id="7820875636626932805" at="30,82,31,80" />
+      <scope id="7284872370240936100" at="43,47,44,76" />
+      <scope id="7820875636626932805" at="52,120,53,49" />
+      <scope id="7820875636626932805" at="62,41,63,37" />
+      <scope id="7820875636626932805" at="76,40,77,27" />
+      <scope id="7284872370240936100" at="41,0,43,0" />
+      <scope id="7820875636626932805" at="47,87,49,33">
+        <var name="provider" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="22,0,25,0">
+        <var name="editorContext" id="7820875636626932805" />
+        <var name="node" id="7820875636626932805" />
+      </scope>
+      <scope id="7284872370240936100" at="43,0,46,0" />
+      <scope id="7820875636626932805" at="52,0,55,0">
+        <var name="containmentLink" id="7820875636626932805" />
+        <var name="context" id="7820875636626932805" />
+        <var name="ownerNode" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="55,81,58,24">
+        <var name="editorCell" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="76,0,79,0" />
+      <scope id="7820875636626932805" at="34,89,38,22">
+        <var name="editorCell" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="47,0,51,0">
+        <var name="editorContext" id="7820875636626932805" />
+        <var name="node" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="60,69,64,7" />
+      <scope id="7820875636626932805" at="69,44,73,24">
+        <var name="editorCell" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="55,0,60,0">
+        <var name="child" id="7820875636626932805" />
+        <var name="editorContext" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="34,0,40,0">
+        <var name="editorContext" id="7820875636626932805" />
+        <var name="node" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="60,0,66,0">
+        <var name="child" id="7820875636626932805" />
+        <var name="editorCell" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="25,89,32,22">
+        <var name="editorCell" id="7820875636626932805" />
+      </scope>
+      <scope id="7820875636626932805" at="68,0,75,0" />
+      <scope id="7820875636626932805" at="25,0,34,0">
+        <var name="editorContext" id="7820875636626932805" />
+        <var name="node" id="7820875636626932805" />
+      </scope>
+      <unit id="7284872370240936100" at="40,0,47,0" name="jetbrains.mps.console.base.editor.AbstractPrintExpression_Editor$ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0" />
+      <unit id="7820875636626932805" at="51,0,81,0" name="jetbrains.mps.console.base.editor.AbstractPrintExpression_Editor$objectSingleRoleHandler_9ckmec_b0" />
+      <unit id="7820875636626932805" at="21,0,82,0" name="jetbrains.mps.console.base.editor.AbstractPrintExpression_Editor" />
+    </file>
+  </root>
+  <root nodeRef="r:f09c85c2-fb88-4283-852e-78d5fc87420e(jetbrains.mps.console.base.editor)/963101385307642090">
+    <file name="BLExpression_Actions.java">
+      <node id="963101385307642090" at="17,95,18,108" concept="2" />
+      <node id="963101385307642090" at="18,108,19,114" concept="2" />
+      <node id="963101385307642090" at="22,0,23,0" concept="3" trace="myNode" />
+      <node id="963101385307642090" at="23,52,24,25" concept="2" />
+      <node id="963101385307642090" at="26,54,27,56" concept="2" />
+      <node id="963101385307663766" at="29,75,30,236" concept="6" />
+      <node id="963101385308010106" at="30,236,31,385" concept="2" />
+      <node id="963101385308074676" at="31,385,32,510" concept="2" />
+      <node id="963101385308310191" at="32,510,33,850" concept="2" />
+      <node id="963101385307664028" at="33,850,34,58" concept="2" />
+      <node id="963101385307642090" at="38,0,39,0" concept="3" trace="myNode" />
+      <node id="963101385307642090" at="39,55,40,25" concept="2" />
+      <node id="963101385307642090" at="42,54,43,56" concept="2" />
+      <node id="6891027939994644155" at="45,75,46,39" concept="2" />
+      <node id="963101385307642090" at="23,0,26,0" concept="1" trace="BLExpression_Actions_INSERT#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="963101385307642090" at="26,0,29,0" concept="5" trace="execute#(Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="963101385307642090" at="39,0,42,0" concept="1" trace="BLExpression_Actions_BACKSPACE#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="963101385307642090" at="42,0,45,0" concept="5" trace="execute#(Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="963101385307642090" at="45,0,48,0" concept="5" trace="execute_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="963101385307642090" at="17,0,21,0" concept="8" trace="setCellActions#(Ljetbrains/mps/openapi/editor/cells/EditorCell;Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="963101385307642090" at="29,0,36,0" concept="5" trace="execute_internal#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <scope id="963101385307642090" at="23,52,24,25" />
+      <scope id="963101385307642090" at="26,54,27,56" />
+      <scope id="963101385307642090" at="39,55,40,25" />
+      <scope id="963101385307642090" at="42,54,43,56" />
+      <scope id="6891027939994643975" at="45,75,46,39" />
+      <scope id="963101385307642090" at="17,95,19,114" />
+      <scope id="963101385307642090" at="23,0,26,0">
+        <var name="node" id="963101385307642090" />
+      </scope>
+      <scope id="963101385307642090" at="26,0,29,0">
+        <var name="editorContext" id="963101385307642090" />
+      </scope>
+      <scope id="963101385307642090" at="39,0,42,0">
+        <var name="node" id="963101385307642090" />
+      </scope>
+      <scope id="963101385307642090" at="42,0,45,0">
+        <var name="editorContext" id="963101385307642090" />
+      </scope>
+      <scope id="963101385307642090" at="45,0,48,0">
+        <var name="editorContext" id="963101385307642090" />
+        <var name="node" id="963101385307642090" />
+      </scope>
+      <scope id="963101385307642090" at="17,0,21,0">
+        <var name="context" id="963101385307642090" />
+        <var name="editorCell" id="963101385307642090" />
+        <var name="node" id="963101385307642090" />
+      </scope>
+      <scope id="963101385307643996" at="29,75,34,58">
+        <var name="blCommand" id="963101385307663769" />
+      </scope>
+      <scope id="963101385307642090" at="29,0,36,0">
+        <var name="editorContext" id="963101385307642090" />
+        <var name="node" id="963101385307642090" />
+      </scope>
+      <unit id="963101385307642090" at="37,0,49,0" name="jetbrains.mps.console.base.editor.BLExpression_Actions$BLExpression_Actions_BACKSPACE" />
+      <unit id="963101385307642090" at="21,0,37,0" name="jetbrains.mps.console.base.editor.BLExpression_Actions$BLExpression_Actions_INSERT" />
+      <unit id="963101385307642090" at="16,0,50,0" name="jetbrains.mps.console.base.editor.BLExpression_Actions" />
+    </file>
+  </root>
 </debug-info>
 
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java
index 6f3c880efd0e..d62c7915cfee 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java
@@ -12,12 +12,15 @@
 
 public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
 
-  /*package*/ final ConceptDescriptor myConceptCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).abstract_().create();
+  /*package*/ final ConceptDescriptor myConceptAbstractPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.AbstractPrintExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).childDescriptors(new ConceptDescriptorBuilder.Link(8365379837260461921L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).abstract_().create();
+  /*package*/ final ConceptDescriptor myConceptBLCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.BLCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.baseLanguage.structure.IMethodLike", "jetbrains.mps.baseLanguage.structure.IStatementListContainer").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x1208f458d37L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11750ef8265L)).childDescriptors(new ConceptDescriptorBuilder.Link(1769790395579689573L, "body", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false)).children(new String[]{"body"}, new boolean[]{false}).alias("{", "baseLanguage statements").create();
+  /*package*/ final ConceptDescriptor myConceptBLExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.BLExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.lang.core.structure.IWrapper").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x11c6fd75034L)).childDescriptors(new ConceptDescriptorBuilder.Link(7656298970878093890L, "expression", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"expression"}, new boolean[]{false}).alias("", "baseLanguage expression").create();
+  /*package*/ final ConceptDescriptor myConceptCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).abstract_().create();
   /*package*/ final ConceptDescriptor myConceptCommandHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.CommandHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.lang.core.structure.INamedConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L)).childDescriptors(new ConceptDescriptorBuilder.Link(351968380916615460L, "command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL), true, false, false)).children(new String[]{"command"}, new boolean[]{false}).create();
-  /*package*/ final ConceptDescriptor myConceptConsoleHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ConsoleHelpProvider", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).interface_().create();
   /*package*/ final ConceptDescriptor myConceptConsoleRoot = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ConsoleRoot", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(1583916890557930415L, "history", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL), false, false, false), new ConceptDescriptorBuilder.Link(1583916890557930417L, "commandHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL), false, false, false)).children(new String[]{"history", "commandHolder"}, new boolean[]{false, false}).create();
+  /*package*/ final ConceptDescriptor myConceptExceptionHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ExceptionHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(6558068108108282025L, "stackTrace")).properties("stackTrace").create();
   /*package*/ final ConceptDescriptor myConceptGeneratedCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.GeneratedCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).super_("jetbrains.mps.console.base.structure.Command").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).parents("jetbrains.mps.console.base.structure.Command").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).abstract_().create();
-  /*package*/ final ConceptDescriptor myConceptHelpCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).childDescriptors(new ConceptDescriptorBuilder.Link(6928665434433788203L, "target", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L), true, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("?", "help").create();
+  /*package*/ final ConceptDescriptor myConceptHelpCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).childDescriptors(new ConceptDescriptorBuilder.Link(6928665434433788203L, "target", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L), true, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("?", "help").create();
   /*package*/ final ConceptDescriptor myConceptHelpConceptReference = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpConceptReference", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(6928665434433779926L, "command", MetaIdFactory.conceptId(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0xf979ba0450L), false)).references("command").create();
   /*package*/ final ConceptDescriptor myConceptHistory = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.History", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(7195119950189425818L, "item", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), true, true, false)).children(new String[]{"item"}, new boolean[]{true}).create();
   /*package*/ final ConceptDescriptor myConceptHistoryItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HistoryItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL)).interface_().create();
@@ -33,70 +36,97 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
   /*package*/ final ConceptDescriptor myConceptNodeWithClosure = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.NodeWithClosure", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xf6d4d958ec2f2c6L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).create();
   /*package*/ final ConceptDescriptor myConceptOutputConsoleRoot = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.OutputConsoleRoot", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x131ec6f2097ff75fL)).super_("jetbrains.mps.console.base.structure.ConsoleRoot").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL)).parents("jetbrains.mps.console.base.structure.ConsoleRoot").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL)).create();
   /*package*/ final ConceptDescriptor myConceptPastedNodeReference = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PastedNodeReference", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x51132a123c89fa7eL)).super_("jetbrains.mps.lang.smodel.structure.AbstractNodeRefExpression").super_(MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x319fd776da5d8e3cL)).parents("jetbrains.mps.lang.smodel.structure.AbstractNodeRefExpression", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault", "jetbrains.mps.console.base.structure.INodeWithReference").parentIds(MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x319fd776da5d8e3cL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x36ac6f29ae8c1fb5L)).alias("pastedNodeRef", "").create();
+  /*package*/ final ConceptDescriptor myConceptPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).alias("#print", "smart print depending on content").create();
+  /*package*/ final ConceptDescriptor myConceptPrintNodeExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintNodeExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4c7a26b31bd03b59L)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printNode", "print node copy").create();
+  /*package*/ final ConceptDescriptor myConceptPrintNodeReferenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd9bddcL)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printNodeRef", "print reference to the node").create();
+  /*package*/ final ConceptDescriptor myConceptPrintSequenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintSequenceExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b7db64fL)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printSequence", "print size with link to usages view").create();
+  /*package*/ final ConceptDescriptor myConceptPrintTextExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintTextExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x7417cca3eb1feca9L)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printText", "print as string").create();
+  /*package*/ final ConceptDescriptor myConceptProjectExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ProjectExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa721a59126bb908L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#project", "the current project").create();
+  /*package*/ final ConceptDescriptor myConceptProjectScope = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ProjectScope", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x3bc64421763adda2L)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("project", "").create();
   /*package*/ final ConceptDescriptor myConceptResponse = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Response", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).childDescriptors(new ConceptDescriptorBuilder.Link(5637103006919120621L, "item", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL), true, true, false)).children(new String[]{"item"}, new boolean[]{true}).create();
   /*package*/ final ConceptDescriptor myConceptResponseItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ResponseItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL)).interface_().create();
   /*package*/ final ConceptDescriptor myConceptTextResponseItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.TextResponseItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c38L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.ResponseItem").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(5637103006919122193L, "text")).properties("text").create();
 
   @Override
   public Collection<ConceptDescriptor> getDescriptors() {
-    return Arrays.asList(myConceptCommand, myConceptCommandHolder, myConceptConsoleHelpProvider, myConceptConsoleRoot, myConceptGeneratedCommand, myConceptHelpCommand, myConceptHelpConceptReference, myConceptHistory, myConceptHistoryItem, myConceptIActionHolder, myConceptIClickable, myConceptINodeWithReference, myConceptInterpretedCommand, myConceptModifiedCommandHistoryItem, myConceptNewLineResponseItem, myConceptNodeReferencePresentation, myConceptNodeReferenceString, myConceptNodeResponseItem, myConceptNodeWithClosure, myConceptOutputConsoleRoot, myConceptPastedNodeReference, myConceptResponse, myConceptResponseItem, myConceptTextResponseItem);
+    return Arrays.asList(myConceptAbstractPrintExpression, myConceptBLCommand, myConceptBLExpression, myConceptCommand, myConceptCommandHolder, myConceptConsoleRoot, myConceptExceptionHolder, myConceptGeneratedCommand, myConceptHelpCommand, myConceptHelpConceptReference, myConceptHistory, myConceptHistoryItem, myConceptIActionHolder, myConceptIClickable, myConceptINodeWithReference, myConceptInterpretedCommand, myConceptModifiedCommandHistoryItem, myConceptNewLineResponseItem, myConceptNodeReferencePresentation, myConceptNodeReferenceString, myConceptNodeResponseItem, myConceptNodeWithClosure, myConceptOutputConsoleRoot, myConceptPastedNodeReference, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptProjectExpression, myConceptProjectScope, myConceptResponse, myConceptResponseItem, myConceptTextResponseItem);
   }
 
   @Override
   @Nullable
   public ConceptDescriptor getDescriptor(String conceptFqName) {
-    switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0cb, conceptFqName)) {
+    switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0mb, conceptFqName)) {
       case 0:
-        return myConceptCommand;
+        return myConceptAbstractPrintExpression;
       case 1:
-        return myConceptCommandHolder;
+        return myConceptBLCommand;
       case 2:
-        return myConceptConsoleHelpProvider;
+        return myConceptBLExpression;
       case 3:
-        return myConceptConsoleRoot;
+        return myConceptCommand;
       case 4:
-        return myConceptGeneratedCommand;
+        return myConceptCommandHolder;
       case 5:
-        return myConceptHelpCommand;
+        return myConceptConsoleRoot;
       case 6:
-        return myConceptHelpConceptReference;
+        return myConceptExceptionHolder;
       case 7:
-        return myConceptHistory;
+        return myConceptGeneratedCommand;
       case 8:
-        return myConceptHistoryItem;
+        return myConceptHelpCommand;
       case 9:
-        return myConceptIActionHolder;
+        return myConceptHelpConceptReference;
       case 10:
-        return myConceptIClickable;
+        return myConceptHistory;
       case 11:
-        return myConceptINodeWithReference;
+        return myConceptHistoryItem;
       case 12:
-        return myConceptInterpretedCommand;
+        return myConceptIActionHolder;
       case 13:
-        return myConceptModifiedCommandHistoryItem;
+        return myConceptIClickable;
       case 14:
-        return myConceptNewLineResponseItem;
+        return myConceptINodeWithReference;
       case 15:
-        return myConceptNodeReferencePresentation;
+        return myConceptInterpretedCommand;
       case 16:
-        return myConceptNodeReferenceString;
+        return myConceptModifiedCommandHistoryItem;
       case 17:
-        return myConceptNodeResponseItem;
+        return myConceptNewLineResponseItem;
       case 18:
-        return myConceptNodeWithClosure;
+        return myConceptNodeReferencePresentation;
       case 19:
-        return myConceptOutputConsoleRoot;
+        return myConceptNodeReferenceString;
       case 20:
-        return myConceptPastedNodeReference;
+        return myConceptNodeResponseItem;
       case 21:
-        return myConceptResponse;
+        return myConceptNodeWithClosure;
       case 22:
-        return myConceptResponseItem;
+        return myConceptOutputConsoleRoot;
       case 23:
+        return myConceptPastedNodeReference;
+      case 24:
+        return myConceptPrintExpression;
+      case 25:
+        return myConceptPrintNodeExpression;
+      case 26:
+        return myConceptPrintNodeReferenceExpression;
+      case 27:
+        return myConceptPrintSequenceExpression;
+      case 28:
+        return myConceptPrintTextExpression;
+      case 29:
+        return myConceptProjectExpression;
+      case 30:
+        return myConceptProjectScope;
+      case 31:
+        return myConceptResponse;
+      case 32:
+        return myConceptResponseItem;
+      case 33:
         return myConceptTextResponseItem;
       default:
         return null;
     }
   }
-  private static String[] stringSwitchCases_1htk8d_a0a0cb = new String[]{"jetbrains.mps.console.base.structure.Command", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleHelpProvider", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.console.base.structure.IActionHolder", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.ResponseItem", "jetbrains.mps.console.base.structure.TextResponseItem"};
+  private static String[] stringSwitchCases_1htk8d_a0a0mb = new String[]{"jetbrains.mps.console.base.structure.AbstractPrintExpression", "jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.Command", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.console.base.structure.IActionHolder", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.PrintExpression", "jetbrains.mps.console.base.structure.PrintNodeExpression", "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.base.structure.PrintSequenceExpression", "jetbrains.mps.console.base.structure.PrintTextExpression", "jetbrains.mps.console.base.structure.ProjectExpression", "jetbrains.mps.console.base.structure.ProjectScope", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.ResponseItem", "jetbrains.mps.console.base.structure.TextResponseItem"};
 }
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info
index 8b06b0136198..57d9414cdc4e 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info
@@ -2,7 +2,7 @@
 <debug-info>
   <root>
     <file name="StructureAspectDescriptor.java">
-      <unit at="13,0,103,0" name="jetbrains.mps.console.base.structure.StructureAspectDescriptor" />
+      <unit at="13,0,133,0" name="jetbrains.mps.console.base.structure.StructureAspectDescriptor" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info
index 0401d0ccb7fa..a86f127b0c97 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info
@@ -2,7 +2,7 @@
 <debug-info>
   <root>
     <file name="Language.java">
-      <unit at="18,0,62,0" name="jetbrains.mps.console.base.Language" />
+      <unit at="22,0,72,0" name="jetbrains.mps.console.base.Language" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java
new file mode 100644
index 000000000000..7a0176509bf9
--- /dev/null
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java
@@ -0,0 +1,39 @@
+package jetbrains.mps.console.base.typesystem;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor;
+import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime;
+
+public class TypesystemDescriptor extends BaseHelginsDescriptor {
+  public TypesystemDescriptor() {
+    {
+      InferenceRule_Runtime inferenceRule = new typeof_AbstractPrintExpression_InferenceRule();
+      this.myInferenceRules.add(inferenceRule);
+    }
+    {
+      InferenceRule_Runtime inferenceRule = new typeof_PrintExpression_InferenceRule();
+      this.myInferenceRules.add(inferenceRule);
+    }
+    {
+      InferenceRule_Runtime inferenceRule = new typeof_PrintNodeExpression_InferenceRule();
+      this.myInferenceRules.add(inferenceRule);
+    }
+    {
+      InferenceRule_Runtime inferenceRule = new typeof_PrintNodeReferenceExpression_InferenceRule();
+      this.myInferenceRules.add(inferenceRule);
+    }
+    {
+      InferenceRule_Runtime inferenceRule = new typeof_PrintSequenceExpression_InferenceRule();
+      this.myInferenceRules.add(inferenceRule);
+    }
+    {
+      InferenceRule_Runtime inferenceRule = new typeof_PrintTextExpression_InferenceRule();
+      this.myInferenceRules.add(inferenceRule);
+    }
+    {
+      InferenceRule_Runtime inferenceRule = new typeof_ProjectExpression_InferenceRule();
+      this.myInferenceRules.add(inferenceRule);
+    }
+  }
+}
diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info
index 78624c872225..43104ebebaf0 100644
--- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info
@@ -1,3 +1,452 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<debug-info />
+<debug-info>
+  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
+  <root>
+    <file name="TypesystemDescriptor.java">
+      <unit at="8,0,40,0" name="jetbrains.mps.console.base.typesystem.TypesystemDescriptor" />
+    </file>
+  </root>
+  <root nodeRef="r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)/5510759644748858626">
+    <file name="typeof_PrintNodeExpression_InferenceRule.java">
+      <node id="5510759644748858657" at="22,7,23,223" concept="5" />
+      <node id="5510759644748858657" at="23,223,24,205" concept="5" />
+      <node id="5510759644748858657" at="24,205,25,305" concept="2" />
+      <node id="5510759644748858626" at="29,50,30,164" concept="6" />
+      <node id="5510759644748858626" at="32,68,33,102" concept="0" />
+      <node id="5510759644748858626" at="32,68,33,102" concept="6" />
+      <node id="5510759644748858626" at="35,30,36,17" concept="6" />
+      <node id="5510759644748858659" at="38,61,39,63" concept="5" />
+      <node id="5510759644748858659" at="39,63,40,30" concept="5" />
+      <node id="5510759644748858659" at="40,30,41,221" concept="0" />
+      <node id="5510759644748858659" at="40,30,41,221" concept="0" />
+      <node id="5510759644748858659" at="40,30,41,221" concept="2" />
+      <node id="5510759644748858659" at="41,221,42,24" concept="6" />
+      <node id="5510759644748858626" at="18,0,20,0" concept="1" trace="typeof_PrintNodeExpression_InferenceRule#()V" />
+      <node id="5510759644748858626" at="29,0,32,0" concept="4" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="5510759644748858626" at="32,0,35,0" concept="4" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="5510759644748858626" at="35,0,38,0" concept="4" trace="overrides#()Z" />
+      <node id="5510759644748858657" at="21,59,26,7" concept="0" />
+      <node id="5510759644748858659" at="38,0,44,0" concept="7" trace="_quotation_createNode_j9pmav_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5510759644748858657" at="20,132,27,5" concept="3" />
+      <node id="5510759644748858626" at="20,0,29,0" concept="4" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <scope id="5510759644748858626" at="18,53,18,53" />
+      <scope id="5510759644748858626" at="29,50,30,164" />
+      <scope id="5510759644748858626" at="32,68,33,102" />
+      <scope id="5510759644748858626" at="35,30,36,17" />
+      <scope id="5510759644748858659" at="40,30,41,221" />
+      <scope id="5510759644748858626" at="18,0,20,0" />
+      <scope id="5510759644748858657" at="22,7,25,305">
+        <var name="_info_12389875345" id="5510759644748858657" />
+        <var name="_nodeToCheck_1029348928467" id="5510759644748858657" />
+      </scope>
+      <scope id="5510759644748858626" at="29,0,32,0" />
+      <scope id="5510759644748858626" at="32,0,35,0">
+        <var name="argument" id="5510759644748858626" />
+      </scope>
+      <scope id="5510759644748858626" at="35,0,38,0" />
+      <scope id="5510759644748858659" at="38,61,42,24">
+        <var name="facade" id="5510759644748858659" />
+        <var name="quotedNode_1" id="5510759644748858659" />
+      </scope>
+      <scope id="5510759644748858657" at="21,59,26,7" />
+      <scope id="5510759644748858659" at="38,0,44,0" />
+      <scope id="5510759644748858627" at="20,132,27,5" />
+      <scope id="5510759644748858626" at="20,0,29,0">
+        <var name="printNodeExpression" id="5510759644748858626" />
+        <var name="status" id="5510759644748858626" />
+        <var name="typeCheckingContext" id="5510759644748858626" />
+      </scope>
+      <unit id="5510759644748858626" at="17,0,45,0" name="jetbrains.mps.console.base.typesystem.typeof_PrintNodeExpression_InferenceRule" />
+    </file>
+  </root>
+  <root nodeRef="r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)/6852607286009511629">
+    <file name="typeof_PrintNodeReferenceExpression_InferenceRule.java">
+      <node id="6852607286009512877" at="22,7,23,232" concept="5" />
+      <node id="6852607286009512877" at="23,232,24,205" concept="5" />
+      <node id="6852607286009512877" at="24,205,25,305" concept="2" />
+      <node id="6852607286009511629" at="29,50,30,173" concept="6" />
+      <node id="6852607286009511629" at="32,68,33,102" concept="0" />
+      <node id="6852607286009511629" at="32,68,33,102" concept="6" />
+      <node id="6852607286009511629" at="35,30,36,17" concept="6" />
+      <node id="6852607286009512930" at="38,61,39,63" concept="5" />
+      <node id="6852607286009512930" at="39,63,40,30" concept="5" />
+      <node id="6852607286009512930" at="40,30,41,221" concept="0" />
+      <node id="6852607286009512930" at="40,30,41,221" concept="0" />
+      <node id="6852607286009512930" at="40,30,41,221" concept="2" />
+      <node id="6852607286009512930" at="41,221,42,24" concept="6" />
+      <node id="6852607286009511629" at="18,0,20,0" concept="1" trace="typeof_PrintNodeReferenceExpression_InferenceRule#()V" />
+      <node id="6852607286009511629" at="29,0,32,0" concept="4" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="6852607286009511629" at="32,0,35,0" concept="4" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="6852607286009511629" at="35,0,38,0" concept="4" trace="overrides#()Z" />
+      <node id="6852607286009512877" at="21,59,26,7" concept="0" />
+      <node id="6852607286009512930" at="38,0,44,0" concept="7" trace="_quotation_createNode_t5gmh8_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="6852607286009512877" at="20,141,27,5" concept="3" />
+      <node id="6852607286009511629" at="20,0,29,0" concept="4" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <scope id="6852607286009511629" at="18,62,18,62" />
+      <scope id="6852607286009511629" at="29,50,30,173" />
+      <scope id="6852607286009511629" at="32,68,33,102" />
+      <scope id="6852607286009511629" at="35,30,36,17" />
+      <scope id="6852607286009512930" at="40,30,41,221" />
+      <scope id="6852607286009511629" at="18,0,20,0" />
+      <scope id="6852607286009512877" at="22,7,25,305">
+        <var name="_info_12389875345" id="6852607286009512877" />
+        <var name="_nodeToCheck_1029348928467" id="6852607286009512877" />
+      </scope>
+      <scope id="6852607286009511629" at="29,0,32,0" />
+      <scope id="6852607286009511629" at="32,0,35,0">
+        <var name="argument" id="6852607286009511629" />
+      </scope>
+      <scope id="6852607286009511629" at="35,0,38,0" />
+      <scope id="6852607286009512930" at="38,61,42,24">
+        <var name="facade" id="6852607286009512930" />
+        <var name="quotedNode_1" id="6852607286009512930" />
+      </scope>
+      <scope id="6852607286009512877" at="21,59,26,7" />
+      <scope id="6852607286009512930" at="38,0,44,0" />
+      <scope id="6852607286009511893" at="20,141,27,5" />
+      <scope id="6852607286009511629" at="20,0,29,0">
+        <var name="printNodeReferenceExpression" id="6852607286009511629" />
+        <var name="status" id="6852607286009511629" />
+        <var name="typeCheckingContext" id="6852607286009511629" />
+      </scope>
+      <unit id="6852607286009511629" at="17,0,45,0" name="jetbrains.mps.console.base.typesystem.typeof_PrintNodeReferenceExpression_InferenceRule" />
+    </file>
+  </root>
+  <root nodeRef="r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)/752693057587755448">
+    <file name="typeof_ProjectExpression_InferenceRule.java">
+      <node id="752693057587763729" at="21,5,22,59" concept="5" />
+      <node id="752693057587763729" at="22,59,23,202" concept="5" />
+      <node id="752693057587763729" at="23,202,24,279" concept="2" />
+      <node id="752693057587755448" at="27,50,28,161" concept="6" />
+      <node id="752693057587755448" at="30,68,31,102" concept="0" />
+      <node id="752693057587755448" at="30,68,31,102" concept="6" />
+      <node id="752693057587755448" at="33,30,34,17" concept="6" />
+      <node id="752693057587763859" at="36,61,37,63" concept="5" />
+      <node id="752693057587763859" at="37,63,38,30" concept="5" />
+      <node id="752693057587763859" at="38,30,39,227" concept="2" />
+      <node id="752693057587763859" at="39,227,40,453" concept="2" />
+      <node id="752693057587763859" at="40,453,41,24" concept="6" />
+      <node id="752693057587755448" at="18,0,20,0" concept="1" trace="typeof_ProjectExpression_InferenceRule#()V" />
+      <node id="752693057587763859" at="38,30,40,453" concept="0" />
+      <node id="752693057587763859" at="38,30,40,453" concept="0" />
+      <node id="752693057587755448" at="27,0,30,0" concept="4" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="752693057587755448" at="30,0,33,0" concept="4" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="752693057587755448" at="33,0,36,0" concept="4" trace="overrides#()Z" />
+      <node id="752693057587763729" at="20,130,25,5" concept="0" />
+      <node id="752693057587755448" at="20,0,27,0" concept="4" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <node id="752693057587763859" at="36,0,43,0" concept="7" trace="_quotation_createNode_osiggc_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="752693057587755448" at="18,51,18,51" />
+      <scope id="752693057587755448" at="27,50,28,161" />
+      <scope id="752693057587755448" at="30,68,31,102" />
+      <scope id="752693057587755448" at="33,30,34,17" />
+      <scope id="752693057587755448" at="18,0,20,0" />
+      <scope id="752693057587763859" at="38,30,40,453" />
+      <scope id="752693057587763729" at="21,5,24,279">
+        <var name="_info_12389875345" id="752693057587763729" />
+        <var name="_nodeToCheck_1029348928467" id="752693057587763729" />
+      </scope>
+      <scope id="752693057587755448" at="27,0,30,0" />
+      <scope id="752693057587755448" at="30,0,33,0">
+        <var name="argument" id="752693057587755448" />
+      </scope>
+      <scope id="752693057587755448" at="33,0,36,0" />
+      <scope id="752693057587755709" at="20,130,25,5" />
+      <scope id="752693057587763859" at="36,61,41,24">
+        <var name="facade" id="752693057587763859" />
+        <var name="quotedNode_1" id="752693057587763859" />
+      </scope>
+      <scope id="752693057587755448" at="20,0,27,0">
+        <var name="projectExpression" id="752693057587755448" />
+        <var name="status" id="752693057587755448" />
+        <var name="typeCheckingContext" id="752693057587755448" />
+      </scope>
+      <scope id="752693057587763859" at="36,0,43,0" />
+      <unit id="752693057587755448" at="17,0,44,0" name="jetbrains.mps.console.base.typesystem.typeof_ProjectExpression_InferenceRule" />
+    </file>
+  </root>
+  <root nodeRef="r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)/7600370246417590543">
+    <file name="typeof_PrintExpression_InferenceRule.java">
+      <node id="7600370246421664444" at="22,5,23,217" concept="5" />
+      <node id="7600370246421664444" at="23,217,24,203" concept="5" />
+      <node id="7600370246421664444" at="24,203,25,303" concept="2" />
+      <node id="7600370246417590543" at="28,50,29,160" concept="6" />
+      <node id="7600370246417590543" at="31,68,32,102" concept="0" />
+      <node id="7600370246417590543" at="31,68,32,102" concept="6" />
+      <node id="7600370246417590543" at="34,30,35,17" concept="6" />
+      <node id="7600370246421664670" at="37,61,38,63" concept="5" />
+      <node id="7600370246421664670" at="38,63,39,30" concept="5" />
+      <node id="7600370246421664670" at="39,30,40,30" concept="5" />
+      <node id="7600370246421664670" at="40,30,41,30" concept="5" />
+      <node id="7600370246421664670" at="41,30,42,224" concept="2" />
+      <node id="7600370246421664670" at="42,224,43,227" concept="2" />
+      <node id="7600370246421664670" at="43,227,44,435" concept="2" />
+      <node id="7600370246421664670" at="44,435,45,165" concept="2" />
+      <node id="7600370246421664670" at="45,165,46,220" concept="2" />
+      <node id="7600370246421664670" at="46,220,47,165" concept="2" />
+      <node id="7600370246421664670" at="47,165,48,24" concept="6" />
+      <node id="7600370246417590543" at="19,0,21,0" concept="1" trace="typeof_PrintExpression_InferenceRule#()V" />
+      <node id="7600370246421664670" at="45,165,47,165" concept="0" />
+      <node id="7600370246421664670" at="45,165,47,165" concept="0" />
+      <node id="7600370246417590543" at="28,0,31,0" concept="4" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="7600370246417590543" at="31,0,34,0" concept="4" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="7600370246417590543" at="34,0,37,0" concept="4" trace="overrides#()Z" />
+      <node id="7600370246421664670" at="42,224,45,165" concept="0" />
+      <node id="7600370246421664670" at="42,224,45,165" concept="0" />
+      <node id="7600370246421664444" at="21,128,26,5" concept="0" />
+      <node id="7600370246421664670" at="41,30,47,165" concept="0" />
+      <node id="7600370246421664670" at="41,30,47,165" concept="0" />
+      <node id="7600370246417590543" at="21,0,28,0" concept="4" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <node id="7600370246421664670" at="37,0,50,0" concept="7" trace="_quotation_createNode_nk4iqe_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="7600370246417590543" at="19,49,19,49" />
+      <scope id="7600370246417590543" at="28,50,29,160" />
+      <scope id="7600370246417590543" at="31,68,32,102" />
+      <scope id="7600370246417590543" at="34,30,35,17" />
+      <scope id="7600370246417590543" at="19,0,21,0" />
+      <scope id="7600370246421664670" at="45,165,47,165" />
+      <scope id="7600370246421664444" at="22,5,25,303">
+        <var name="_info_12389875345" id="7600370246421664444" />
+        <var name="_nodeToCheck_1029348928467" id="7600370246421664444" />
+      </scope>
+      <scope id="7600370246417590543" at="28,0,31,0" />
+      <scope id="7600370246417590543" at="31,0,34,0">
+        <var name="argument" id="7600370246417590543" />
+      </scope>
+      <scope id="7600370246417590543" at="34,0,37,0" />
+      <scope id="7600370246421664670" at="42,224,45,165" />
+      <scope id="7600370246417590544" at="21,128,26,5" />
+      <scope id="7600370246421664670" at="41,30,47,165" />
+      <scope id="7600370246417590543" at="21,0,28,0">
+        <var name="printExpression" id="7600370246417590543" />
+        <var name="status" id="7600370246417590543" />
+        <var name="typeCheckingContext" id="7600370246417590543" />
+      </scope>
+      <scope id="7600370246421664670" at="37,61,48,24">
+        <var name="facade" id="7600370246421664670" />
+        <var name="quotedNode_1" id="7600370246421664670" />
+        <var name="quotedNode_2" id="7600370246421664670" />
+        <var name="quotedNode_3" id="7600370246421664670" />
+      </scope>
+      <scope id="7600370246421664670" at="37,0,50,0" />
+      <unit id="7600370246417590543" at="18,0,51,0" name="jetbrains.mps.console.base.typesystem.typeof_PrintExpression_InferenceRule" />
+    </file>
+  </root>
+  <root nodeRef="r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)/7600370246417604400">
+    <file name="typeof_PrintTextExpression_InferenceRule.java">
+      <node id="7600370246421665039" at="22,5,23,221" concept="5" />
+      <node id="7600370246421665039" at="23,221,24,203" concept="5" />
+      <node id="7600370246421665039" at="24,203,25,303" concept="2" />
+      <node id="7600370246417604400" at="28,50,29,164" concept="6" />
+      <node id="7600370246417604400" at="31,68,32,102" concept="0" />
+      <node id="7600370246417604400" at="31,68,32,102" concept="6" />
+      <node id="7600370246417604400" at="34,30,35,17" concept="6" />
+      <node id="7600370246421665267" at="37,61,38,63" concept="5" />
+      <node id="7600370246421665267" at="38,63,39,30" concept="5" />
+      <node id="7600370246421665267" at="39,30,40,227" concept="2" />
+      <node id="7600370246421665267" at="40,227,41,435" concept="2" />
+      <node id="7600370246421665267" at="41,435,42,24" concept="6" />
+      <node id="7600370246417604400" at="19,0,21,0" concept="1" trace="typeof_PrintTextExpression_InferenceRule#()V" />
+      <node id="7600370246421665267" at="39,30,41,435" concept="0" />
+      <node id="7600370246421665267" at="39,30,41,435" concept="0" />
+      <node id="7600370246417604400" at="28,0,31,0" concept="4" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="7600370246417604400" at="31,0,34,0" concept="4" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="7600370246417604400" at="34,0,37,0" concept="4" trace="overrides#()Z" />
+      <node id="7600370246421665039" at="21,132,26,5" concept="0" />
+      <node id="7600370246417604400" at="21,0,28,0" concept="4" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <node id="7600370246421665267" at="37,0,44,0" concept="7" trace="_quotation_createNode_tqzol9_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="7600370246417604400" at="19,53,19,53" />
+      <scope id="7600370246417604400" at="28,50,29,164" />
+      <scope id="7600370246417604400" at="31,68,32,102" />
+      <scope id="7600370246417604400" at="34,30,35,17" />
+      <scope id="7600370246417604400" at="19,0,21,0" />
+      <scope id="7600370246421665267" at="39,30,41,435" />
+      <scope id="7600370246421665039" at="22,5,25,303">
+        <var name="_info_12389875345" id="7600370246421665039" />
+        <var name="_nodeToCheck_1029348928467" id="7600370246421665039" />
+      </scope>
+      <scope id="7600370246417604400" at="28,0,31,0" />
+      <scope id="7600370246417604400" at="31,0,34,0">
+        <var name="argument" id="7600370246417604400" />
+      </scope>
+      <scope id="7600370246417604400" at="34,0,37,0" />
+      <scope id="7600370246417604401" at="21,132,26,5" />
+      <scope id="7600370246421665267" at="37,61,42,24">
+        <var name="facade" id="7600370246421665267" />
+        <var name="quotedNode_1" id="7600370246421665267" />
+      </scope>
+      <scope id="7600370246417604400" at="21,0,28,0">
+        <var name="printTextExpression" id="7600370246417604400" />
+        <var name="status" id="7600370246417604400" />
+        <var name="typeCheckingContext" id="7600370246417604400" />
+      </scope>
+      <scope id="7600370246421665267" at="37,0,44,0" />
+      <unit id="7600370246417604400" at="18,0,45,0" name="jetbrains.mps.console.base.typesystem.typeof_PrintTextExpression_InferenceRule" />
+    </file>
+  </root>
+  <root nodeRef="r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)/7600370246423000773">
+    <file name="typeof_PrintSequenceExpression_InferenceRule.java">
+      <node id="3856122757887347236" at="22,5,23,225" concept="5" />
+      <node id="3856122757887347236" at="23,225,24,203" concept="5" />
+      <node id="3856122757887347236" at="24,203,25,303" concept="2" />
+      <node id="7600370246423000773" at="28,50,29,168" concept="6" />
+      <node id="7600370246423000773" at="31,68,32,102" concept="0" />
+      <node id="7600370246423000773" at="31,68,32,102" concept="6" />
+      <node id="7600370246423000773" at="34,30,35,17" concept="6" />
+      <node id="3856122757887347239" at="37,61,38,63" concept="5" />
+      <node id="3856122757887347239" at="38,63,39,30" concept="5" />
+      <node id="3856122757887347239" at="39,30,40,30" concept="5" />
+      <node id="3856122757887347239" at="40,30,41,30" concept="5" />
+      <node id="3856122757887347239" at="41,30,42,30" concept="5" />
+      <node id="3856122757887347239" at="42,30,43,30" concept="5" />
+      <node id="3856122757887347239" at="43,30,44,30" concept="5" />
+      <node id="3856122757887347239" at="44,30,45,30" concept="5" />
+      <node id="3856122757887347239" at="45,30,46,30" concept="5" />
+      <node id="3856122757887347239" at="46,30,47,30" concept="5" />
+      <node id="3856122757887347239" at="47,30,48,224" concept="2" />
+      <node id="3856122757887347239" at="48,224,49,237" concept="2" />
+      <node id="3856122757887347239" at="49,237,50,221" concept="2" />
+      <node id="3856122757887347239" at="50,221,51,168" concept="2" />
+      <node id="3856122757887347239" at="51,168,52,165" concept="2" />
+      <node id="3856122757887347239" at="52,165,53,237" concept="2" />
+      <node id="3856122757887347239" at="53,237,54,231" concept="2" />
+      <node id="3856122757887347239" at="54,231,55,168" concept="2" />
+      <node id="3856122757887347239" at="55,168,56,165" concept="2" />
+      <node id="3856122757887347239" at="56,165,57,237" concept="2" />
+      <node id="3856122757887347239" at="57,237,58,222" concept="2" />
+      <node id="3856122757887347239" at="58,222,59,168" concept="2" />
+      <node id="3856122757887347239" at="59,168,60,165" concept="2" />
+      <node id="3856122757887347239" at="60,165,61,237" concept="2" />
+      <node id="3856122757887347239" at="61,237,62,227" concept="2" />
+      <node id="3856122757887347239" at="62,227,63,467" concept="2" />
+      <node id="3856122757887347239" at="63,467,64,168" concept="2" />
+      <node id="3856122757887347239" at="64,168,65,165" concept="2" />
+      <node id="3856122757887347239" at="65,165,66,24" concept="6" />
+      <node id="7600370246423000773" at="19,0,21,0" concept="1" trace="typeof_PrintSequenceExpression_InferenceRule#()V" />
+      <node id="3856122757887347239" at="49,237,51,168" concept="0" />
+      <node id="3856122757887347239" at="49,237,51,168" concept="0" />
+      <node id="3856122757887347239" at="53,237,55,168" concept="0" />
+      <node id="3856122757887347239" at="53,237,55,168" concept="0" />
+      <node id="3856122757887347239" at="57,237,59,168" concept="0" />
+      <node id="3856122757887347239" at="57,237,59,168" concept="0" />
+      <node id="7600370246423000773" at="28,0,31,0" concept="4" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="7600370246423000773" at="31,0,34,0" concept="4" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="7600370246423000773" at="34,0,37,0" concept="4" trace="overrides#()Z" />
+      <node id="3856122757887347239" at="61,237,64,168" concept="0" />
+      <node id="3856122757887347239" at="61,237,64,168" concept="0" />
+      <node id="3856122757887347239" at="48,224,52,165" concept="0" />
+      <node id="3856122757887347239" at="48,224,52,165" concept="0" />
+      <node id="3856122757887347239" at="52,165,56,165" concept="0" />
+      <node id="3856122757887347239" at="52,165,56,165" concept="0" />
+      <node id="3856122757887347239" at="56,165,60,165" concept="0" />
+      <node id="3856122757887347239" at="56,165,60,165" concept="0" />
+      <node id="3856122757887347236" at="21,136,26,5" concept="0" />
+      <node id="3856122757887347239" at="60,165,65,165" concept="0" />
+      <node id="3856122757887347239" at="60,165,65,165" concept="0" />
+      <node id="7600370246423000773" at="21,0,28,0" concept="4" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <node id="3856122757887347239" at="47,30,65,165" concept="0" />
+      <node id="3856122757887347239" at="47,30,65,165" concept="0" />
+      <node id="3856122757887347239" at="37,0,68,0" concept="7" trace="_quotation_createNode_u62o5j_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="7600370246423000773" at="19,57,19,57" />
+      <scope id="7600370246423000773" at="28,50,29,168" />
+      <scope id="7600370246423000773" at="31,68,32,102" />
+      <scope id="7600370246423000773" at="34,30,35,17" />
+      <scope id="7600370246423000773" at="19,0,21,0" />
+      <scope id="3856122757887347239" at="49,237,51,168" />
+      <scope id="3856122757887347239" at="53,237,55,168" />
+      <scope id="3856122757887347239" at="57,237,59,168" />
+      <scope id="3856122757887347236" at="22,5,25,303">
+        <var name="_info_12389875345" id="3856122757887347236" />
+        <var name="_nodeToCheck_1029348928467" id="3856122757887347236" />
+      </scope>
+      <scope id="7600370246423000773" at="28,0,31,0" />
+      <scope id="7600370246423000773" at="31,0,34,0">
+        <var name="argument" id="7600370246423000773" />
+      </scope>
+      <scope id="7600370246423000773" at="34,0,37,0" />
+      <scope id="3856122757887347239" at="61,237,64,168" />
+      <scope id="3856122757887347239" at="48,224,52,165" />
+      <scope id="3856122757887347239" at="52,165,56,165" />
+      <scope id="3856122757887347239" at="56,165,60,165" />
+      <scope id="7600370246423000774" at="21,136,26,5" />
+      <scope id="3856122757887347239" at="60,165,65,165" />
+      <scope id="7600370246423000773" at="21,0,28,0">
+        <var name="printSequenceExpression" id="7600370246423000773" />
+        <var name="status" id="7600370246423000773" />
+        <var name="typeCheckingContext" id="7600370246423000773" />
+      </scope>
+      <scope id="3856122757887347239" at="47,30,65,165" />
+      <scope id="3856122757887347239" at="37,61,66,24">
+        <var name="facade" id="3856122757887347239" />
+        <var name="quotedNode_1" id="3856122757887347239" />
+        <var name="quotedNode_2" id="3856122757887347239" />
+        <var name="quotedNode_3" id="3856122757887347239" />
+        <var name="quotedNode_4" id="3856122757887347239" />
+        <var name="quotedNode_5" id="3856122757887347239" />
+        <var name="quotedNode_6" id="3856122757887347239" />
+        <var name="quotedNode_7" id="3856122757887347239" />
+        <var name="quotedNode_8" id="3856122757887347239" />
+        <var name="quotedNode_9" id="3856122757887347239" />
+      </scope>
+      <scope id="3856122757887347239" at="37,0,68,0" />
+      <unit id="7600370246423000773" at="18,0,69,0" name="jetbrains.mps.console.base.typesystem.typeof_PrintSequenceExpression_InferenceRule" />
+    </file>
+  </root>
+  <root nodeRef="r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)/7656298970878398390">
+    <file name="typeof_AbstractPrintExpression_InferenceRule.java">
+      <node id="7656298970878399354" at="20,5,21,65" concept="5" />
+      <node id="7656298970878399354" at="21,65,22,203" concept="5" />
+      <node id="7656298970878399354" at="22,203,23,280" concept="2" />
+      <node id="7656298970878398390" at="26,50,27,168" concept="6" />
+      <node id="7656298970878398390" at="29,68,30,102" concept="0" />
+      <node id="7656298970878398390" at="29,68,30,102" concept="6" />
+      <node id="7656298970878398390" at="32,30,33,17" concept="6" />
+      <node id="7656298970878399419" at="35,61,36,63" concept="5" />
+      <node id="7656298970878399419" at="36,63,37,30" concept="5" />
+      <node id="7656298970878399419" at="37,30,38,220" concept="0" />
+      <node id="7656298970878399419" at="37,30,38,220" concept="0" />
+      <node id="7656298970878399419" at="37,30,38,220" concept="2" />
+      <node id="7656298970878399419" at="38,220,39,24" concept="6" />
+      <node id="7656298970878398390" at="17,0,19,0" concept="1" trace="typeof_AbstractPrintExpression_InferenceRule#()V" />
+      <node id="7656298970878398390" at="26,0,29,0" concept="4" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="7656298970878398390" at="29,0,32,0" concept="4" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="7656298970878398390" at="32,0,35,0" concept="4" trace="overrides#()Z" />
+      <node id="7656298970878399354" at="19,136,24,5" concept="0" />
+      <node id="7656298970878399419" at="35,0,41,0" concept="7" trace="_quotation_createNode_5i9h05_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7656298970878398390" at="19,0,26,0" concept="4" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <scope id="7656298970878398390" at="17,57,17,57" />
+      <scope id="7656298970878398390" at="26,50,27,168" />
+      <scope id="7656298970878398390" at="29,68,30,102" />
+      <scope id="7656298970878398390" at="32,30,33,17" />
+      <scope id="7656298970878399419" at="37,30,38,220" />
+      <scope id="7656298970878398390" at="17,0,19,0" />
+      <scope id="7656298970878399354" at="20,5,23,280">
+        <var name="_info_12389875345" id="7656298970878399354" />
+        <var name="_nodeToCheck_1029348928467" id="7656298970878399354" />
+      </scope>
+      <scope id="7656298970878398390" at="26,0,29,0" />
+      <scope id="7656298970878398390" at="29,0,32,0">
+        <var name="argument" id="7656298970878398390" />
+      </scope>
+      <scope id="7656298970878398390" at="32,0,35,0" />
+      <scope id="7656298970878399419" at="35,61,39,24">
+        <var name="facade" id="7656298970878399419" />
+        <var name="quotedNode_1" id="7656298970878399419" />
+      </scope>
+      <scope id="7656298970878398391" at="19,136,24,5" />
+      <scope id="7656298970878399419" at="35,0,41,0" />
+      <scope id="7656298970878398390" at="19,0,26,0">
+        <var name="abstractPrintExpression" id="7656298970878398390" />
+        <var name="status" id="7656298970878398390" />
+        <var name="typeCheckingContext" id="7656298970878398390" />
+      </scope>
+      <unit id="7656298970878398390" at="16,0,42,0" name="jetbrains.mps.console.base.typesystem.typeof_AbstractPrintExpression_InferenceRule" />
+    </file>
+  </root>
+</debug-info>
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_AbstractPrintExpression_InferenceRule.java
similarity index 75%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_AbstractPrintExpression_InferenceRule.java
index 019ff0382e8e..0b847cc288ac 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_AbstractPrintExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.console.base.typesystem;
 
 /*Generated by MPS */
 
@@ -19,12 +19,12 @@ public typeof_AbstractPrintExpression_InferenceRule() {
   public void applyRule(final SNode abstractPrintExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = abstractPrintExpression;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7656298970878399354", 0, null);
-      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7656298970878398907", true), (SNode) _quotation_createNode_5i9h05_a0a0b(), _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7656298970878399354", 0, null);
+      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7656298970878398907", true), (SNode) _quotation_createNode_5i9h05_a0a0b(), _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression");
+    return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, "jetbrains.mps.console.base.structure.AbstractPrintExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintExpression_InferenceRule.java
similarity index 81%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintExpression_InferenceRule.java
index 1733d50698fb..5540a7cd890c 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.console.base.typesystem;
 
 /*Generated by MPS */
 
@@ -20,13 +20,13 @@ public typeof_PrintExpression_InferenceRule() {
   }
   public void applyRule(final SNode printExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
-      SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246421664444", 0, null);
-      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246421664447", true), (SNode) _quotation_createNode_nk4iqe_a0a0b(), false, true, _info_12389875345);
+      SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7600370246421664444", 0, null);
+      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7600370246421664447", true), (SNode) _quotation_createNode_nk4iqe_a0a0b(), false, true, _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression");
+    return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L, "jetbrains.mps.console.base.structure.PrintExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeExpression_InferenceRule.java
similarity index 75%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeExpression_InferenceRule.java
index 1a1bda05d98a..b186b28db94c 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.console.base.typesystem;
 
 /*Generated by MPS */
 
@@ -20,14 +20,14 @@ public typeof_PrintNodeExpression_InferenceRule() {
   public void applyRule(final SNode printNodeExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     if (!(typeCheckingContext.isSingleTypeComputation())) {
       {
-        SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printNodeExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "5510759644748858657", 0, null);
-        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "5510759644748858662", true), (SNode) _quotation_createNode_j9pmav_a0a0b(), true, false, _info_12389875345);
+        SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printNodeExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "5510759644748858657", 0, null);
+        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "5510759644748858662", true), (SNode) _quotation_createNode_j9pmav_a0a0b(), true, false, _info_12389875345);
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4c7a26b31bd03b59L, "jetbrains.mps.console.blCommand.structure.PrintNodeExpression");
+    return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4c7a26b31bd03b59L, "jetbrains.mps.console.base.structure.PrintNodeExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java
similarity index 75%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java
index 4caaab1503ad..99a016bc68b7 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.console.base.typesystem;
 
 /*Generated by MPS */
 
@@ -20,14 +20,14 @@ public typeof_PrintNodeReferenceExpression_InferenceRule() {
   public void applyRule(final SNode printNodeReferenceExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     if (!(typeCheckingContext.isSingleTypeComputation())) {
       {
-        SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printNodeReferenceExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6852607286009512877", 0, null);
-        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6852607286009511978", true), (SNode) _quotation_createNode_t5gmh8_a0a0b(), true, false, _info_12389875345);
+        SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printNodeReferenceExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "6852607286009512877", 0, null);
+        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "6852607286009511978", true), (SNode) _quotation_createNode_t5gmh8_a0a0b(), true, false, _info_12389875345);
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f195a051bd9bddcL, "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression");
+    return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd9bddcL, "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintSequenceExpression_InferenceRule.java
similarity index 89%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintSequenceExpression_InferenceRule.java
index 10c5c092390a..88ef902ee953 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintSequenceExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.console.base.typesystem;
 
 /*Generated by MPS */
 
@@ -20,13 +20,13 @@ public typeof_PrintSequenceExpression_InferenceRule() {
   }
   public void applyRule(final SNode printSequenceExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
-      SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printSequenceExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3856122757887347236", 0, null);
-      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3856122757887347250", true), (SNode) _quotation_createNode_u62o5j_a0a0b(), false, true, _info_12389875345);
+      SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printSequenceExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "3856122757887347236", 0, null);
+      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "3856122757887347250", true), (SNode) _quotation_createNode_u62o5j_a0a0b(), false, true, _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b7db64fL, "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression");
+    return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b7db64fL, "jetbrains.mps.console.base.structure.PrintSequenceExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintTextExpression_InferenceRule.java
similarity index 78%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintTextExpression_InferenceRule.java
index 99dc145477e2..a15c63d0272e 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintTextExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.console.base.typesystem;
 
 /*Generated by MPS */
 
@@ -20,13 +20,13 @@ public typeof_PrintTextExpression_InferenceRule() {
   }
   public void applyRule(final SNode printTextExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
-      SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printTextExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246421665039", 0, null);
-      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246421665042", true), (SNode) _quotation_createNode_tqzol9_a0a0b(), false, true, _info_12389875345);
+      SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printTextExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7600370246421665039", 0, null);
+      typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7600370246421665042", true), (SNode) _quotation_createNode_tqzol9_a0a0b(), false, true, _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x7417cca3eb1feca9L, "jetbrains.mps.console.blCommand.structure.PrintTextExpression");
+    return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x7417cca3eb1feca9L, "jetbrains.mps.console.base.structure.PrintTextExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_ProjectExpression_InferenceRule.java
similarity index 80%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java
rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_ProjectExpression_InferenceRule.java
index 55e4a17e8118..b6a18c48c689 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java
+++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_ProjectExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.console.base.typesystem;
 
 /*Generated by MPS */
 
@@ -20,12 +20,12 @@ public typeof_ProjectExpression_InferenceRule() {
   public void applyRule(final SNode projectExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = projectExpression;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "752693057587763729", 0, null);
-      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "752693057587762707", true), (SNode) _quotation_createNode_osiggc_a0a0b(), _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "752693057587763729", 0, null);
+      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "752693057587762707", true), (SNode) _quotation_createNode_osiggc_a0a0b(), _info_12389875345);
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0xa721a59126bb908L, "jetbrains.mps.console.blCommand.structure.ProjectExpression");
+    return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa721a59126bb908L, "jetbrains.mps.console.base.structure.ProjectExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated
deleted file mode 100644
index eee1bbac116b..000000000000
--- a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-b8i9avtsxlb3dacotmb00v7qx11bchq" />
-
diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java
deleted file mode 100644
index ffaaee7d37f9..000000000000
--- a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java
+++ /dev/null
@@ -1,602 +0,0 @@
-package jetbrains.mps.console.blCommand.generator.template.main;
-
-/*Generated by MPS */
-
-import jetbrains.mps.generator.runtime.Generated;
-import jetbrains.mps.generator.template.BaseMappingRuleContext;
-import jetbrains.mps.typesystem.inference.TypeChecker;
-import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
-import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
-import org.jetbrains.mps.openapi.model.SNode;
-import jetbrains.mps.lang.typesystem.runtime.HUtil;
-import jetbrains.mps.internal.collections.runtime.ListSequence;
-import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
-import org.jetbrains.mps.openapi.language.SAbstractConcept;
-import jetbrains.mps.generator.template.PropertyMacroContext;
-import jetbrains.mps.smodel.behaviour.BehaviorReflection;
-import jetbrains.mps.generator.template.ReferenceMacroContext;
-import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext;
-import jetbrains.mps.internal.collections.runtime.IWhereFilter;
-import jetbrains.mps.internal.collections.runtime.ISelector;
-import jetbrains.mps.internal.collections.runtime.Sequence;
-import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext;
-import org.jetbrains.mps.openapi.persistence.PersistenceFacade;
-import jetbrains.mps.smodel.SModelUtil_new;
-import jetbrains.mps.smodel.SReference;
-import org.jetbrains.mps.openapi.model.SNodeAccessUtil;
-
-@Generated
-public class QueriesGenerated {
-  public static boolean baseMappingRule_Condition_3395429865810138642(final BaseMappingRuleContext _context) {
-    return TypeChecker.getInstance().getSubtypingManager().isSubtype(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), _quotation_createNode_x583g4_b0a0a0());
-  }
-  public static boolean baseMappingRule_Condition_7600370246419375459(final BaseMappingRuleContext _context) {
-    return TypeChecker.getInstance().getSubtypingManager().isSubtype(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), _quotation_createNode_x583g4_b0a0a1());
-  }
-  public static boolean baseMappingRule_Condition_7600370246421231722(final BaseMappingRuleContext _context) {
-    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
-    return TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a0b0c()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a0b0c_0()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a1a2()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0b0c());
-  }
-  public static boolean baseMappingRule_Condition_3856122757887589572(final BaseMappingRuleContext _context) {
-    SNode functionType = TypeChecker.getInstance().getRuntimeSupport().coerce_(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), HUtil.createMatchingPatternByConcept(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174a4d19ffL, "jetbrains.mps.baseLanguage.closures.structure.FunctionType")), false);
-    return functionType != null;
-  }
-  public static boolean baseMappingRule_Condition_3786816536599965790(final BaseMappingRuleContext _context) {
-    return ListSequence.fromList(SNodeOperations.getNodeDescendants(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression"), false, new SAbstractConcept[]{})).isEmpty();
-  }
-  public static Object propertyMacro_GetPropertyValue_5842059399449233666(final PropertyMacroContext _context) {
-    return _context.createUniqueName("context", _context.getNode());
-  }
-  public static Object propertyMacro_GetPropertyValue_5842059399449255502(final PropertyMacroContext _context) {
-    return _context.createUniqueName("console", _context.getNode());
-  }
-  public static Object propertyMacro_GetPropertyValue_6690111761723079789(final PropertyMacroContext _context) {
-    return "closure : " + BehaviorReflection.invokeVirtual(String.class, TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), "virtual_getPresentation_1213877396640", new Object[]{});
-  }
-  public static Object propertyMacro_GetPropertyValue_9010839353952736697(final PropertyMacroContext _context) {
-    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a8())) {
-      return "nodes";
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a8())) {
-      return "references";
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a8())) {
-      return "models";
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a8())) {
-      return "modules";
-    }
-    return null;
-  }
-  public static Object referenceMacro_GetReferent_8126917369944781043(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(_context.getNode(), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_8126917369944799036(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(_context.getNode(), "consoleParameter");
-  }
-  public static Object referenceMacro_GetReferent_6273399648879447700(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "consoleParameter");
-  }
-  public static Object referenceMacro_GetReferent_8006938998446049201(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_3501374812264730107(final ReferenceMacroContext _context) {
-    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")));
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a31())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263258755");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a31())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263262593");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a31())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263265578");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a31())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263268620");
-    }
-    return null;
-  }
-  public static Object referenceMacro_GetReferent_3501374812265756145(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_7600370246425972944(final ReferenceMacroContext _context) {
-    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")));
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a51())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a51())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a51())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632137");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a51())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632254");
-    }
-    return null;
-  }
-  public static Object referenceMacro_GetReferent_752693057587775365(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_5510759644748879586(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "consoleParameter");
-  }
-  public static Object referenceMacro_GetReferent_5510759644748869358(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "consoleParameter");
-  }
-  public static Object referenceMacro_GetReferent_4307205004143761133(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_4307205004144705887(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_9010839353953001247(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "consoleParameter");
-  }
-  public static Object referenceMacro_GetReferent_9010839353953082327(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_1597470200014435793(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) {
-    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a42())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a42())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a42())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632137");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a42())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632254");
-    }
-    return null;
-  }
-  public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) {
-    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a52())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263258755");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a52())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263262593");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a52())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263265578");
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a52())) {
-      return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263268620");
-    }
-    return null;
-  }
-  public static SNode sourceNodeQuery_6273399648879447287(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-  }
-  public static SNode sourceNodeQuery_3501374812264728764(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"));
-  }
-  public static SNode sourceNodeQuery_4307205004144966846(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
-  }
-  public static SNode sourceNodeQuery_7738379549905474169(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node"));
-  }
-  public static SNode sourceNodeQuery_4307205004144963070(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
-  }
-  public static SNode sourceNodeQuery_5582028874771414574(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"));
-  }
-  public static SNode sourceNodeQuery_5510759644748879578(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-  }
-  public static SNode sourceNodeQuery_6134217374019005717(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-  }
-  public static SNode sourceNodeQuery_4307205004143195962(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
-  }
-  public static SNode sourceNodeQuery_4307205004144964264(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
-  }
-  public static SNode sourceNodeQuery_4307205004144961927(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
-  }
-  public static SNode sourceNodeQuery_4307205004144960989(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"));
-  }
-  public static SNode sourceNodeQuery_4307205004142795439(final SourceSubstituteMacroNodeContext _context) {
-    Iterable<SNode> results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter<SNode>() {
-      public boolean accept(SNode it) {
-        return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"));
-      }
-    }).select(new ISelector<SNode, SNode>() {
-      public SNode select(SNode it) {
-        return SNodeOperations.cast(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"));
-      }
-    });
-    return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0mb() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")));
-  }
-  public static SNode sourceNodeQuery_4307205004142895894(final SourceSubstituteMacroNodeContext _context) {
-    Iterable<SNode> results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter<SNode>() {
-      public boolean accept(SNode it) {
-        return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly"));
-      }
-    });
-    return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0nb_0() : _quotation_createNode_x583g4_a0b0nb());
-  }
-  public static SNode sourceNodeQuery_7600370246429485751(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"));
-  }
-  public static SNode sourceNodeQuery_3395429865810287239(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-  }
-  public static SNode sourceNodeQuery_9010839353951768772(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-  }
-  public static SNode sourceNodeQuery_7600370246429334103(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-  }
-  public static SNode sourceNodeQuery_7600370246419387223(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-  }
-  public static SNode sourceNodeQuery_3501374812261883521(final SourceSubstituteMacroNodeContext _context) {
-    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")));
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a54())) {
-      return _quotation_createNode_x583g4_a0a1a54();
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a54())) {
-      return _quotation_createNode_x583g4_a0a2a54();
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a54())) {
-      return _quotation_createNode_x583g4_a0a3a54();
-    }
-    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a54())) {
-      return _quotation_createNode_x583g4_a0a4a54();
-    }
-    return null;
-  }
-  public static SNode sourceNodeQuery_9010839353952788840(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"));
-  }
-  public static SNode sourceNodeQuery_3492877759612269969(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope"));
-  }
-  public static SNode sourceNodeQuery_1964420931776208395(final SourceSubstituteMacroNodeContext _context) {
-    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"));
-  }
-  public static Iterable<SNode> sourceNodesQuery_5336086527852932024(final SourceSubstituteMacroNodesContext _context) {
-    return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"));
-  }
-  public static Iterable<SNode> sourceNodesQuery_6134217374019191580(final SourceSubstituteMacroNodesContext _context) {
-    return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model"));
-  }
-  public static Iterable<SNode> sourceNodesQuery_3492877759611137837(final SourceSubstituteMacroNodesContext _context) {
-    return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module"));
-  }
-  public static Iterable<SNode> sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) {
-    return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"));
-  }
-  private static SNode _quotation_createNode_x583g4_b0a0a0() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a0a1() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a0a0b0c() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a0a0b0c_0() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a0a1a2() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a0b0c() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a1a8() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a2a8() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a3a8() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a4a8() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a1a31() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a2a31() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a3a31() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a4a31() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a1a51() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a2a51() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a3a51() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a4a51() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a1a42() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a2a42() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a3a42() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a4a42() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a1a52() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a2a52() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a3a52() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a4a52() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_a0b0mb() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf940cd6167L, "jetbrains.mps.baseLanguage.structure.NullLiteral"), null, null, false);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_a0b0nb() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false);
-    SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true");
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_a0b0nb_0() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false);
-    SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "false");
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_a0a1a54() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference")));
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a1a54() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_a0a2a54() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference")));
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a2a54() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_a0a3a54() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SModelReference")));
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a3a54() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_a0a4a54() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModuleReference")));
-    return quotedNode_1;
-  }
-  private static SNode _quotation_createNode_x583g4_b0a4a54() {
-    PersistenceFacade facade = PersistenceFacade.getInstance();
-    SNode quotedNode_1 = null;
-    SNode quotedNode_2 = null;
-    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
-    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
-    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
-    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
-    return quotedNode_1;
-  }
-}
diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info
deleted file mode 100644
index c3399ea7d4a4..000000000000
--- a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info
+++ /dev/null
@@ -1,1019 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<debug-info>
-  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
-  <root>
-    <file name="QueriesGenerated.java">
-      <unit at="28,0,603,0" name="jetbrains.mps.console.blCommand.generator.template.main.QueriesGenerated" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/1125969196844485895">
-    <file name="QueriesGenerated.java">
-      <node id="8006938998446049763" at="81,109,82,296" concept="5" />
-      <node id="3501374812264731693" at="84,109,85,233" concept="4" />
-      <node id="3501374812264731703" at="86,114,87,148" concept="5" />
-      <node id="3501374812264731713" at="89,114,90,148" concept="5" />
-      <node id="3501374812264731723" at="92,114,93,148" concept="5" />
-      <node id="3501374812264731733" at="95,114,96,148" concept="5" />
-      <node id="3501374812264731741" at="97,5,98,16" concept="5" />
-      <node id="3501374812265756147" at="100,109,101,296" concept="5" />
-      <node id="7600370246425972946" at="103,109,104,233" concept="4" />
-      <node id="7600370246425972957" at="105,114,106,148" concept="5" />
-      <node id="7600370246425972967" at="108,114,109,148" concept="5" />
-      <node id="7600370246425972977" at="111,114,112,148" concept="5" />
-      <node id="7600370246425972987" at="114,114,115,148" concept="5" />
-      <node id="7600370246425972995" at="116,5,117,16" concept="5" />
-      <node id="3501374812264728771" at="178,108,179,190" concept="5" />
-      <node id="3501374812264731708" at="369,63,370,63" concept="4" />
-      <node id="3501374812264731708" at="370,63,371,30" concept="4" />
-      <node id="3501374812264731708" at="371,30,372,30" concept="4" />
-      <node id="3501374812264731708" at="372,30,373,237" concept="1" />
-      <node id="3501374812264731708" at="373,237,374,221" concept="1" />
-      <node id="3501374812264731708" at="374,221,375,168" concept="1" />
-      <node id="3501374812264731708" at="375,168,376,24" concept="5" />
-      <node id="3501374812264731718" at="378,63,379,63" concept="4" />
-      <node id="3501374812264731718" at="379,63,380,30" concept="4" />
-      <node id="3501374812264731718" at="380,30,381,30" concept="4" />
-      <node id="3501374812264731718" at="381,30,382,237" concept="1" />
-      <node id="3501374812264731718" at="382,237,383,231" concept="1" />
-      <node id="3501374812264731718" at="383,231,384,168" concept="1" />
-      <node id="3501374812264731718" at="384,168,385,24" concept="5" />
-      <node id="3501374812264731728" at="387,63,388,63" concept="4" />
-      <node id="3501374812264731728" at="388,63,389,30" concept="4" />
-      <node id="3501374812264731728" at="389,30,390,30" concept="4" />
-      <node id="3501374812264731728" at="390,30,391,237" concept="1" />
-      <node id="3501374812264731728" at="391,237,392,222" concept="1" />
-      <node id="3501374812264731728" at="392,222,393,168" concept="1" />
-      <node id="3501374812264731728" at="393,168,394,24" concept="5" />
-      <node id="3501374812264731738" at="396,63,397,63" concept="4" />
-      <node id="3501374812264731738" at="397,63,398,30" concept="4" />
-      <node id="3501374812264731738" at="398,30,399,30" concept="4" />
-      <node id="3501374812264731738" at="399,30,400,237" concept="1" />
-      <node id="3501374812264731738" at="400,237,401,227" concept="1" />
-      <node id="3501374812264731738" at="401,227,402,467" concept="1" />
-      <node id="3501374812264731738" at="402,467,403,168" concept="1" />
-      <node id="3501374812264731738" at="403,168,404,24" concept="5" />
-      <node id="7600370246425972962" at="406,63,407,63" concept="4" />
-      <node id="7600370246425972962" at="407,63,408,30" concept="4" />
-      <node id="7600370246425972962" at="408,30,409,30" concept="4" />
-      <node id="7600370246425972962" at="409,30,410,237" concept="1" />
-      <node id="7600370246425972962" at="410,237,411,221" concept="1" />
-      <node id="7600370246425972962" at="411,221,412,168" concept="1" />
-      <node id="7600370246425972962" at="412,168,413,24" concept="5" />
-      <node id="7600370246425972972" at="415,63,416,63" concept="4" />
-      <node id="7600370246425972972" at="416,63,417,30" concept="4" />
-      <node id="7600370246425972972" at="417,30,418,30" concept="4" />
-      <node id="7600370246425972972" at="418,30,419,237" concept="1" />
-      <node id="7600370246425972972" at="419,237,420,231" concept="1" />
-      <node id="7600370246425972972" at="420,231,421,168" concept="1" />
-      <node id="7600370246425972972" at="421,168,422,24" concept="5" />
-      <node id="7600370246425972982" at="424,63,425,63" concept="4" />
-      <node id="7600370246425972982" at="425,63,426,30" concept="4" />
-      <node id="7600370246425972982" at="426,30,427,30" concept="4" />
-      <node id="7600370246425972982" at="427,30,428,237" concept="1" />
-      <node id="7600370246425972982" at="428,237,429,222" concept="1" />
-      <node id="7600370246425972982" at="429,222,430,168" concept="1" />
-      <node id="7600370246425972982" at="430,168,431,24" concept="5" />
-      <node id="7600370246425972992" at="433,63,434,63" concept="4" />
-      <node id="7600370246425972992" at="434,63,435,30" concept="4" />
-      <node id="7600370246425972992" at="435,30,436,30" concept="4" />
-      <node id="7600370246425972992" at="436,30,437,237" concept="1" />
-      <node id="7600370246425972992" at="437,237,438,227" concept="1" />
-      <node id="7600370246425972992" at="438,227,439,467" concept="1" />
-      <node id="7600370246425972992" at="439,467,440,168" concept="1" />
-      <node id="7600370246425972992" at="440,168,441,24" concept="5" />
-      <node id="3501374812264731708" at="373,237,375,168" concept="0" />
-      <node id="3501374812264731708" at="373,237,375,168" concept="0" />
-      <node id="3501374812264731718" at="382,237,384,168" concept="0" />
-      <node id="3501374812264731718" at="382,237,384,168" concept="0" />
-      <node id="3501374812264731728" at="391,237,393,168" concept="0" />
-      <node id="3501374812264731728" at="391,237,393,168" concept="0" />
-      <node id="7600370246425972962" at="410,237,412,168" concept="0" />
-      <node id="7600370246425972962" at="410,237,412,168" concept="0" />
-      <node id="7600370246425972972" at="419,237,421,168" concept="0" />
-      <node id="7600370246425972972" at="419,237,421,168" concept="0" />
-      <node id="7600370246425972982" at="428,237,430,168" concept="0" />
-      <node id="7600370246425972982" at="428,237,430,168" concept="0" />
-      <node id="3501374812264731701" at="85,233,88,5" concept="2" />
-      <node id="3501374812264731711" at="88,5,91,5" concept="2" />
-      <node id="3501374812264731721" at="91,5,94,5" concept="2" />
-      <node id="3501374812264731731" at="94,5,97,5" concept="2" />
-      <node id="7600370246425972955" at="104,233,107,5" concept="2" />
-      <node id="7600370246425972965" at="107,5,110,5" concept="2" />
-      <node id="7600370246425972975" at="110,5,113,5" concept="2" />
-      <node id="7600370246425972985" at="113,5,116,5" concept="2" />
-      <node id="3501374812264731708" at="372,30,375,168" concept="0" />
-      <node id="3501374812264731708" at="372,30,375,168" concept="0" />
-      <node id="3501374812264731718" at="381,30,384,168" concept="0" />
-      <node id="3501374812264731718" at="381,30,384,168" concept="0" />
-      <node id="3501374812264731728" at="390,30,393,168" concept="0" />
-      <node id="3501374812264731728" at="390,30,393,168" concept="0" />
-      <node id="3501374812264731738" at="400,237,403,168" concept="0" />
-      <node id="3501374812264731738" at="400,237,403,168" concept="0" />
-      <node id="7600370246425972962" at="409,30,412,168" concept="0" />
-      <node id="7600370246425972962" at="409,30,412,168" concept="0" />
-      <node id="7600370246425972972" at="418,30,421,168" concept="0" />
-      <node id="7600370246425972972" at="418,30,421,168" concept="0" />
-      <node id="7600370246425972982" at="427,30,430,168" concept="0" />
-      <node id="7600370246425972982" at="427,30,430,168" concept="0" />
-      <node id="7600370246425972992" at="437,237,440,168" concept="0" />
-      <node id="7600370246425972992" at="437,237,440,168" concept="0" />
-      <node id="3501374812264731738" at="399,30,403,168" concept="0" />
-      <node id="3501374812264731738" at="399,30,403,168" concept="0" />
-      <node id="7600370246425972992" at="436,30,440,168" concept="0" />
-      <node id="7600370246425972992" at="436,30,440,168" concept="0" />
-      <node id="3501374812264731708" at="369,0,378,0" concept="6" trace="_quotation_createNode_x583g4_b0a1a31#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812264731718" at="378,0,387,0" concept="6" trace="_quotation_createNode_x583g4_b0a2a31#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812264731728" at="387,0,396,0" concept="6" trace="_quotation_createNode_x583g4_b0a3a31#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246425972962" at="406,0,415,0" concept="6" trace="_quotation_createNode_x583g4_b0a1a51#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246425972972" at="415,0,424,0" concept="6" trace="_quotation_createNode_x583g4_b0a2a51#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246425972982" at="424,0,433,0" concept="6" trace="_quotation_createNode_x583g4_b0a3a51#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812264731738" at="396,0,406,0" concept="6" trace="_quotation_createNode_x583g4_b0a4a31#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246425972992" at="433,0,443,0" concept="6" trace="_quotation_createNode_x583g4_b0a4a51#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="8006938998446049202" at="81,109,82,296" />
-      <scope id="3501374812264731702" at="86,114,87,148" />
-      <scope id="3501374812264731712" at="89,114,90,148" />
-      <scope id="3501374812264731722" at="92,114,93,148" />
-      <scope id="3501374812264731732" at="95,114,96,148" />
-      <scope id="3501374812265756146" at="100,109,101,296" />
-      <scope id="7600370246425972956" at="105,114,106,148" />
-      <scope id="7600370246425972966" at="108,114,109,148" />
-      <scope id="7600370246425972976" at="111,114,112,148" />
-      <scope id="7600370246425972986" at="114,114,115,148" />
-      <scope id="3501374812264728765" at="178,108,179,190" />
-      <scope id="3501374812264731708" at="373,237,375,168" />
-      <scope id="3501374812264731718" at="382,237,384,168" />
-      <scope id="3501374812264731728" at="391,237,393,168" />
-      <scope id="7600370246425972962" at="410,237,412,168" />
-      <scope id="7600370246425972972" at="419,237,421,168" />
-      <scope id="7600370246425972982" at="428,237,430,168" />
-      <scope id="3501374812264731708" at="372,30,375,168" />
-      <scope id="3501374812264731718" at="381,30,384,168" />
-      <scope id="3501374812264731728" at="390,30,393,168" />
-      <scope id="3501374812264731738" at="400,237,403,168" />
-      <scope id="7600370246425972962" at="409,30,412,168" />
-      <scope id="7600370246425972972" at="418,30,421,168" />
-      <scope id="7600370246425972982" at="427,30,430,168" />
-      <scope id="7600370246425972992" at="437,237,440,168" />
-      <scope id="3501374812264731738" at="399,30,403,168" />
-      <scope id="7600370246425972992" at="436,30,440,168" />
-      <scope id="3501374812264731708" at="369,63,376,24">
-        <var name="facade" id="3501374812264731708" />
-        <var name="quotedNode_1" id="3501374812264731708" />
-        <var name="quotedNode_2" id="3501374812264731708" />
-      </scope>
-      <scope id="3501374812264731718" at="378,63,385,24">
-        <var name="facade" id="3501374812264731718" />
-        <var name="quotedNode_1" id="3501374812264731718" />
-        <var name="quotedNode_2" id="3501374812264731718" />
-      </scope>
-      <scope id="3501374812264731728" at="387,63,394,24">
-        <var name="facade" id="3501374812264731728" />
-        <var name="quotedNode_1" id="3501374812264731728" />
-        <var name="quotedNode_2" id="3501374812264731728" />
-      </scope>
-      <scope id="7600370246425972962" at="406,63,413,24">
-        <var name="facade" id="7600370246425972962" />
-        <var name="quotedNode_1" id="7600370246425972962" />
-        <var name="quotedNode_2" id="7600370246425972962" />
-      </scope>
-      <scope id="7600370246425972972" at="415,63,422,24">
-        <var name="facade" id="7600370246425972972" />
-        <var name="quotedNode_1" id="7600370246425972972" />
-        <var name="quotedNode_2" id="7600370246425972972" />
-      </scope>
-      <scope id="7600370246425972982" at="424,63,431,24">
-        <var name="facade" id="7600370246425972982" />
-        <var name="quotedNode_1" id="7600370246425972982" />
-        <var name="quotedNode_2" id="7600370246425972982" />
-      </scope>
-      <scope id="3501374812264731738" at="396,63,404,24">
-        <var name="facade" id="3501374812264731738" />
-        <var name="quotedNode_1" id="3501374812264731738" />
-        <var name="quotedNode_2" id="3501374812264731738" />
-      </scope>
-      <scope id="7600370246425972992" at="433,63,441,24">
-        <var name="facade" id="7600370246425972992" />
-        <var name="quotedNode_1" id="7600370246425972992" />
-        <var name="quotedNode_2" id="7600370246425972992" />
-      </scope>
-      <scope id="3501374812264731708" at="369,0,378,0" />
-      <scope id="3501374812264731718" at="378,0,387,0" />
-      <scope id="3501374812264731728" at="387,0,396,0" />
-      <scope id="7600370246425972962" at="406,0,415,0" />
-      <scope id="7600370246425972972" at="415,0,424,0" />
-      <scope id="7600370246425972982" at="424,0,433,0" />
-      <scope id="3501374812264731738" at="396,0,406,0" />
-      <scope id="7600370246425972992" at="433,0,443,0" />
-      <scope id="3501374812264730108" at="84,109,98,16">
-        <var name="type" id="3501374812264731694" />
-      </scope>
-      <scope id="7600370246425972945" at="103,109,117,16">
-        <var name="type" id="7600370246425972947" />
-      </scope>
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/1964420931776040423">
-    <file name="QueriesGenerated.java">
-      <node id="1964420931776208582" at="268,108,269,189" concept="5" />
-      <node id="1964420931776046087" at="280,120,281,342" concept="5" />
-      <scope id="1964420931776208396" at="268,108,269,189" />
-      <scope id="1964420931776045746" at="280,120,281,342" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/3492877759609304450">
-    <file name="QueriesGenerated.java">
-      <node id="3492877759611137844" at="277,120,278,192" concept="5" />
-      <scope id="3492877759611137838" at="277,120,278,192" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/3492877759611336981">
-    <file name="QueriesGenerated.java">
-      <node id="6134217374019191582" at="274,120,275,191" concept="5" />
-      <scope id="6134217374019191581" at="274,120,275,191" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/3492877759612264689">
-    <file name="QueriesGenerated.java">
-      <node id="3492877759612269976" at="265,108,266,189" concept="5" />
-      <scope id="3492877759612269970" at="265,108,266,189" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/4307205004142531356">
-    <file name="QueriesGenerated.java">
-      <node id="4307205004143903038" at="128,109,129,296" concept="5" />
-      <node id="4307205004142855137" at="213,39,214,207" concept="5" />
-      <node id="4307205004144279701" at="217,37,218,199" concept="5" />
-      <node id="4307205004143278171" at="220,7,221,294" concept="5" />
-      <node id="4307205004142957609" at="225,39,226,217" concept="5" />
-      <node id="4307205004143326237" at="228,7,229,136" concept="5" />
-      <node id="4307205004143305196" at="517,62,518,63" concept="4" />
-      <node id="4307205004143305196" at="518,63,519,30" concept="4" />
-      <node id="4307205004143305196" at="519,30,520,223" concept="0" />
-      <node id="4307205004143305196" at="519,30,520,223" concept="0" />
-      <node id="4307205004143305196" at="519,30,520,223" concept="1" />
-      <node id="4307205004143305196" at="520,223,521,24" concept="5" />
-      <node id="4307205004144391666" at="523,62,524,63" concept="4" />
-      <node id="4307205004144391666" at="524,63,525,30" concept="4" />
-      <node id="4307205004144391666" at="525,30,526,227" concept="1" />
-      <node id="4307205004144391666" at="526,227,527,167" concept="1" />
-      <node id="4307205004144391666" at="527,167,528,24" concept="5" />
-      <node id="4307205004144354416" at="530,64,531,63" concept="4" />
-      <node id="4307205004144354416" at="531,63,532,30" concept="4" />
-      <node id="4307205004144354416" at="532,30,533,227" concept="1" />
-      <node id="4307205004144354416" at="533,227,534,168" concept="1" />
-      <node id="4307205004144354416" at="534,168,535,24" concept="5" />
-      <node id="4307205004144391666" at="525,30,527,167" concept="0" />
-      <node id="4307205004144391666" at="525,30,527,167" concept="0" />
-      <node id="4307205004144354416" at="532,30,534,168" concept="0" />
-      <node id="4307205004144354416" at="532,30,534,168" concept="0" />
-      <node id="4307205004142853476" at="213,0,216,0" concept="3" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
-      <node id="4307205004144277359" at="217,0,220,0" concept="3" trace="select#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4307205004142955948" at="225,0,228,0" concept="3" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
-      <node id="4307205004143326219" at="223,108,228,7" concept="4" />
-      <node id="4307205004143305196" at="517,0,523,0" concept="6" trace="_quotation_createNode_x583g4_a0b0mb#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4307205004144391666" at="523,0,530,0" concept="6" trace="_quotation_createNode_x583g4_a0b0nb#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4307205004144354416" at="530,0,537,0" concept="6" trace="_quotation_createNode_x583g4_a0b0nb_0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4307205004143274175" at="211,108,220,7" concept="4" />
-      <scope id="4307205004143761134" at="128,109,129,296" />
-      <scope id="4307205004142853477" at="213,39,214,207" />
-      <scope id="4307205004144277360" at="217,37,218,199" />
-      <scope id="4307205004142955949" at="225,39,226,217" />
-      <scope id="4307205004143305196" at="519,30,520,223" />
-      <scope id="4307205004144391666" at="525,30,527,167" />
-      <scope id="4307205004144354416" at="532,30,534,168" />
-      <scope id="4307205004142853476" at="213,0,216,0">
-        <var name="it" id="4307205004142853476" />
-      </scope>
-      <scope id="4307205004144277359" at="217,0,220,0">
-        <var name="it" id="4307205004144277359" />
-      </scope>
-      <scope id="4307205004142955948" at="225,0,228,0">
-        <var name="it" id="4307205004142955948" />
-      </scope>
-      <scope id="4307205004143305196" at="517,62,521,24">
-        <var name="facade" id="4307205004143305196" />
-        <var name="quotedNode_1" id="4307205004143305196" />
-      </scope>
-      <scope id="4307205004144391666" at="523,62,528,24">
-        <var name="facade" id="4307205004144391666" />
-        <var name="quotedNode_1" id="4307205004144391666" />
-      </scope>
-      <scope id="4307205004144354416" at="530,64,535,24">
-        <var name="facade" id="4307205004144354416" />
-        <var name="quotedNode_1" id="4307205004144354416" />
-      </scope>
-      <scope id="4307205004142895896" at="223,108,229,136">
-        <var name="results" id="4307205004143326220" />
-      </scope>
-      <scope id="4307205004143305196" at="517,0,523,0" />
-      <scope id="4307205004144391666" at="523,0,530,0" />
-      <scope id="4307205004144354416" at="530,0,537,0" />
-      <scope id="4307205004142795441" at="211,108,221,294">
-        <var name="results" id="4307205004143274178" />
-      </scope>
-      <unit id="4307205004142853476" at="212,247,216,5" name="jetbrains.mps.console.blCommand.generator.template.main.QueriesGenerated$1" />
-      <unit id="4307205004144277359" at="216,18,220,5" name="jetbrains.mps.console.blCommand.generator.template.main.QueriesGenerated$2" />
-      <unit id="4307205004142955948" at="224,247,228,5" name="jetbrains.mps.console.blCommand.generator.template.main.QueriesGenerated$3" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/4307205004144611714">
-    <file name="QueriesGenerated.java">
-      <node id="4307205004144706237" at="131,109,132,296" concept="5" />
-      <scope id="4307205004144705888" at="131,109,132,296" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/4417779018064685310">
-    <file name="QueriesGenerated.java">
-      <node id="6273399648879448499" at="78,109,79,296" concept="5" />
-      <node id="6273399648879447294" at="175,108,176,190" concept="5" />
-      <scope id="6273399648879447701" at="78,109,79,296" />
-      <scope id="6273399648879447288" at="175,108,176,190" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/4593895459761048274">
-    <file name="QueriesGenerated.java">
-      <node id="4307205004143195969" at="199,108,200,193" concept="5" />
-      <scope id="4307205004143195963" at="199,108,200,193" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/5336086527852812352">
-    <file name="QueriesGenerated.java">
-      <node id="5842059399449238679" at="47,112,48,68" concept="5" />
-      <node id="5842059399449259699" at="50,112,51,68" concept="5" />
-      <node id="8126917369944795948" at="72,109,73,100" concept="5" />
-      <node id="8126917369944799530" at="75,109,76,100" concept="5" />
-      <node id="5336086527852935536" at="271,120,272,341" concept="5" />
-      <scope id="5842059399449233667" at="47,112,48,68" />
-      <scope id="5842059399449255503" at="50,112,51,68" />
-      <scope id="8126917369944790527" at="72,109,73,100" />
-      <scope id="8126917369944799037" at="75,109,76,100" />
-      <scope id="5336086527852932032" at="271,120,272,341" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/5510759644748861143">
-    <file name="QueriesGenerated.java">
-      <node id="5510759644748869360" at="125,109,126,296" concept="5" />
-      <node id="6134217374019005719" at="196,108,197,190" concept="5" />
-      <scope id="5510759644748869359" at="125,109,126,296" />
-      <scope id="6134217374019005718" at="196,108,197,190" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/6322385757205252390">
-    <file name="QueriesGenerated.java">
-      <node id="4307205004144964266" at="202,108,203,193" concept="5" />
-      <scope id="4307205004144964265" at="202,108,203,193" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/6864030874027864910">
-    <file name="QueriesGenerated.java">
-      <node id="4307205004144961929" at="205,108,206,193" concept="5" />
-      <scope id="4307205004144961928" at="205,108,206,193" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/6864030874030058419">
-    <file name="QueriesGenerated.java">
-      <node id="4307205004144960991" at="208,108,209,193" concept="5" />
-      <scope id="4307205004144960990" at="208,108,209,193" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/752693057587764122">
-    <file name="QueriesGenerated.java">
-      <node id="752693057587766600" at="119,108,120,296" concept="5" />
-      <scope id="752693057587775366" at="119,108,120,296" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/7600370246415688284">
-    <file name="QueriesGenerated.java">
-      <node id="3395429865810173269" at="30,110,31,325" concept="5" />
-      <node id="7600370246421450740" at="33,110,34,325" concept="5" />
-      <node id="3786816536600308992" at="36,110,37,233" concept="4" />
-      <node id="7600370246421235139" at="37,233,38,443" concept="5" />
-      <node id="3492877759612498559" at="40,110,41,492" concept="4" />
-      <node id="6690111761722806259" at="41,492,42,32" concept="5" />
-      <node id="3786816536599975944" at="44,110,45,287" concept="5" />
-      <node id="6690111761723080555" at="53,112,54,347" concept="5" />
-      <node id="3395429865810287246" at="234,108,235,190" concept="5" />
-      <node id="9010839353951768774" at="237,108,238,190" concept="5" />
-      <node id="7600370246429334110" at="240,108,241,190" concept="5" />
-      <node id="7600370246419387225" at="243,108,244,190" concept="5" />
-      <node id="3395429865810173271" at="283,62,284,63" concept="4" />
-      <node id="3395429865810173271" at="284,63,285,30" concept="4" />
-      <node id="3395429865810173271" at="285,30,286,220" concept="0" />
-      <node id="3395429865810173271" at="285,30,286,220" concept="0" />
-      <node id="3395429865810173271" at="285,30,286,220" concept="1" />
-      <node id="3395429865810173271" at="286,220,287,24" concept="5" />
-      <node id="7600370246421453722" at="289,62,290,63" concept="4" />
-      <node id="7600370246421453722" at="290,63,291,30" concept="4" />
-      <node id="7600370246421453722" at="291,30,292,221" concept="0" />
-      <node id="7600370246421453722" at="291,30,292,221" concept="0" />
-      <node id="7600370246421453722" at="291,30,292,221" concept="1" />
-      <node id="7600370246421453722" at="292,221,293,24" concept="5" />
-      <node id="7600370246421477153" at="295,65,296,63" concept="4" />
-      <node id="7600370246421477153" at="296,63,297,30" concept="4" />
-      <node id="7600370246421477153" at="297,30,298,30" concept="4" />
-      <node id="7600370246421477153" at="298,30,299,237" concept="1" />
-      <node id="7600370246421477153" at="299,237,300,221" concept="1" />
-      <node id="7600370246421477153" at="300,221,301,168" concept="1" />
-      <node id="7600370246421477153" at="301,168,302,24" concept="5" />
-      <node id="7600370246421963074" at="304,67,305,63" concept="4" />
-      <node id="7600370246421963074" at="305,63,306,30" concept="4" />
-      <node id="7600370246421963074" at="306,30,307,30" concept="4" />
-      <node id="7600370246421963074" at="307,30,308,237" concept="1" />
-      <node id="7600370246421963074" at="308,237,309,231" concept="1" />
-      <node id="7600370246421963074" at="309,231,310,168" concept="1" />
-      <node id="7600370246421963074" at="310,168,311,24" concept="5" />
-      <node id="7600370246422041067" at="313,64,314,63" concept="4" />
-      <node id="7600370246422041067" at="314,63,315,30" concept="4" />
-      <node id="7600370246422041067" at="315,30,316,30" concept="4" />
-      <node id="7600370246422041067" at="316,30,317,237" concept="1" />
-      <node id="7600370246422041067" at="317,237,318,222" concept="1" />
-      <node id="7600370246422041067" at="318,222,319,168" concept="1" />
-      <node id="7600370246422041067" at="319,168,320,24" concept="5" />
-      <node id="7600370246422074415" at="322,63,323,63" concept="4" />
-      <node id="7600370246422074415" at="323,63,324,30" concept="4" />
-      <node id="7600370246422074415" at="324,30,325,30" concept="4" />
-      <node id="7600370246422074415" at="325,30,326,237" concept="1" />
-      <node id="7600370246422074415" at="326,237,327,227" concept="1" />
-      <node id="7600370246422074415" at="327,227,328,467" concept="1" />
-      <node id="7600370246422074415" at="328,467,329,168" concept="1" />
-      <node id="7600370246422074415" at="329,168,330,24" concept="5" />
-      <node id="7600370246421477153" at="299,237,301,168" concept="0" />
-      <node id="7600370246421477153" at="299,237,301,168" concept="0" />
-      <node id="7600370246421963074" at="308,237,310,168" concept="0" />
-      <node id="7600370246421963074" at="308,237,310,168" concept="0" />
-      <node id="7600370246422041067" at="317,237,319,168" concept="0" />
-      <node id="7600370246422041067" at="317,237,319,168" concept="0" />
-      <node id="7600370246421477153" at="298,30,301,168" concept="0" />
-      <node id="7600370246421477153" at="298,30,301,168" concept="0" />
-      <node id="7600370246421963074" at="307,30,310,168" concept="0" />
-      <node id="7600370246421963074" at="307,30,310,168" concept="0" />
-      <node id="7600370246422041067" at="316,30,319,168" concept="0" />
-      <node id="7600370246422041067" at="316,30,319,168" concept="0" />
-      <node id="7600370246422074415" at="326,237,329,168" concept="0" />
-      <node id="7600370246422074415" at="326,237,329,168" concept="0" />
-      <node id="7600370246422074415" at="325,30,329,168" concept="0" />
-      <node id="7600370246422074415" at="325,30,329,168" concept="0" />
-      <node id="3395429865810173271" at="283,0,289,0" concept="6" trace="_quotation_createNode_x583g4_b0a0a0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246421453722" at="289,0,295,0" concept="6" trace="_quotation_createNode_x583g4_b0a0a1#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246421477153" at="295,0,304,0" concept="6" trace="_quotation_createNode_x583g4_b0a0a0b0c#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246421963074" at="304,0,313,0" concept="6" trace="_quotation_createNode_x583g4_b0a0a0b0c_0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246422041067" at="313,0,322,0" concept="6" trace="_quotation_createNode_x583g4_b0a0a1a2#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7600370246422074415" at="322,0,332,0" concept="6" trace="_quotation_createNode_x583g4_b0a0b0c#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="3395429865810138643" at="30,110,31,325" />
-      <scope id="7600370246419375460" at="33,110,34,325" />
-      <scope id="3786816536599965791" at="44,110,45,287" />
-      <scope id="6690111761723079790" at="53,112,54,347" />
-      <scope id="3395429865810287240" at="234,108,235,190" />
-      <scope id="9010839353951768773" at="237,108,238,190" />
-      <scope id="7600370246429334104" at="240,108,241,190" />
-      <scope id="7600370246419387224" at="243,108,244,190" />
-      <scope id="3395429865810173271" at="285,30,286,220" />
-      <scope id="7600370246421453722" at="291,30,292,221" />
-      <scope id="7600370246421231723" at="36,110,38,443">
-        <var name="type" id="3786816536600308995" />
-      </scope>
-      <scope id="3856122757887589573" at="40,110,42,32">
-        <var name="functionType" id="3492877759612498562" />
-      </scope>
-      <scope id="7600370246421477153" at="299,237,301,168" />
-      <scope id="7600370246421963074" at="308,237,310,168" />
-      <scope id="7600370246422041067" at="317,237,319,168" />
-      <scope id="7600370246421477153" at="298,30,301,168" />
-      <scope id="7600370246421963074" at="307,30,310,168" />
-      <scope id="7600370246422041067" at="316,30,319,168" />
-      <scope id="7600370246422074415" at="326,237,329,168" />
-      <scope id="3395429865810173271" at="283,62,287,24">
-        <var name="facade" id="3395429865810173271" />
-        <var name="quotedNode_1" id="3395429865810173271" />
-      </scope>
-      <scope id="7600370246421453722" at="289,62,293,24">
-        <var name="facade" id="7600370246421453722" />
-        <var name="quotedNode_1" id="7600370246421453722" />
-      </scope>
-      <scope id="7600370246422074415" at="325,30,329,168" />
-      <scope id="3395429865810173271" at="283,0,289,0" />
-      <scope id="7600370246421453722" at="289,0,295,0" />
-      <scope id="7600370246421477153" at="295,65,302,24">
-        <var name="facade" id="7600370246421477153" />
-        <var name="quotedNode_1" id="7600370246421477153" />
-        <var name="quotedNode_2" id="7600370246421477153" />
-      </scope>
-      <scope id="7600370246421963074" at="304,67,311,24">
-        <var name="facade" id="7600370246421963074" />
-        <var name="quotedNode_1" id="7600370246421963074" />
-        <var name="quotedNode_2" id="7600370246421963074" />
-      </scope>
-      <scope id="7600370246422041067" at="313,64,320,24">
-        <var name="facade" id="7600370246422041067" />
-        <var name="quotedNode_1" id="7600370246422041067" />
-        <var name="quotedNode_2" id="7600370246422041067" />
-      </scope>
-      <scope id="7600370246422074415" at="322,63,330,24">
-        <var name="facade" id="7600370246422074415" />
-        <var name="quotedNode_1" id="7600370246422074415" />
-        <var name="quotedNode_2" id="7600370246422074415" />
-      </scope>
-      <scope id="7600370246421477153" at="295,0,304,0" />
-      <scope id="7600370246421963074" at="304,0,313,0" />
-      <scope id="7600370246422041067" at="313,0,322,0" />
-      <scope id="7600370246422074415" at="322,0,332,0" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/7600370246423001816">
-    <file name="QueriesGenerated.java">
-      <node id="9010839353952736699" at="56,112,57,233" concept="4" />
-      <node id="9010839353952736709" at="58,113,59,21" concept="5" />
-      <node id="9010839353952736718" at="61,113,62,26" concept="5" />
-      <node id="9010839353952736727" at="64,113,65,22" concept="5" />
-      <node id="9010839353952736736" at="67,113,68,23" concept="5" />
-      <node id="9010839353952736743" at="69,5,70,16" concept="5" />
-      <node id="9010839353953008234" at="134,109,135,296" concept="5" />
-      <node id="9010839353953104017" at="137,109,138,296" concept="5" />
-      <node id="1597470200014435795" at="140,109,141,296" concept="5" />
-      <node id="1597470200014435809" at="143,109,144,233" concept="4" />
-      <node id="1597470200014435819" at="145,114,146,148" concept="5" />
-      <node id="1597470200014435829" at="148,114,149,148" concept="5" />
-      <node id="1597470200014435839" at="151,114,152,148" concept="5" />
-      <node id="1597470200014435849" at="154,114,155,148" concept="5" />
-      <node id="1597470200014435857" at="156,5,157,16" concept="5" />
-      <node id="3501374812263557030" at="159,109,160,233" concept="4" />
-      <node id="3501374812263557040" at="161,114,162,148" concept="5" />
-      <node id="3501374812263557050" at="164,114,165,148" concept="5" />
-      <node id="3501374812263557060" at="167,114,168,148" concept="5" />
-      <node id="3501374812263557070" at="170,114,171,148" concept="5" />
-      <node id="3501374812263557078" at="172,5,173,16" concept="5" />
-      <node id="3501374812260750913" at="246,108,247,233" concept="4" />
-      <node id="3501374812260750923" at="248,114,249,52" concept="5" />
-      <node id="3501374812260750933" at="251,114,252,52" concept="5" />
-      <node id="3501374812260750943" at="254,114,255,52" concept="5" />
-      <node id="3501374812260750953" at="257,114,258,52" concept="5" />
-      <node id="3501374812260750961" at="259,5,260,16" concept="5" />
-      <node id="9010839353952788842" at="262,108,263,190" concept="5" />
-      <node id="9010839353952736713" at="332,62,333,63" concept="4" />
-      <node id="9010839353952736713" at="333,63,334,30" concept="4" />
-      <node id="9010839353952736713" at="334,30,335,30" concept="4" />
-      <node id="9010839353952736713" at="335,30,336,237" concept="1" />
-      <node id="9010839353952736713" at="336,237,337,221" concept="1" />
-      <node id="9010839353952736713" at="337,221,338,168" concept="1" />
-      <node id="9010839353952736713" at="338,168,339,24" concept="5" />
-      <node id="9010839353952736722" at="341,62,342,63" concept="4" />
-      <node id="9010839353952736722" at="342,63,343,30" concept="4" />
-      <node id="9010839353952736722" at="343,30,344,30" concept="4" />
-      <node id="9010839353952736722" at="344,30,345,237" concept="1" />
-      <node id="9010839353952736722" at="345,237,346,231" concept="1" />
-      <node id="9010839353952736722" at="346,231,347,168" concept="1" />
-      <node id="9010839353952736722" at="347,168,348,24" concept="5" />
-      <node id="9010839353952736731" at="350,62,351,63" concept="4" />
-      <node id="9010839353952736731" at="351,63,352,30" concept="4" />
-      <node id="9010839353952736731" at="352,30,353,30" concept="4" />
-      <node id="9010839353952736731" at="353,30,354,237" concept="1" />
-      <node id="9010839353952736731" at="354,237,355,222" concept="1" />
-      <node id="9010839353952736731" at="355,222,356,168" concept="1" />
-      <node id="9010839353952736731" at="356,168,357,24" concept="5" />
-      <node id="9010839353952736740" at="359,62,360,63" concept="4" />
-      <node id="9010839353952736740" at="360,63,361,30" concept="4" />
-      <node id="9010839353952736740" at="361,30,362,30" concept="4" />
-      <node id="9010839353952736740" at="362,30,363,237" concept="1" />
-      <node id="9010839353952736740" at="363,237,364,227" concept="1" />
-      <node id="9010839353952736740" at="364,227,365,467" concept="1" />
-      <node id="9010839353952736740" at="365,467,366,168" concept="1" />
-      <node id="9010839353952736740" at="366,168,367,24" concept="5" />
-      <node id="1597470200014435824" at="443,63,444,63" concept="4" />
-      <node id="1597470200014435824" at="444,63,445,30" concept="4" />
-      <node id="1597470200014435824" at="445,30,446,30" concept="4" />
-      <node id="1597470200014435824" at="446,30,447,237" concept="1" />
-      <node id="1597470200014435824" at="447,237,448,221" concept="1" />
-      <node id="1597470200014435824" at="448,221,449,168" concept="1" />
-      <node id="1597470200014435824" at="449,168,450,24" concept="5" />
-      <node id="1597470200014435834" at="452,63,453,63" concept="4" />
-      <node id="1597470200014435834" at="453,63,454,30" concept="4" />
-      <node id="1597470200014435834" at="454,30,455,30" concept="4" />
-      <node id="1597470200014435834" at="455,30,456,237" concept="1" />
-      <node id="1597470200014435834" at="456,237,457,231" concept="1" />
-      <node id="1597470200014435834" at="457,231,458,168" concept="1" />
-      <node id="1597470200014435834" at="458,168,459,24" concept="5" />
-      <node id="1597470200014435844" at="461,63,462,63" concept="4" />
-      <node id="1597470200014435844" at="462,63,463,30" concept="4" />
-      <node id="1597470200014435844" at="463,30,464,30" concept="4" />
-      <node id="1597470200014435844" at="464,30,465,237" concept="1" />
-      <node id="1597470200014435844" at="465,237,466,222" concept="1" />
-      <node id="1597470200014435844" at="466,222,467,168" concept="1" />
-      <node id="1597470200014435844" at="467,168,468,24" concept="5" />
-      <node id="1597470200014435854" at="470,63,471,63" concept="4" />
-      <node id="1597470200014435854" at="471,63,472,30" concept="4" />
-      <node id="1597470200014435854" at="472,30,473,30" concept="4" />
-      <node id="1597470200014435854" at="473,30,474,237" concept="1" />
-      <node id="1597470200014435854" at="474,237,475,227" concept="1" />
-      <node id="1597470200014435854" at="475,227,476,467" concept="1" />
-      <node id="1597470200014435854" at="476,467,477,168" concept="1" />
-      <node id="1597470200014435854" at="477,168,478,24" concept="5" />
-      <node id="3501374812263557045" at="480,63,481,63" concept="4" />
-      <node id="3501374812263557045" at="481,63,482,30" concept="4" />
-      <node id="3501374812263557045" at="482,30,483,30" concept="4" />
-      <node id="3501374812263557045" at="483,30,484,237" concept="1" />
-      <node id="3501374812263557045" at="484,237,485,221" concept="1" />
-      <node id="3501374812263557045" at="485,221,486,168" concept="1" />
-      <node id="3501374812263557045" at="486,168,487,24" concept="5" />
-      <node id="3501374812263557055" at="489,63,490,63" concept="4" />
-      <node id="3501374812263557055" at="490,63,491,30" concept="4" />
-      <node id="3501374812263557055" at="491,30,492,30" concept="4" />
-      <node id="3501374812263557055" at="492,30,493,237" concept="1" />
-      <node id="3501374812263557055" at="493,237,494,231" concept="1" />
-      <node id="3501374812263557055" at="494,231,495,168" concept="1" />
-      <node id="3501374812263557055" at="495,168,496,24" concept="5" />
-      <node id="3501374812263557065" at="498,63,499,63" concept="4" />
-      <node id="3501374812263557065" at="499,63,500,30" concept="4" />
-      <node id="3501374812263557065" at="500,30,501,30" concept="4" />
-      <node id="3501374812263557065" at="501,30,502,237" concept="1" />
-      <node id="3501374812263557065" at="502,237,503,222" concept="1" />
-      <node id="3501374812263557065" at="503,222,504,168" concept="1" />
-      <node id="3501374812263557065" at="504,168,505,24" concept="5" />
-      <node id="3501374812263557075" at="507,63,508,63" concept="4" />
-      <node id="3501374812263557075" at="508,63,509,30" concept="4" />
-      <node id="3501374812263557075" at="509,30,510,30" concept="4" />
-      <node id="3501374812263557075" at="510,30,511,237" concept="1" />
-      <node id="3501374812263557075" at="511,237,512,227" concept="1" />
-      <node id="3501374812263557075" at="512,227,513,467" concept="1" />
-      <node id="3501374812263557075" at="513,467,514,168" concept="1" />
-      <node id="3501374812263557075" at="514,168,515,24" concept="5" />
-      <node id="3501374812260844593" at="537,63,538,63" concept="4" />
-      <node id="3501374812260844593" at="538,63,539,30" concept="4" />
-      <node id="3501374812260844593" at="539,30,540,227" concept="1" />
-      <node id="3501374812260844593" at="540,227,541,473" concept="1" />
-      <node id="3501374812260844593" at="541,473,542,24" concept="5" />
-      <node id="3501374812260750928" at="544,63,545,63" concept="4" />
-      <node id="3501374812260750928" at="545,63,546,30" concept="4" />
-      <node id="3501374812260750928" at="546,30,547,30" concept="4" />
-      <node id="3501374812260750928" at="547,30,548,237" concept="1" />
-      <node id="3501374812260750928" at="548,237,549,221" concept="1" />
-      <node id="3501374812260750928" at="549,221,550,168" concept="1" />
-      <node id="3501374812260750928" at="550,168,551,24" concept="5" />
-      <node id="3501374812261036436" at="553,63,554,63" concept="4" />
-      <node id="3501374812261036436" at="554,63,555,30" concept="4" />
-      <node id="3501374812261036436" at="555,30,556,227" concept="1" />
-      <node id="3501374812261036436" at="556,227,557,473" concept="1" />
-      <node id="3501374812261036436" at="557,473,558,24" concept="5" />
-      <node id="3501374812260750938" at="560,63,561,63" concept="4" />
-      <node id="3501374812260750938" at="561,63,562,30" concept="4" />
-      <node id="3501374812260750938" at="562,30,563,30" concept="4" />
-      <node id="3501374812260750938" at="563,30,564,237" concept="1" />
-      <node id="3501374812260750938" at="564,237,565,231" concept="1" />
-      <node id="3501374812260750938" at="565,231,566,168" concept="1" />
-      <node id="3501374812260750938" at="566,168,567,24" concept="5" />
-      <node id="3501374812261085488" at="569,63,570,63" concept="4" />
-      <node id="3501374812261085488" at="570,63,571,30" concept="4" />
-      <node id="3501374812261085488" at="571,30,572,227" concept="1" />
-      <node id="3501374812261085488" at="572,227,573,474" concept="1" />
-      <node id="3501374812261085488" at="573,474,574,24" concept="5" />
-      <node id="3501374812260750948" at="576,63,577,63" concept="4" />
-      <node id="3501374812260750948" at="577,63,578,30" concept="4" />
-      <node id="3501374812260750948" at="578,30,579,30" concept="4" />
-      <node id="3501374812260750948" at="579,30,580,237" concept="1" />
-      <node id="3501374812260750948" at="580,237,581,222" concept="1" />
-      <node id="3501374812260750948" at="581,222,582,168" concept="1" />
-      <node id="3501374812260750948" at="582,168,583,24" concept="5" />
-      <node id="3501374812261134552" at="585,63,586,63" concept="4" />
-      <node id="3501374812261134552" at="586,63,587,30" concept="4" />
-      <node id="3501374812261134552" at="587,30,588,227" concept="1" />
-      <node id="3501374812261134552" at="588,227,589,476" concept="1" />
-      <node id="3501374812261134552" at="589,476,590,24" concept="5" />
-      <node id="3501374812260750958" at="592,63,593,63" concept="4" />
-      <node id="3501374812260750958" at="593,63,594,30" concept="4" />
-      <node id="3501374812260750958" at="594,30,595,30" concept="4" />
-      <node id="3501374812260750958" at="595,30,596,237" concept="1" />
-      <node id="3501374812260750958" at="596,237,597,227" concept="1" />
-      <node id="3501374812260750958" at="597,227,598,467" concept="1" />
-      <node id="3501374812260750958" at="598,467,599,168" concept="1" />
-      <node id="3501374812260750958" at="599,168,600,24" concept="5" />
-      <node id="9010839353952736713" at="336,237,338,168" concept="0" />
-      <node id="9010839353952736713" at="336,237,338,168" concept="0" />
-      <node id="9010839353952736722" at="345,237,347,168" concept="0" />
-      <node id="9010839353952736722" at="345,237,347,168" concept="0" />
-      <node id="9010839353952736731" at="354,237,356,168" concept="0" />
-      <node id="9010839353952736731" at="354,237,356,168" concept="0" />
-      <node id="1597470200014435824" at="447,237,449,168" concept="0" />
-      <node id="1597470200014435824" at="447,237,449,168" concept="0" />
-      <node id="1597470200014435834" at="456,237,458,168" concept="0" />
-      <node id="1597470200014435834" at="456,237,458,168" concept="0" />
-      <node id="1597470200014435844" at="465,237,467,168" concept="0" />
-      <node id="1597470200014435844" at="465,237,467,168" concept="0" />
-      <node id="3501374812263557045" at="484,237,486,168" concept="0" />
-      <node id="3501374812263557045" at="484,237,486,168" concept="0" />
-      <node id="3501374812263557055" at="493,237,495,168" concept="0" />
-      <node id="3501374812263557055" at="493,237,495,168" concept="0" />
-      <node id="3501374812263557065" at="502,237,504,168" concept="0" />
-      <node id="3501374812263557065" at="502,237,504,168" concept="0" />
-      <node id="3501374812260844593" at="539,30,541,473" concept="0" />
-      <node id="3501374812260844593" at="539,30,541,473" concept="0" />
-      <node id="3501374812260750928" at="548,237,550,168" concept="0" />
-      <node id="3501374812260750928" at="548,237,550,168" concept="0" />
-      <node id="3501374812261036436" at="555,30,557,473" concept="0" />
-      <node id="3501374812261036436" at="555,30,557,473" concept="0" />
-      <node id="3501374812260750938" at="564,237,566,168" concept="0" />
-      <node id="3501374812260750938" at="564,237,566,168" concept="0" />
-      <node id="3501374812261085488" at="571,30,573,474" concept="0" />
-      <node id="3501374812261085488" at="571,30,573,474" concept="0" />
-      <node id="3501374812260750948" at="580,237,582,168" concept="0" />
-      <node id="3501374812260750948" at="580,237,582,168" concept="0" />
-      <node id="3501374812261134552" at="587,30,589,476" concept="0" />
-      <node id="3501374812261134552" at="587,30,589,476" concept="0" />
-      <node id="9010839353952736707" at="57,233,60,5" concept="2" />
-      <node id="9010839353952736716" at="60,5,63,5" concept="2" />
-      <node id="9010839353952736725" at="63,5,66,5" concept="2" />
-      <node id="9010839353952736734" at="66,5,69,5" concept="2" />
-      <node id="1597470200014435817" at="144,233,147,5" concept="2" />
-      <node id="1597470200014435827" at="147,5,150,5" concept="2" />
-      <node id="1597470200014435837" at="150,5,153,5" concept="2" />
-      <node id="1597470200014435847" at="153,5,156,5" concept="2" />
-      <node id="3501374812263557038" at="160,233,163,5" concept="2" />
-      <node id="3501374812263557048" at="163,5,166,5" concept="2" />
-      <node id="3501374812263557058" at="166,5,169,5" concept="2" />
-      <node id="3501374812263557068" at="169,5,172,5" concept="2" />
-      <node id="3501374812260750921" at="247,233,250,5" concept="2" />
-      <node id="3501374812260750931" at="250,5,253,5" concept="2" />
-      <node id="3501374812260750941" at="253,5,256,5" concept="2" />
-      <node id="3501374812260750951" at="256,5,259,5" concept="2" />
-      <node id="9010839353952736713" at="335,30,338,168" concept="0" />
-      <node id="9010839353952736713" at="335,30,338,168" concept="0" />
-      <node id="9010839353952736722" at="344,30,347,168" concept="0" />
-      <node id="9010839353952736722" at="344,30,347,168" concept="0" />
-      <node id="9010839353952736731" at="353,30,356,168" concept="0" />
-      <node id="9010839353952736731" at="353,30,356,168" concept="0" />
-      <node id="9010839353952736740" at="363,237,366,168" concept="0" />
-      <node id="9010839353952736740" at="363,237,366,168" concept="0" />
-      <node id="1597470200014435824" at="446,30,449,168" concept="0" />
-      <node id="1597470200014435824" at="446,30,449,168" concept="0" />
-      <node id="1597470200014435834" at="455,30,458,168" concept="0" />
-      <node id="1597470200014435834" at="455,30,458,168" concept="0" />
-      <node id="1597470200014435844" at="464,30,467,168" concept="0" />
-      <node id="1597470200014435844" at="464,30,467,168" concept="0" />
-      <node id="1597470200014435854" at="474,237,477,168" concept="0" />
-      <node id="1597470200014435854" at="474,237,477,168" concept="0" />
-      <node id="3501374812263557045" at="483,30,486,168" concept="0" />
-      <node id="3501374812263557045" at="483,30,486,168" concept="0" />
-      <node id="3501374812263557055" at="492,30,495,168" concept="0" />
-      <node id="3501374812263557055" at="492,30,495,168" concept="0" />
-      <node id="3501374812263557065" at="501,30,504,168" concept="0" />
-      <node id="3501374812263557065" at="501,30,504,168" concept="0" />
-      <node id="3501374812263557075" at="511,237,514,168" concept="0" />
-      <node id="3501374812263557075" at="511,237,514,168" concept="0" />
-      <node id="3501374812260750928" at="547,30,550,168" concept="0" />
-      <node id="3501374812260750928" at="547,30,550,168" concept="0" />
-      <node id="3501374812260750938" at="563,30,566,168" concept="0" />
-      <node id="3501374812260750938" at="563,30,566,168" concept="0" />
-      <node id="3501374812260750948" at="579,30,582,168" concept="0" />
-      <node id="3501374812260750948" at="579,30,582,168" concept="0" />
-      <node id="3501374812260750958" at="596,237,599,168" concept="0" />
-      <node id="3501374812260750958" at="596,237,599,168" concept="0" />
-      <node id="9010839353952736740" at="362,30,366,168" concept="0" />
-      <node id="9010839353952736740" at="362,30,366,168" concept="0" />
-      <node id="1597470200014435854" at="473,30,477,168" concept="0" />
-      <node id="1597470200014435854" at="473,30,477,168" concept="0" />
-      <node id="3501374812263557075" at="510,30,514,168" concept="0" />
-      <node id="3501374812263557075" at="510,30,514,168" concept="0" />
-      <node id="3501374812260750958" at="595,30,599,168" concept="0" />
-      <node id="3501374812260750958" at="595,30,599,168" concept="0" />
-      <node id="3501374812260844593" at="537,0,544,0" concept="6" trace="_quotation_createNode_x583g4_a0a1a54#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812261036436" at="553,0,560,0" concept="6" trace="_quotation_createNode_x583g4_a0a2a54#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812261085488" at="569,0,576,0" concept="6" trace="_quotation_createNode_x583g4_a0a3a54#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812261134552" at="585,0,592,0" concept="6" trace="_quotation_createNode_x583g4_a0a4a54#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="9010839353952736713" at="332,0,341,0" concept="6" trace="_quotation_createNode_x583g4_b0a1a8#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="9010839353952736722" at="341,0,350,0" concept="6" trace="_quotation_createNode_x583g4_b0a2a8#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="9010839353952736731" at="350,0,359,0" concept="6" trace="_quotation_createNode_x583g4_b0a3a8#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1597470200014435824" at="443,0,452,0" concept="6" trace="_quotation_createNode_x583g4_b0a1a42#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1597470200014435834" at="452,0,461,0" concept="6" trace="_quotation_createNode_x583g4_b0a2a42#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1597470200014435844" at="461,0,470,0" concept="6" trace="_quotation_createNode_x583g4_b0a3a42#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812263557045" at="480,0,489,0" concept="6" trace="_quotation_createNode_x583g4_b0a1a52#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812263557055" at="489,0,498,0" concept="6" trace="_quotation_createNode_x583g4_b0a2a52#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812263557065" at="498,0,507,0" concept="6" trace="_quotation_createNode_x583g4_b0a3a52#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812260750928" at="544,0,553,0" concept="6" trace="_quotation_createNode_x583g4_b0a1a54#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812260750938" at="560,0,569,0" concept="6" trace="_quotation_createNode_x583g4_b0a2a54#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812260750948" at="576,0,585,0" concept="6" trace="_quotation_createNode_x583g4_b0a3a54#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="9010839353952736740" at="359,0,369,0" concept="6" trace="_quotation_createNode_x583g4_b0a4a8#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1597470200014435854" at="470,0,480,0" concept="6" trace="_quotation_createNode_x583g4_b0a4a42#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812263557075" at="507,0,517,0" concept="6" trace="_quotation_createNode_x583g4_b0a4a52#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3501374812260750958" at="592,0,602,0" concept="6" trace="_quotation_createNode_x583g4_b0a4a54#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="9010839353952736708" at="58,113,59,21" />
-      <scope id="9010839353952736717" at="61,113,62,26" />
-      <scope id="9010839353952736726" at="64,113,65,22" />
-      <scope id="9010839353952736735" at="67,113,68,23" />
-      <scope id="9010839353953001248" at="134,109,135,296" />
-      <scope id="9010839353953082328" at="137,109,138,296" />
-      <scope id="1597470200014435794" at="140,109,141,296" />
-      <scope id="1597470200014435818" at="145,114,146,148" />
-      <scope id="1597470200014435828" at="148,114,149,148" />
-      <scope id="1597470200014435838" at="151,114,152,148" />
-      <scope id="1597470200014435848" at="154,114,155,148" />
-      <scope id="3501374812263557039" at="161,114,162,148" />
-      <scope id="3501374812263557049" at="164,114,165,148" />
-      <scope id="3501374812263557059" at="167,114,168,148" />
-      <scope id="3501374812263557069" at="170,114,171,148" />
-      <scope id="3501374812260750922" at="248,114,249,52" />
-      <scope id="3501374812260750932" at="251,114,252,52" />
-      <scope id="3501374812260750942" at="254,114,255,52" />
-      <scope id="3501374812260750952" at="257,114,258,52" />
-      <scope id="9010839353952788841" at="262,108,263,190" />
-      <scope id="9010839353952736713" at="336,237,338,168" />
-      <scope id="9010839353952736722" at="345,237,347,168" />
-      <scope id="9010839353952736731" at="354,237,356,168" />
-      <scope id="1597470200014435824" at="447,237,449,168" />
-      <scope id="1597470200014435834" at="456,237,458,168" />
-      <scope id="1597470200014435844" at="465,237,467,168" />
-      <scope id="3501374812263557045" at="484,237,486,168" />
-      <scope id="3501374812263557055" at="493,237,495,168" />
-      <scope id="3501374812263557065" at="502,237,504,168" />
-      <scope id="3501374812260844593" at="539,30,541,473" />
-      <scope id="3501374812260750928" at="548,237,550,168" />
-      <scope id="3501374812261036436" at="555,30,557,473" />
-      <scope id="3501374812260750938" at="564,237,566,168" />
-      <scope id="3501374812261085488" at="571,30,573,474" />
-      <scope id="3501374812260750948" at="580,237,582,168" />
-      <scope id="3501374812261134552" at="587,30,589,476" />
-      <scope id="9010839353952736713" at="335,30,338,168" />
-      <scope id="9010839353952736722" at="344,30,347,168" />
-      <scope id="9010839353952736731" at="353,30,356,168" />
-      <scope id="9010839353952736740" at="363,237,366,168" />
-      <scope id="1597470200014435824" at="446,30,449,168" />
-      <scope id="1597470200014435834" at="455,30,458,168" />
-      <scope id="1597470200014435844" at="464,30,467,168" />
-      <scope id="1597470200014435854" at="474,237,477,168" />
-      <scope id="3501374812263557045" at="483,30,486,168" />
-      <scope id="3501374812263557055" at="492,30,495,168" />
-      <scope id="3501374812263557065" at="501,30,504,168" />
-      <scope id="3501374812263557075" at="511,237,514,168" />
-      <scope id="3501374812260750928" at="547,30,550,168" />
-      <scope id="3501374812260750938" at="563,30,566,168" />
-      <scope id="3501374812260750948" at="579,30,582,168" />
-      <scope id="3501374812260750958" at="596,237,599,168" />
-      <scope id="9010839353952736740" at="362,30,366,168" />
-      <scope id="1597470200014435854" at="473,30,477,168" />
-      <scope id="3501374812263557075" at="510,30,514,168" />
-      <scope id="3501374812260750958" at="595,30,599,168" />
-      <scope id="3501374812260844593" at="537,63,542,24">
-        <var name="facade" id="3501374812260844593" />
-        <var name="quotedNode_1" id="3501374812260844593" />
-      </scope>
-      <scope id="3501374812261036436" at="553,63,558,24">
-        <var name="facade" id="3501374812261036436" />
-        <var name="quotedNode_1" id="3501374812261036436" />
-      </scope>
-      <scope id="3501374812261085488" at="569,63,574,24">
-        <var name="facade" id="3501374812261085488" />
-        <var name="quotedNode_1" id="3501374812261085488" />
-      </scope>
-      <scope id="3501374812261134552" at="585,63,590,24">
-        <var name="facade" id="3501374812261134552" />
-        <var name="quotedNode_1" id="3501374812261134552" />
-      </scope>
-      <scope id="9010839353952736713" at="332,62,339,24">
-        <var name="facade" id="9010839353952736713" />
-        <var name="quotedNode_1" id="9010839353952736713" />
-        <var name="quotedNode_2" id="9010839353952736713" />
-      </scope>
-      <scope id="9010839353952736722" at="341,62,348,24">
-        <var name="facade" id="9010839353952736722" />
-        <var name="quotedNode_1" id="9010839353952736722" />
-        <var name="quotedNode_2" id="9010839353952736722" />
-      </scope>
-      <scope id="9010839353952736731" at="350,62,357,24">
-        <var name="facade" id="9010839353952736731" />
-        <var name="quotedNode_1" id="9010839353952736731" />
-        <var name="quotedNode_2" id="9010839353952736731" />
-      </scope>
-      <scope id="1597470200014435824" at="443,63,450,24">
-        <var name="facade" id="1597470200014435824" />
-        <var name="quotedNode_1" id="1597470200014435824" />
-        <var name="quotedNode_2" id="1597470200014435824" />
-      </scope>
-      <scope id="1597470200014435834" at="452,63,459,24">
-        <var name="facade" id="1597470200014435834" />
-        <var name="quotedNode_1" id="1597470200014435834" />
-        <var name="quotedNode_2" id="1597470200014435834" />
-      </scope>
-      <scope id="1597470200014435844" at="461,63,468,24">
-        <var name="facade" id="1597470200014435844" />
-        <var name="quotedNode_1" id="1597470200014435844" />
-        <var name="quotedNode_2" id="1597470200014435844" />
-      </scope>
-      <scope id="3501374812263557045" at="480,63,487,24">
-        <var name="facade" id="3501374812263557045" />
-        <var name="quotedNode_1" id="3501374812263557045" />
-        <var name="quotedNode_2" id="3501374812263557045" />
-      </scope>
-      <scope id="3501374812263557055" at="489,63,496,24">
-        <var name="facade" id="3501374812263557055" />
-        <var name="quotedNode_1" id="3501374812263557055" />
-        <var name="quotedNode_2" id="3501374812263557055" />
-      </scope>
-      <scope id="3501374812263557065" at="498,63,505,24">
-        <var name="facade" id="3501374812263557065" />
-        <var name="quotedNode_1" id="3501374812263557065" />
-        <var name="quotedNode_2" id="3501374812263557065" />
-      </scope>
-      <scope id="3501374812260844593" at="537,0,544,0" />
-      <scope id="3501374812260750928" at="544,63,551,24">
-        <var name="facade" id="3501374812260750928" />
-        <var name="quotedNode_1" id="3501374812260750928" />
-        <var name="quotedNode_2" id="3501374812260750928" />
-      </scope>
-      <scope id="3501374812261036436" at="553,0,560,0" />
-      <scope id="3501374812260750938" at="560,63,567,24">
-        <var name="facade" id="3501374812260750938" />
-        <var name="quotedNode_1" id="3501374812260750938" />
-        <var name="quotedNode_2" id="3501374812260750938" />
-      </scope>
-      <scope id="3501374812261085488" at="569,0,576,0" />
-      <scope id="3501374812260750948" at="576,63,583,24">
-        <var name="facade" id="3501374812260750948" />
-        <var name="quotedNode_1" id="3501374812260750948" />
-        <var name="quotedNode_2" id="3501374812260750948" />
-      </scope>
-      <scope id="3501374812261134552" at="585,0,592,0" />
-      <scope id="9010839353952736740" at="359,62,367,24">
-        <var name="facade" id="9010839353952736740" />
-        <var name="quotedNode_1" id="9010839353952736740" />
-        <var name="quotedNode_2" id="9010839353952736740" />
-      </scope>
-      <scope id="1597470200014435854" at="470,63,478,24">
-        <var name="facade" id="1597470200014435854" />
-        <var name="quotedNode_1" id="1597470200014435854" />
-        <var name="quotedNode_2" id="1597470200014435854" />
-      </scope>
-      <scope id="3501374812263557075" at="507,63,515,24">
-        <var name="facade" id="3501374812263557075" />
-        <var name="quotedNode_1" id="3501374812263557075" />
-        <var name="quotedNode_2" id="3501374812263557075" />
-      </scope>
-      <scope id="3501374812260750958" at="592,63,600,24">
-        <var name="facade" id="3501374812260750958" />
-        <var name="quotedNode_1" id="3501374812260750958" />
-        <var name="quotedNode_2" id="3501374812260750958" />
-      </scope>
-      <scope id="9010839353952736713" at="332,0,341,0" />
-      <scope id="9010839353952736722" at="341,0,350,0" />
-      <scope id="9010839353952736731" at="350,0,359,0" />
-      <scope id="1597470200014435824" at="443,0,452,0" />
-      <scope id="1597470200014435834" at="452,0,461,0" />
-      <scope id="1597470200014435844" at="461,0,470,0" />
-      <scope id="3501374812263557045" at="480,0,489,0" />
-      <scope id="3501374812263557055" at="489,0,498,0" />
-      <scope id="3501374812263557065" at="498,0,507,0" />
-      <scope id="3501374812260750928" at="544,0,553,0" />
-      <scope id="3501374812260750938" at="560,0,569,0" />
-      <scope id="3501374812260750948" at="576,0,585,0" />
-      <scope id="9010839353952736740" at="359,0,369,0" />
-      <scope id="1597470200014435854" at="470,0,480,0" />
-      <scope id="3501374812263557075" at="507,0,517,0" />
-      <scope id="3501374812260750958" at="592,0,602,0" />
-      <scope id="9010839353952736698" at="56,112,70,16">
-        <var name="type" id="9010839353952736700" />
-      </scope>
-      <scope id="1597470200014435808" at="143,109,157,16">
-        <var name="type" id="1597470200014435810" />
-      </scope>
-      <scope id="3501374812263511251" at="159,109,173,16">
-        <var name="type" id="3501374812263557031" />
-      </scope>
-      <scope id="3501374812261883522" at="246,108,260,16">
-        <var name="type" id="3501374812260750914" />
-      </scope>
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/7656298970878362380">
-    <file name="QueriesGenerated.java">
-      <node id="7600370246429485753" at="231,108,232,194" concept="5" />
-      <scope id="7600370246429485752" at="231,108,232,194" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/7738379549905438724">
-    <file name="QueriesGenerated.java">
-      <node id="4307205004144966848" at="181,108,182,193" concept="5" />
-      <node id="7738379549905474462" at="184,108,185,188" concept="5" />
-      <scope id="4307205004144966847" at="181,108,182,193" />
-      <scope id="7738379549905474171" at="184,108,185,188" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/7738379549910152710">
-    <file name="QueriesGenerated.java">
-      <node id="4307205004144963072" at="187,108,188,193" concept="5" />
-      <node id="5582028874771414670" at="190,108,191,194" concept="5" />
-      <scope id="4307205004144963071" at="187,108,188,193" />
-      <scope id="5582028874771414575" at="190,108,191,194" />
-    </file>
-  </root>
-  <root nodeRef="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)/8365379837260462194">
-    <file name="QueriesGenerated.java">
-      <node id="5510759644748879588" at="122,109,123,296" concept="5" />
-      <node id="5510759644748879580" at="193,108,194,190" concept="5" />
-      <scope id="5510759644748879587" at="122,109,123,296" />
-      <scope id="5510759644748879579" at="193,108,194,190" />
-    </file>
-  </root>
-</debug-info>
-
diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps
deleted file mode 100644
index 1e1ff840197d..000000000000
--- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps
+++ /dev/null
@@ -1,3403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)">
-  <persistence version="9" />
-  <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
-    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.console.blCommand" version="0" />
-    <use id="a5e4de53-46a3-44da-aab3-68fdf1c34ed0" name="jetbrains.mps.console.ideCommands" version="0" />
-    <use id="995a7394-7f76-4b8b-a929-c53448708106" name="jetbrains.mps.console.internalCommands" version="0" />
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
-    <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
-    <import index="8w31" ref="r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)" />
-    <import index="mte5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="urs3" ref="r:fc76aa36-3cff-41c7-b94b-eee0e8341932(jetbrains.mps.internal.collections.runtime)" />
-    <import index="tp27" ref="r:00000000-0000-4000-0000-011c89590303(jetbrains.mps.lang.smodel.generator.baseLanguage.template.main@generator)" />
-    <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
-  </imports>
-  <registry>
-    <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">
-        <child id="1082485599096" name="statements" index="9aQI4" />
-      </concept>
-      <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" />
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
-        <child id="1164879758292" name="body" index="SfCbr" />
-        <child id="1164903496223" name="catchClause" index="TEbGg" />
-      </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
-      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
-        <child id="1164903359218" name="catchBody" index="TDEfX" />
-        <child id="1164903359217" name="throwable" index="TDEfY" />
-      </concept>
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
-        <child id="1182160096073" name="cls" index="YeSDq" />
-      </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
-        <child id="1164991057263" name="throwable" index="YScLw" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068431790191" name="jetbrains.mps.baseLanguage.structure.Expression" flags="nn" index="33vP2n" />
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
-        <child id="1206060619838" name="condition" index="3eO9$A" />
-        <child id="1206060644605" name="statementList" index="3eOfB_" />
-      </concept>
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
-        <child id="1163668914799" name="condition" index="3K4Cdx" />
-        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
-        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
-        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
-      </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">
-        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
-      </concept>
-      <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
-        <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
-      </concept>
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
-        <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
-        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
-      </concept>
-      <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
-        <child id="1177093586806" name="templateNode" index="gfFT$" />
-      </concept>
-      <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
-      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1200911316486" name="jetbrains.mps.lang.generator.structure.MappingLabelDeclaration" flags="lg" index="2rT7sh">
-        <reference id="1200911342686" name="sourceConcept" index="2rTdP9" />
-        <reference id="1200913004646" name="targetConcept" index="2rZz_L" />
-      </concept>
-      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
-        <reference id="1722980698497626483" name="template" index="v9R2y" />
-      </concept>
-      <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" 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">
-        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
-        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
-      </concept>
-      <concept id="1092059087312" name="jetbrains.mps.lang.generator.structure.TemplateDeclaration" flags="ig" index="13MO4I">
-        <reference id="1168285871518" name="applicableConcept" index="3gUMe" />
-        <child id="1092060348987" name="contentNode" index="13RCb5" />
-      </concept>
-      <concept id="1195158154974" name="jetbrains.mps.lang.generator.structure.InlineSwitch_RuleConsequence" flags="lg" index="14YyZ8">
-        <child id="1195158241124" name="defaultConsequence" index="14YRTM" />
-        <child id="1195158408710" name="case" index="14ZwWg" />
-      </concept>
-      <concept id="1195158388553" name="jetbrains.mps.lang.generator.structure.InlineSwitch_Case" flags="ng" index="14ZrTv">
-        <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">
-        <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
-      </concept>
-      <concept id="1087833466690" name="jetbrains.mps.lang.generator.structure.NodeMacro" flags="lg" index="17VmuZ">
-        <reference id="1200912223215" name="mappingLabel" index="2rW$FS" />
-      </concept>
-      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
-        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
-      </concept>
-      <concept id="982871510068000147" name="jetbrains.mps.lang.generator.structure.TemplateSwitchMacro" flags="lg" index="1sPUBX">
-        <child id="982871510068000158" name="sourceNodeQuery" index="1sPUBK" />
-      </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="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">
-        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
-      </concept>
-    </language>
-    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
-        <child id="1199569906740" name="parameter" index="1bW2Oz" />
-        <child id="1199569916463" name="body" index="1bW5cS" />
-      </concept>
-      <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e">
-        <child id="1225797361612" name="parameter" index="1BdPVh" />
-      </concept>
-    </language>
-    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
-      <concept id="1218047638031" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_CreateUniqueName" flags="nn" index="2piZGk">
-        <child id="1218047638032" name="baseName" index="2piZGb" />
-        <child id="1218049772449" name="contextNode" index="2pr8EU" />
-      </concept>
-      <concept id="1216860049627" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput" flags="nn" index="1iwH70">
-        <reference id="1216860049628" name="label" index="1iwH77" />
-        <child id="1216860049632" name="inputNode" index="1iwH7V" />
-      </concept>
-      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
-    </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">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
-      <concept id="1176543928247" name="jetbrains.mps.lang.typesystem.structure.IsSubtypeExpression" flags="nn" index="3JuTUA">
-        <child id="1176543945045" name="subtypeExpression" index="3JuY14" />
-        <child id="1176543950311" name="supertypeExpression" index="3JuZjQ" />
-      </concept>
-      <concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
-      <concept id="1178870617262" name="jetbrains.mps.lang.typesystem.structure.CoerceExpression" flags="nn" index="1UaxmW">
-        <child id="1178870894644" name="pattern" index="1Ub_4A" />
-        <child id="1178870894645" name="nodeToCoerce" index="1Ub_4B" />
-      </concept>
-      <concept id="1178871491133" name="jetbrains.mps.lang.typesystem.structure.CoerceStrongExpression" flags="nn" index="1UdQGJ" />
-      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
-        <reference id="1174642800329" name="concept" index="1YaFvo" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <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="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="8758390115029295477" name="jetbrains.mps.lang.smodel.structure.SReferenceType" flags="in" index="2z4iKi" />
-      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="597763930871270009" name="jetbrains.mps.lang.smodel.structure.ChildNodeRefExpression" flags="nn" index="3fl2lp">
-        <reference id="597763930871272016" name="targetNode" index="3fl3PK" />
-        <child id="597763930871272014" name="parent" index="3fl3PI" />
-      </concept>
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
-      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
-        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
-      </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <reference id="1140138128738" name="concept" index="1PxNhF" />
-        <child id="1140138123956" name="leftExpression" index="1PxMeX" />
-      </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </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">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="3364660638048049750" name="jetbrains.mps.lang.core.structure.PropertyAttribute" flags="ng" index="A9Btg">
-        <property id="1757699476691236117" name="propertyName" index="2qtEX9" />
-        <property id="1341860900487648621" name="propertyId" index="P4ACc" />
-      </concept>
-      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
-        <property id="1757699476691236116" name="linkRole" index="2qtEX8" />
-        <property id="1341860900488019036" name="linkId" index="P3scX" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.console.blCommand">
-      <concept id="7820875636626932768" name="jetbrains.mps.console.blCommand.structure.AbstractPrintExpression" flags="ng" index="5bD3k">
-        <child id="8365379837260461921" name="object" index="2v23J2" />
-      </concept>
-      <concept id="7600370246423000655" name="jetbrains.mps.console.blCommand.structure.PrintSequenceExpression" flags="ng" index="i14oR" />
-      <concept id="7600370246417552247" name="jetbrains.mps.console.blCommand.structure.PrintExpression" flags="ng" index="ikQcf" />
-      <concept id="8365379837260459177" name="jetbrains.mps.console.blCommand.structure.PrintTextExpression" flags="ng" index="2v220a" />
-      <concept id="5464054275389846505" name="jetbrains.mps.console.blCommand.structure.BLCommand" flags="ng" index="2HLcI0">
-        <child id="1769790395579689573" name="body" index="3RSQip" />
-      </concept>
-      <concept id="2822369470875160718" name="jetbrains.mps.console.blCommand.structure.NodesExpression" flags="ng" index="2Jgcaq" />
-      <concept id="6852607286009511388" name="jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression" flags="ng" index="14Kevp" />
-      <concept id="4307205004131544317" name="jetbrains.mps.console.blCommand.structure.QueryExpression" flags="ng" index="1dNuzs">
-        <child id="4307205004132279624" name="parameter" index="1dOa5D" />
-      </concept>
-      <concept id="4307205004132277753" name="jetbrains.mps.console.blCommand.structure.QueryParameterList" flags="ng" index="1dO9Bo" />
-      <concept id="5510759644748856153" name="jetbrains.mps.console.blCommand.structure.PrintNodeExpression" flags="ng" index="1nExRE" />
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
-        <child id="1204796294226" name="closure" index="23t8la" />
-      </concept>
-      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
-        <child id="1151688676805" name="elementType" index="_ZDj9" />
-      </concept>
-      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
-        <child id="1151689745422" name="elementType" index="A3Ik2" />
-      </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <child id="1237721435808" name="initValue" index="HW$Y0" />
-        <child id="1237721435807" name="elementType" index="HW$YZ" />
-      </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
-      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
-      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
-    </language>
-  </registry>
-  <node concept="bUwia" id="4Cd_ANvqxii">
-    <property role="TrG5h" value="main" />
-    <node concept="3aamgX" id="DM6_$iqXIs" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:DM6_$iqV$8" resolve="ProjectExpression" />
-      <node concept="j$656" id="DM6_$iqXIt" role="1lVwrX">
-        <ref role="v9R2y" node="DM6_$iqXIq" resolve="reduce_ProjectExpression" />
-      </node>
-    </node>
-    <node concept="2rT7sh" id="1El5OLsAWHX" role="2rTMjI">
-      <property role="TrG5h" value="contextParameter" />
-      <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
-      <ref role="2rTdP9" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-    </node>
-    <node concept="2rT7sh" id="6Wun9yOAct3" role="2rTMjI">
-      <property role="TrG5h" value="consoleParameter" />
-      <ref role="2rTdP9" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-      <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
-    </node>
-    <node concept="3aamgX" id="4Cd_ANvqxwW" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-      <node concept="j$656" id="4Cd_ANvqxxX" role="1lVwrX">
-        <ref role="v9R2y" node="4Cd_ANvqxx0" resolve="reduce_BLCommand" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="3Pf6DLbUQ$0" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:5WpmwkrQrRs" resolve="PrintNodeReferenceExpression" />
-      <node concept="j$656" id="3Pf6DLbUQ$1" role="1lVwrX">
-        <ref role="v9R2y" node="3Pf6DLbUQzY" resolve="reduce_PrintNodeReferenceExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="YwfKjlWCPM" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:7mV0m3L$tuv" resolve="ShowExpression" />
-      <node concept="j$656" id="YwfKjlWCPN" role="1lVwrX">
-        <ref role="v9R2y" node="YwfKjlWCO7" resolve="reduce_ShowExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="6H$fNdLgGxM" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:7mV0m3L$trF" resolve="UsagesExpression" />
-      <node concept="j$656" id="6H$fNdLgGxN" role="1lVwrX">
-        <ref role="v9R2y" node="6H$fNdLgGw4" resolve="reduce_UsagesExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="6H$fNdLAtHI" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:6H$fNdLyE4d" resolve="InstancesExpression" />
-      <node concept="j$656" id="6H$fNdLAtN7" role="1lVwrX">
-        <ref role="v9R2y" node="6H$fNdLyFo6" resolve="reduce_InstancesExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="7gnNafF7Zzt" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:7gnNafF7YMD" resolve="PrintTextExpression" />
-      <node concept="j$656" id="7gnNafF7Zzu" role="1lVwrX">
-        <ref role="v9R2y" node="7gnNafF7ZxM" resolve="reduce_PrintTextExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="4LU9FcrO4X2" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:4LU9FcrO3Hp" resolve="PrintNodeExpression" />
-      <node concept="j$656" id="4LU9FcrO4X3" role="1lVwrX">
-        <ref role="v9R2y" node="4LU9FcrO4Vn" resolve="reduce_PrintNodeExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="3Z0MTj6l$GX" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:2sF4xi8qX2e" resolve="NodesExpression" />
-      <node concept="j$656" id="3Z0MTj6l$GY" role="1lVwrX">
-        <ref role="v9R2y" node="3Z0MTj6l$Fi" resolve="reduce_NodesExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="5uXC5_7dk$C" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:5uXC5_72l2X" resolve="ReferencesExpression" />
-      <node concept="j$656" id="5uXC5_7dk$D" role="1lVwrX">
-        <ref role="v9R2y" node="5uXC5_7dk$A" resolve="reduce_ReferencesExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="5X1VVpPJFdg" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:5X1VVpPJEGH" resolve="ModelsExpression" />
-      <node concept="j$656" id="5X1VVpPJFdh" role="1lVwrX">
-        <ref role="v9R2y" node="5X1VVpPJFde" resolve="reduce_ModelsExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="5X1VVpPS2IP" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:5X1VVpPN29y" resolve="ModulesExpression" />
-      <node concept="j$656" id="5X1VVpPS2IQ" role="1lVwrX">
-        <ref role="v9R2y" node="5X1VVpPS2IN" resolve="reduce_ModulesExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="3J6h25QGPcu" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:3J6h25Q5HRT" resolve="QueryParameterList" />
-      <node concept="j$656" id="3J6h25QGPcv" role="1lVwrX">
-        <ref role="v9R2y" node="3J6h25QGPcs" resolve="reduce_QueryParameterList" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="3J6h25QO0bv" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:3J6h25QeHP2" resolve="GlobalScope" />
-      <node concept="j$656" id="3J6h25QO0bw" role="1lVwrX">
-        <ref role="v9R2y" node="3J6h25QO0bt" resolve="reduce_GlobalScopeLiteral" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="3J6h25QOL64" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:3J6h25QeHQy" resolve="ProjectScope" />
-      <node concept="j$656" id="3J6h25QOL65" role="1lVwrX">
-        <ref role="v9R2y" node="3J6h25QOL62" resolve="reduce_ProjectScopeLiteral" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="6_TW7xVvrFq" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:6_TW7xVvrpf" resolve="PrintSequenceExpression" />
-      <node concept="j$656" id="6_TW7xVvrFr" role="1lVwrX">
-        <ref role="v9R2y" node="6_TW7xVvrFo" resolve="reduce_PrintSequenceExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="31Tct3TnZp6" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:2oWvAovDHkX" resolve="ModulesScope" />
-      <node concept="j$656" id="31Tct3TnZp7" role="1lVwrX">
-        <ref role="v9R2y" node="31Tct3TnZm2" resolve="reduce_ModuleScopeLiteral" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="31Tct3TvJ$n" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:31Tct3Tk$xe" resolve="ModelScope" />
-      <node concept="j$656" id="31Tct3TvJ$o" role="1lVwrX">
-        <ref role="v9R2y" node="31Tct3TvJ$l" resolve="reduce_ModelScopeLiteral" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="31Tct3Tzi3N" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:31Tct3Txnn9" resolve="CustomScope" />
-      <node concept="j$656" id="31Tct3Tzi3O" role="1lVwrX">
-        <ref role="v9R2y" node="31Tct3Tzi3L" resolve="reduce_CustomScope" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="1H31ARNQ$RD" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:3F2FyKbNNqb" resolve="WithStatement" />
-      <node concept="j$656" id="1H31ARNQ$RE" role="1lVwrX">
-        <ref role="v9R2y" node="1H31ARNQ$RB" resolve="reduce_WithStatement" />
-      </node>
-    </node>
-  </node>
-  <node concept="13MO4I" id="4Cd_ANvqxx0">
-    <property role="TrG5h" value="reduce_BLCommand" />
-    <property role="3GE5qa" value="command" />
-    <ref role="3gUMe" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-    <node concept="312cEu" id="4Cd_ANvqxy7" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="4Cd_ANvqxyB" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="4Cd_ANvqxyP" role="3clF45" />
-        <node concept="37vLTG" id="4m1XtPGA2Lr" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <property role="3TUv4t" value="true" />
-          <node concept="3uibUv" id="4m1XtPGA4y6" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-          <node concept="2ZBi8u" id="1El5OLsDxIC" role="lGtFl">
-            <ref role="2rW$FS" node="1El5OLsAWHX" resolve="contextParameter" />
-          </node>
-          <node concept="17Uvod" id="54jax8WTO$1" role="lGtFl">
-            <property role="2qtEX9" value="name" />
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <node concept="3zFVjK" id="54jax8WTO$2" role="3zH0cK">
-              <node concept="3clFbS" id="54jax8WTO$3" role="2VODD2">
-                <node concept="3clFbF" id="54jax8WTPMn" role="3cqZAp">
-                  <node concept="2OqwBi" id="54jax8WTQ5x" role="3clFbG">
-                    <node concept="1iwH7S" id="54jax8WTPMm" role="2Oq$k0" />
-                    <node concept="2piZGk" id="54jax8WTQBM" role="2OqNvi">
-                      <node concept="Xl_RD" id="54jax8WTQPw" role="2piZGb">
-                        <property role="Xl_RC" value="context" />
-                      </node>
-                      <node concept="30H73N" id="54jax8WTTyx" role="2pr8EU" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="4Cd_ANvqxyC" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <property role="3TUv4t" value="true" />
-          <node concept="3uibUv" id="5WpmwkrRlD5" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-          <node concept="2ZBi8u" id="6Wun9yOAdHk" role="lGtFl">
-            <ref role="2rW$FS" node="6Wun9yOAct3" resolve="consoleParameter" />
-          </node>
-          <node concept="17Uvod" id="54jax8WTTTd" role="lGtFl">
-            <property role="2qtEX9" value="name" />
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <node concept="3zFVjK" id="54jax8WTTTe" role="3zH0cK">
-              <node concept="3clFbS" id="54jax8WTTTf" role="2VODD2">
-                <node concept="3clFbF" id="54jax8WTUUN" role="3cqZAp">
-                  <node concept="2OqwBi" id="54jax8WTVdX" role="3clFbG">
-                    <node concept="1iwH7S" id="54jax8WTUUM" role="2Oq$k0" />
-                    <node concept="2piZGk" id="54jax8WTV_Z" role="2OqNvi">
-                      <node concept="Xl_RD" id="54jax8WTVNH" role="2piZGb">
-                        <property role="Xl_RC" value="console" />
-                      </node>
-                      <node concept="30H73N" id="54jax8WTXjr" role="2pr8EU" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="4Cd_ANvqxyG" role="1B3o_S" />
-        <node concept="raruj" id="4Cd_ANvqx$6" role="lGtFl" />
-        <node concept="3clFbS" id="4Cd_ANvqRDs" role="3clF47">
-          <node concept="SfApY" id="2lR2lzquv$0" role="3cqZAp">
-            <node concept="3clFbS" id="2lR2lzquv$2" role="SfCbr">
-              <node concept="3clFbH" id="4Cd_ANvqRDw" role="3cqZAp">
-                <node concept="2b32R4" id="4Cd_ANvqYIK" role="lGtFl">
-                  <node concept="3JmXsc" id="4Cd_ANvqYIS" role="2P8S$">
-                    <node concept="3clFbS" id="4Cd_ANvqYJ0" role="2VODD2">
-                      <node concept="3clFbF" id="4Cd_ANvqZ_K" role="3cqZAp">
-                        <node concept="2OqwBi" id="4k34Rd0vH1C" role="3clFbG">
-                          <node concept="2OqwBi" id="4Cd_ANvqZLa" role="2Oq$k0">
-                            <node concept="3TrEf2" id="4k34Rd0vF_C" role="2OqNvi">
-                              <ref role="3Tt5mk" to="3xdn:1yfzJNJreD_" />
-                            </node>
-                            <node concept="30H73N" id="4Cd_ANvqZ_J" role="2Oq$k0" />
-                          </node>
-                          <node concept="3Tsc0h" id="4k34Rd0vOnl" role="2OqNvi">
-                            <ref role="3TtcxE" to="tpee:fzcqZ_x" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="TDmWw" id="2lR2lzquv$3" role="TEbGg">
-              <node concept="3cpWsn" id="2lR2lzquv$5" role="TDEfY">
-                <property role="TrG5h" value="throwable" />
-                <node concept="3uibUv" id="47G6Tek7BTw" role="1tU5fm">
-                  <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-                </node>
-              </node>
-              <node concept="3clFbS" id="2lR2lzquv$9" role="TDEfX">
-                <node concept="3clFbF" id="2lR2lzrB8Di" role="3cqZAp">
-                  <node concept="2YIFZM" id="2lR2lzrB8Ih" role="3clFbG">
-                    <ref role="37wK5l" to="8w31:2lR2lzqETRX" resolve="registerAnalyzeStacktraceDialogClosure" />
-                    <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                    <node concept="37vLTw" id="2lR2lzrB8Jn" role="37wK5m">
-                      <ref role="3cqZAo" node="4m1XtPGA2Lr" resolve="context" />
-                      <node concept="1ZhdrF" id="738B4CEwF3M" role="lGtFl">
-                        <property role="2qtEX8" value="variableDeclaration" />
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <node concept="3$xsQk" id="738B4CEwF3N" role="3$ytzL">
-                          <node concept="3clFbS" id="738B4CEwHnZ" role="2VODD2">
-                            <node concept="3clFbF" id="738B4CEwIGG" role="3cqZAp">
-                              <node concept="2OqwBi" id="738B4CEwIRx" role="3clFbG">
-                                <node concept="1iwH7S" id="738B4CEwIGF" role="2Oq$k0" />
-                                <node concept="1iwH70" id="738B4CEwJfG" role="2OqNvi">
-                                  <ref role="1iwH77" node="1El5OLsAWHX" resolve="contextParameter" />
-                                  <node concept="30H73N" id="738B4CEwJoQ" role="1iwH7V" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="2lR2lzrB8TZ" role="37wK5m">
-                      <ref role="3cqZAo" node="4Cd_ANvqxyC" resolve="console" />
-                      <node concept="1ZhdrF" id="738B4CEwJsV" role="lGtFl">
-                        <property role="2qtEX8" value="variableDeclaration" />
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <node concept="3$xsQk" id="738B4CEwJsW" role="3$ytzL">
-                          <node concept="3clFbS" id="738B4CEwJsX" role="2VODD2">
-                            <node concept="3clFbF" id="738B4CEwJ$E" role="3cqZAp">
-                              <node concept="2OqwBi" id="738B4CEwKfh" role="3clFbG">
-                                <node concept="1iwH7S" id="738B4CEwK7Y" role="2Oq$k0" />
-                                <node concept="1iwH70" id="738B4CEwKBs" role="2OqNvi">
-                                  <ref role="1iwH77" node="6Wun9yOAct3" resolve="consoleParameter" />
-                                  <node concept="30H73N" id="738B4CEwKL_" role="1iwH7V" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="2lR2lzrB954" role="37wK5m">
-                      <ref role="3cqZAo" node="2lR2lzquv$5" resolve="throwable" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4Cd_ANvqxy8" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="3Pf6DLbUQzY">
-    <property role="TrG5h" value="reduce_PrintNodeReferenceExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <ref role="3gUMe" to="3xdn:5WpmwkrQrRs" resolve="PrintNodeReferenceExpression" />
-    <node concept="312cEu" id="3Pf6DLbW2Fs" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="3Pf6DLbW2Ft" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="37vLTG" id="4m1XtPGA5Rd" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="4m1XtPGA5Re" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="3Pf6DLbW2Fu" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="3Pf6DLbW2Fv" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="3Pf6DLbW2Fw" role="3clF45" />
-        <node concept="3Tm1VV" id="3Pf6DLbW2Fx" role="1B3o_S" />
-        <node concept="3clFbS" id="3Pf6DLbW2Fz" role="3clF47">
-          <node concept="3clFbF" id="5sf_VS_xgnT" role="3cqZAp">
-            <node concept="2YIFZM" id="5sf_VS_xgwW" role="3clFbG">
-              <ref role="37wK5l" to="8w31:22lVekVIkdS" resolve="addNodeReference" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="raruj" id="6D0CP__pk_L" role="lGtFl" />
-              <node concept="37vLTw" id="5sf_VS_xgEy" role="37wK5m">
-                <ref role="3cqZAo" node="3Pf6DLbW2Fu" resolve="console" />
-                <node concept="1ZhdrF" id="5sf_VS_xgUj" role="lGtFl">
-                  <property role="2qtEX8" value="variableDeclaration" />
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                  <node concept="3$xsQk" id="5sf_VS_xgUk" role="3$ytzL">
-                    <node concept="3clFbS" id="5sf_VS_xgUl" role="2VODD2">
-                      <node concept="3clFbF" id="5sf_VS_xh6N" role="3cqZAp">
-                        <node concept="2OqwBi" id="5sf_VS_xhDM" role="3clFbG">
-                          <node concept="1iwH7S" id="5sf_VS_xh6M" role="2Oq$k0" />
-                          <node concept="1iwH70" id="5sf_VS_xi2a" role="2OqNvi">
-                            <ref role="1iwH77" node="6Wun9yOAct3" resolve="consoleParameter" />
-                            <node concept="2OqwBi" id="5sf_VS_xiJ2" role="1iwH7V">
-                              <node concept="30H73N" id="5sf_VS_xihc" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="5sf_VS_xlSY" role="2OqNvi">
-                                <node concept="1xMEDy" id="5sf_VS_xlT0" role="1xVPHs">
-                                  <node concept="chp4Y" id="5sf_VS_xlXg" role="ri$Ld">
-                                    <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="10Nm6u" id="5sf_VS_xgK_" role="37wK5m">
-                <node concept="29HgVG" id="5sf_VS_xgNO" role="lGtFl">
-                  <node concept="3NFfHV" id="5sf_VS_xgNR" role="3NFExx">
-                    <node concept="3clFbS" id="5sf_VS_xgNS" role="2VODD2">
-                      <node concept="3clFbF" id="5sf_VS_xgNY" role="3cqZAp">
-                        <node concept="2OqwBi" id="5sf_VS_xgNT" role="3clFbG">
-                          <node concept="3TrEf2" id="5sf_VS_xgNW" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                          </node>
-                          <node concept="30H73N" id="5sf_VS_xgNX" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3Pf6DLbW2FC" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="YwfKjlWCO7">
-    <property role="TrG5h" value="reduce_ShowExpression" />
-    <property role="3GE5qa" value="expression" />
-    <ref role="3gUMe" to="3xdn:7mV0m3L$tuv" resolve="ShowExpression" />
-    <node concept="312cEu" id="YwfKjlWDwj" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="YwfKjlWDwk" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="YwfKjlWDwl" role="3clF45" />
-        <node concept="37vLTG" id="YwfKjlWDwm" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="YwfKjlWDwn" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="YwfKjlWDwo" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="YwfKjlWDwp" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="YwfKjlWDwq" role="1B3o_S" />
-        <node concept="3clFbS" id="YwfKjlWDws" role="3clF47">
-          <node concept="3clFbF" id="YwfKjlWG8F" role="3cqZAp">
-            <node concept="2YIFZM" id="YwfKjlX8v0" role="3clFbG">
-              <ref role="37wK5l" to="8w31:YwfKjlX8gC" resolve="show" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="2OqwBi" id="YwfKjlWGd2" role="37wK5m">
-                <node concept="37vLTw" id="YwfKjlWG8E" role="2Oq$k0">
-                  <ref role="3cqZAo" node="YwfKjlWDwm" resolve="context" />
-                  <node concept="1ZhdrF" id="6Wun9yOAkuK" role="lGtFl">
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <node concept="3$xsQk" id="6Wun9yOAkuL" role="3$ytzL">
-                      <node concept="3clFbS" id="6Wun9yOAkuM" role="2VODD2">
-                        <node concept="3clFbF" id="6Wun9yOAkBz" role="3cqZAp">
-                          <node concept="2OqwBi" id="6Wun9yOAkB$" role="3clFbG">
-                            <node concept="1iwH7S" id="6Wun9yOAkB_" role="2Oq$k0" />
-                            <node concept="1iwH70" id="6Wun9yOAkBA" role="2OqNvi">
-                              <ref role="1iwH77" node="1El5OLsAWHX" resolve="contextParameter" />
-                              <node concept="2OqwBi" id="6Wun9yOAkBB" role="1iwH7V">
-                                <node concept="30H73N" id="6Wun9yOAkBC" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="6Wun9yOAkBD" role="2OqNvi">
-                                  <node concept="1xMEDy" id="6Wun9yOAkBE" role="1xVPHs">
-                                    <node concept="chp4Y" id="6Wun9yOAkBF" role="ri$Ld">
-                                      <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="YwfKjlWGzf" role="2OqNvi">
-                  <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
-                </node>
-              </node>
-              <node concept="2YIFZM" id="6_TW7xVEL36" role="37wK5m">
-                <ref role="37wK5l" to="8w31:YwfKjlXcuc" resolve="nodesToResults" />
-                <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                <node concept="2OqwBi" id="32notsQyrpC" role="37wK5m">
-                  <node concept="2Jgcaq" id="32notsQyr2e" role="2Oq$k0">
-                    <node concept="1dO9Bo" id="32notsQyr2m" role="1dOa5D" />
-                    <node concept="29HgVG" id="32notsQywyV" role="lGtFl">
-                      <node concept="3NFfHV" id="32notsQywyW" role="3NFExx">
-                        <node concept="3clFbS" id="32notsQywyX" role="2VODD2">
-                          <node concept="3clFbF" id="32notsQywz3" role="3cqZAp">
-                            <node concept="2OqwBi" id="32notsQywyY" role="3clFbG">
-                              <node concept="3TrEf2" id="32notsQywz1" role="2OqNvi">
-                                <ref role="3Tt5mk" to="3xdn:6_TW7xVwuxP" />
-                              </node>
-                              <node concept="30H73N" id="32notsQywz2" role="2Oq$k0" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3$u5V9" id="32notsQyskA" role="2OqNvi">
-                    <node concept="1bVj0M" id="32notsQyskC" role="23t8la">
-                      <node concept="3clFbS" id="32notsQyskD" role="1bW5cS">
-                        <node concept="3clFbF" id="32notsQyu9c" role="3cqZAp">
-                          <node concept="2YIFZM" id="32notsQyvVZ" role="3clFbG">
-                            <ref role="37wK5l" to="8w31:32notsQsTE3" resolve="getNodeReference" />
-                            <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                            <node concept="37vLTw" id="32notsQywfo" role="37wK5m">
-                              <ref role="3cqZAo" node="32notsQyskE" resolve="it" />
-                            </node>
-                            <node concept="1ZhdrF" id="32notsQywRU" role="lGtFl">
-                              <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                              <node concept="3$xsQk" id="32notsQywRV" role="3$ytzL">
-                                <node concept="3clFbS" id="32notsQywRW" role="2VODD2">
-                                  <node concept="3cpWs8" id="32notsQyxgH" role="3cqZAp">
-                                    <node concept="3cpWsn" id="32notsQyxgI" role="3cpWs9">
-                                      <property role="TrG5h" value="type" />
-                                      <node concept="3Tqbb2" id="32notsQyxgJ" role="1tU5fm" />
-                                      <node concept="2OqwBi" id="32notsQyxgK" role="33vP2m">
-                                        <node concept="2OqwBi" id="32notsQyxgL" role="2Oq$k0">
-                                          <node concept="30H73N" id="32notsQyxgM" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="32notsQyxgN" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="3xdn:6_TW7xVwuxP" />
-                                          </node>
-                                        </node>
-                                        <node concept="3JvlWi" id="32notsQyxgO" role="2OqNvi" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbJ" id="32notsQyxgP" role="3cqZAp">
-                                    <node concept="3clFbS" id="32notsQyxgQ" role="3clFbx">
-                                      <node concept="3cpWs6" id="32notsQyxgR" role="3cqZAp">
-                                        <node concept="3fl2lp" id="32notsQyxgS" role="3cqZAk">
-                                          <ref role="3fl3PK" to="8w31:32notsQsTE3" resolve="getNodeReference" />
-                                          <node concept="3B5_sB" id="32notsQyxgT" role="3fl3PI">
-                                            <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3JuTUA" id="32notsQyxgU" role="3clFbw">
-                                      <node concept="37vLTw" id="32notsQyxgV" role="3JuY14">
-                                        <ref role="3cqZAo" node="32notsQyxgI" resolve="type" />
-                                      </node>
-                                      <node concept="2c44tf" id="32notsQyxgW" role="3JuZjQ">
-                                        <node concept="A3Dl8" id="32notsQyxgX" role="2c44tc">
-                                          <node concept="3Tqbb2" id="32notsQyxgY" role="A3Ik2" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbJ" id="32notsQyxgZ" role="3cqZAp">
-                                    <node concept="3clFbS" id="32notsQyxh0" role="3clFbx">
-                                      <node concept="3cpWs6" id="32notsQyxh1" role="3cqZAp">
-                                        <node concept="3fl2lp" id="32notsQyxh2" role="3cqZAk">
-                                          <ref role="3fl3PK" to="8w31:32notsQsUA1" resolve="getReferenceReference" />
-                                          <node concept="3B5_sB" id="32notsQyxh3" role="3fl3PI">
-                                            <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3JuTUA" id="32notsQyxh4" role="3clFbw">
-                                      <node concept="37vLTw" id="32notsQyxh5" role="3JuY14">
-                                        <ref role="3cqZAo" node="32notsQyxgI" resolve="type" />
-                                      </node>
-                                      <node concept="2c44tf" id="32notsQyxh6" role="3JuZjQ">
-                                        <node concept="A3Dl8" id="32notsQyxh7" role="2c44tc">
-                                          <node concept="2z4iKi" id="32notsQyxh8" role="A3Ik2" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbJ" id="32notsQyxh9" role="3cqZAp">
-                                    <node concept="3clFbS" id="32notsQyxha" role="3clFbx">
-                                      <node concept="3cpWs6" id="32notsQyxhb" role="3cqZAp">
-                                        <node concept="3fl2lp" id="32notsQyxhc" role="3cqZAk">
-                                          <ref role="3fl3PK" to="8w31:32notsQsVkE" resolve="getModelReference" />
-                                          <node concept="3B5_sB" id="32notsQyxhd" role="3fl3PI">
-                                            <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3JuTUA" id="32notsQyxhe" role="3clFbw">
-                                      <node concept="37vLTw" id="32notsQyxhf" role="3JuY14">
-                                        <ref role="3cqZAo" node="32notsQyxgI" resolve="type" />
-                                      </node>
-                                      <node concept="2c44tf" id="32notsQyxhg" role="3JuZjQ">
-                                        <node concept="A3Dl8" id="32notsQyxhh" role="2c44tc">
-                                          <node concept="H_c77" id="32notsQyxhi" role="A3Ik2" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbJ" id="32notsQyxhj" role="3cqZAp">
-                                    <node concept="3clFbS" id="32notsQyxhk" role="3clFbx">
-                                      <node concept="3cpWs6" id="32notsQyxhl" role="3cqZAp">
-                                        <node concept="3fl2lp" id="32notsQyxhm" role="3cqZAk">
-                                          <ref role="3fl3PK" to="8w31:32notsQsW4c" resolve="getModuleReference" />
-                                          <node concept="3B5_sB" id="32notsQyxhn" role="3fl3PI">
-                                            <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3JuTUA" id="32notsQyxho" role="3clFbw">
-                                      <node concept="37vLTw" id="32notsQyxhp" role="3JuY14">
-                                        <ref role="3cqZAo" node="32notsQyxgI" resolve="type" />
-                                      </node>
-                                      <node concept="2c44tf" id="32notsQyxhq" role="3JuZjQ">
-                                        <node concept="A3Dl8" id="32notsQyxhr" role="2c44tc">
-                                          <node concept="3uibUv" id="32notsQyxhs" role="A3Ik2">
-                                            <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3cpWs6" id="32notsQyxht" role="3cqZAp">
-                                    <node concept="10Nm6u" id="32notsQyxhu" role="3cqZAk" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="32notsQyskE" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="32notsQyskF" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="32notsQArnH" role="37wK5m">
-                  <node concept="2OqwBi" id="32notsQArnI" role="2Oq$k0">
-                    <node concept="37vLTw" id="32notsQArnJ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="YwfKjlWDwm" resolve="context" />
-                      <node concept="1ZhdrF" id="32notsQArnK" role="lGtFl">
-                        <property role="2qtEX8" value="variableDeclaration" />
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <node concept="3$xsQk" id="32notsQArnL" role="3$ytzL">
-                          <node concept="3clFbS" id="32notsQArnM" role="2VODD2">
-                            <node concept="3clFbF" id="32notsQArnN" role="3cqZAp">
-                              <node concept="2OqwBi" id="32notsQArnO" role="3clFbG">
-                                <node concept="1iwH7S" id="32notsQArnP" role="2Oq$k0" />
-                                <node concept="1iwH70" id="32notsQArnQ" role="2OqNvi">
-                                  <ref role="1iwH77" node="1El5OLsAWHX" resolve="contextParameter" />
-                                  <node concept="2OqwBi" id="32notsQArnR" role="1iwH7V">
-                                    <node concept="30H73N" id="32notsQArnS" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="32notsQArnT" role="2OqNvi">
-                                      <node concept="1xMEDy" id="32notsQArnU" role="1xVPHs">
-                                        <node concept="chp4Y" id="32notsQArnV" role="ri$Ld">
-                                          <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="32notsQArnW" role="2OqNvi">
-                      <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="32notsQArnX" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                  </node>
-                </node>
-                <node concept="1ZhdrF" id="6_TW7xVEL3f" role="lGtFl">
-                  <property role="2qtEX8" value="baseMethodDeclaration" />
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                  <node concept="3$xsQk" id="6_TW7xVEL3g" role="3$ytzL">
-                    <node concept="3clFbS" id="6_TW7xVEL3h" role="2VODD2">
-                      <node concept="3cpWs8" id="6_TW7xVEL3i" role="3cqZAp">
-                        <node concept="3cpWsn" id="6_TW7xVEL3j" role="3cpWs9">
-                          <property role="TrG5h" value="type" />
-                          <node concept="3Tqbb2" id="6_TW7xVEL3k" role="1tU5fm" />
-                          <node concept="2OqwBi" id="3idupetCQFo" role="33vP2m">
-                            <node concept="2OqwBi" id="3idupetCQFp" role="2Oq$k0">
-                              <node concept="30H73N" id="3idupetCQFq" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="3idupetCRCU" role="2OqNvi">
-                                <ref role="3Tt5mk" to="3xdn:6_TW7xVwuxP" />
-                              </node>
-                            </node>
-                            <node concept="3JvlWi" id="3idupetCQFs" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbJ" id="6_TW7xVEL3r" role="3cqZAp">
-                        <node concept="3clFbS" id="6_TW7xVEL3s" role="3clFbx">
-                          <node concept="3cpWs6" id="6_TW7xVEL3t" role="3cqZAp">
-                            <node concept="3fl2lp" id="6_TW7xVEL3u" role="3cqZAk">
-                              <ref role="3fl3PK" to="8w31:YwfKjlXcuc" resolve="nodesToResults" />
-                              <node concept="3B5_sB" id="6_TW7xVEL3v" role="3fl3PI">
-                                <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3JuTUA" id="6_TW7xVEL3w" role="3clFbw">
-                          <node concept="37vLTw" id="6_TW7xVEL3x" role="3JuY14">
-                            <ref role="3cqZAo" node="6_TW7xVEL3j" resolve="type" />
-                          </node>
-                          <node concept="2c44tf" id="6_TW7xVEL3y" role="3JuZjQ">
-                            <node concept="A3Dl8" id="6_TW7xVEL3z" role="2c44tc">
-                              <node concept="3Tqbb2" id="6_TW7xVEL3$" role="A3Ik2" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbJ" id="6_TW7xVEL3_" role="3cqZAp">
-                        <node concept="3clFbS" id="6_TW7xVEL3A" role="3clFbx">
-                          <node concept="3cpWs6" id="6_TW7xVEL3B" role="3cqZAp">
-                            <node concept="3fl2lp" id="6_TW7xVEL3C" role="3cqZAk">
-                              <ref role="3fl3PK" to="8w31:YwfKjlXcuc" resolve="nodesToResults" />
-                              <node concept="3B5_sB" id="6_TW7xVEL3D" role="3fl3PI">
-                                <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3JuTUA" id="6_TW7xVEL3E" role="3clFbw">
-                          <node concept="37vLTw" id="6_TW7xVEL3F" role="3JuY14">
-                            <ref role="3cqZAo" node="6_TW7xVEL3j" resolve="type" />
-                          </node>
-                          <node concept="2c44tf" id="6_TW7xVEL3G" role="3JuZjQ">
-                            <node concept="A3Dl8" id="6_TW7xVEL3H" role="2c44tc">
-                              <node concept="2z4iKi" id="6_TW7xVEL3I" role="A3Ik2" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbJ" id="6_TW7xVEL3J" role="3cqZAp">
-                        <node concept="3clFbS" id="6_TW7xVEL3K" role="3clFbx">
-                          <node concept="3cpWs6" id="6_TW7xVEL3L" role="3cqZAp">
-                            <node concept="3fl2lp" id="6_TW7xVEL3M" role="3cqZAk">
-                              <ref role="3fl3PK" to="8w31:YwfKjlXcx9" resolve="modelsToResults" />
-                              <node concept="3B5_sB" id="6_TW7xVEL3N" role="3fl3PI">
-                                <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3JuTUA" id="6_TW7xVEL3O" role="3clFbw">
-                          <node concept="37vLTw" id="6_TW7xVEL3P" role="3JuY14">
-                            <ref role="3cqZAo" node="6_TW7xVEL3j" resolve="type" />
-                          </node>
-                          <node concept="2c44tf" id="6_TW7xVEL3Q" role="3JuZjQ">
-                            <node concept="A3Dl8" id="6_TW7xVEL3R" role="2c44tc">
-                              <node concept="H_c77" id="6_TW7xVEL3S" role="A3Ik2" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbJ" id="6_TW7xVEL3T" role="3cqZAp">
-                        <node concept="3clFbS" id="6_TW7xVEL3U" role="3clFbx">
-                          <node concept="3cpWs6" id="6_TW7xVEL3V" role="3cqZAp">
-                            <node concept="3fl2lp" id="6_TW7xVEL3W" role="3cqZAk">
-                              <ref role="3fl3PK" to="8w31:YwfKjlXcyY" resolve="modulesToResults" />
-                              <node concept="3B5_sB" id="6_TW7xVEL3X" role="3fl3PI">
-                                <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3JuTUA" id="6_TW7xVEL3Y" role="3clFbw">
-                          <node concept="37vLTw" id="6_TW7xVEL3Z" role="3JuY14">
-                            <ref role="3cqZAo" node="6_TW7xVEL3j" resolve="type" />
-                          </node>
-                          <node concept="2c44tf" id="6_TW7xVEL40" role="3JuZjQ">
-                            <node concept="A3Dl8" id="6_TW7xVEL41" role="2c44tc">
-                              <node concept="3uibUv" id="6_TW7xVEL42" role="A3Ik2">
-                                <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs6" id="6_TW7xVEL43" role="3cqZAp">
-                        <node concept="10Nm6u" id="6_TW7xVEL44" role="3cqZAk" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="6_TW7xV8285" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="YwfKjlWDwB" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="6H$fNdLgGw4">
-    <property role="TrG5h" value="reduce_UsagesExpression" />
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="3gUMe" to="3xdn:7mV0m3L$trF" resolve="UsagesExpression" />
-    <node concept="312cEu" id="6H$fNdLgKWW" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="6H$fNdLgKWX" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="6H$fNdLgKWY" role="3clF45" />
-        <node concept="37vLTG" id="6H$fNdLgKWZ" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="6H$fNdLgKX0" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="6H$fNdLgKX1" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="6H$fNdLgKX2" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="6H$fNdLgKX3" role="1B3o_S" />
-        <node concept="3clFbS" id="6H$fNdLgKX4" role="3clF47">
-          <node concept="3clFbF" id="6H$fNdLgMMv" role="3cqZAp">
-            <node concept="2YIFZM" id="6H$fNdLgNbW" role="3clFbG">
-              <ref role="37wK5l" to="8w31:6H$fNdLgK3S" resolve="usages" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="2YIFZM" id="3J6h25QQ7MU" role="37wK5m">
-                <ref role="37wK5l" to="8w31:3J6h25QHNxY" resolve="createConsoleScope" />
-                <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                <node concept="10Nm6u" id="3J6h25QQ7MV" role="37wK5m" />
-                <node concept="10Nm6u" id="3J6h25QQ7MW" role="37wK5m" />
-                <node concept="29HgVG" id="3J6h25QQ7MX" role="lGtFl">
-                  <node concept="3NFfHV" id="3J6h25QQ7MY" role="3NFExx">
-                    <node concept="3clFbS" id="3J6h25QQ7MZ" role="2VODD2">
-                      <node concept="3clFbF" id="3J6h25QQ7N0" role="3cqZAp">
-                        <node concept="2OqwBi" id="3J6h25QQ7N1" role="3clFbG">
-                          <node concept="3TrEf2" id="3J6h25QQ7N2" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                          </node>
-                          <node concept="30H73N" id="3J6h25QQ7N3" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="10Nm6u" id="6H$fNdLgOPy" role="37wK5m">
-                <node concept="29HgVG" id="6H$fNdLgP9R" role="lGtFl">
-                  <node concept="3NFfHV" id="6H$fNdLgP9T" role="3NFExx">
-                    <node concept="3clFbS" id="6H$fNdLgP9V" role="2VODD2">
-                      <node concept="3clFbF" id="6H$fNdLgPeu" role="3cqZAp">
-                        <node concept="2OqwBi" id="6H$fNdLgPB4" role="3clFbG">
-                          <node concept="30H73N" id="6H$fNdLgPet" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="6H$fNdLgSnN" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:7mV0m3L$trG" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="6H$fNdLgP5a" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6H$fNdLgKXt" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="6H$fNdLyFo6">
-    <property role="TrG5h" value="reduce_InstancesExpression" />
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="3gUMe" to="3xdn:6H$fNdLyE4d" resolve="InstancesExpression" />
-    <node concept="312cEu" id="6H$fNdLyFo7" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="6H$fNdLyFo8" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="6H$fNdLyFo9" role="3clF45" />
-        <node concept="37vLTG" id="6H$fNdLyFoa" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="6H$fNdLyFob" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="6H$fNdLyFoc" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="6H$fNdLyFod" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="6H$fNdLyFoe" role="1B3o_S" />
-        <node concept="3clFbS" id="6H$fNdLyFof" role="3clF47">
-          <node concept="3clFbF" id="6H$fNdLyFog" role="3cqZAp">
-            <node concept="2YIFZM" id="6H$fNdLyMmh" role="3clFbG">
-              <ref role="37wK5l" to="8w31:6H$fNdLyI$k" resolve="instances" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="2YIFZM" id="3J6h25QQ6RU" role="37wK5m">
-                <ref role="37wK5l" to="8w31:3J6h25QHNxY" resolve="createConsoleScope" />
-                <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                <node concept="10Nm6u" id="3J6h25QQ6RV" role="37wK5m" />
-                <node concept="10Nm6u" id="3J6h25QQ6RW" role="37wK5m" />
-                <node concept="29HgVG" id="3J6h25QQ6RX" role="lGtFl">
-                  <node concept="3NFfHV" id="3J6h25QQ6RY" role="3NFExx">
-                    <node concept="3clFbS" id="3J6h25QQ6RZ" role="2VODD2">
-                      <node concept="3clFbF" id="3J6h25QQ6S0" role="3cqZAp">
-                        <node concept="2OqwBi" id="3J6h25QQ6S1" role="3clFbG">
-                          <node concept="3TrEf2" id="3J6h25QQ6S2" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                          </node>
-                          <node concept="30H73N" id="3J6h25QQ6S3" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="10Nm6u" id="6H$fNdLyMml" role="37wK5m">
-                <node concept="1sPUBX" id="4PRmqZeCQd2" role="lGtFl">
-                  <ref role="v9R2y" to="tp27:3oBWDt57kLm" resolve="switch_toSAbstractConcept" />
-                  <node concept="3NFfHV" id="4PRmqZeIjSI" role="1sPUBK">
-                    <node concept="3clFbS" id="4PRmqZeIjSJ" role="2VODD2">
-                      <node concept="3clFbF" id="4PRmqZeIjUe" role="3cqZAp">
-                        <node concept="2OqwBi" id="4PRmqZeIjZG" role="3clFbG">
-                          <node concept="30H73N" id="4PRmqZeIjUd" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="4PRmqZeIl8W" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:6H$fNdLyE4e" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="6H$fNdLyMmt" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6H$fNdLyFou" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="DM6_$iqXIq">
-    <property role="TrG5h" value="reduce_ProjectExpression" />
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="3gUMe" to="3xdn:DM6_$iqV$8" resolve="ProjectExpression" />
-    <node concept="312cEu" id="DM6_$iqYkT" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="DM6_$iqYkU" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="DM6_$iqYkV" role="3clF45" />
-        <node concept="37vLTG" id="DM6_$iqYkW" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="DM6_$iqYkX" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="DM6_$iqYkY" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="DM6_$iqYkZ" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="DM6_$iqYl0" role="1B3o_S" />
-        <node concept="3clFbS" id="DM6_$iqYl1" role="3clF47">
-          <node concept="3clFbF" id="DM6_$ir01X" role="3cqZAp">
-            <node concept="2OqwBi" id="DM6_$ir060" role="3clFbG">
-              <node concept="37vLTw" id="DM6_$ir01W" role="2Oq$k0">
-                <ref role="3cqZAo" node="DM6_$iqYkW" resolve="context" />
-                <node concept="1ZhdrF" id="DM6_$ir0u4" role="lGtFl">
-                  <property role="2qtEX8" value="variableDeclaration" />
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                  <node concept="3$xsQk" id="DM6_$ir0u5" role="3$ytzL">
-                    <node concept="3clFbS" id="DM6_$ir0u6" role="2VODD2">
-                      <node concept="3clFbF" id="DM6_$iqYl8" role="3cqZAp">
-                        <node concept="2OqwBi" id="DM6_$iqYl9" role="3clFbG">
-                          <node concept="1iwH7S" id="DM6_$iqYla" role="2Oq$k0" />
-                          <node concept="1iwH70" id="DM6_$iqYlb" role="2OqNvi">
-                            <ref role="1iwH77" node="1El5OLsAWHX" resolve="contextParameter" />
-                            <node concept="2OqwBi" id="DM6_$iqYlc" role="1iwH7V">
-                              <node concept="30H73N" id="DM6_$iqYld" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="DM6_$iqYle" role="2OqNvi">
-                                <node concept="1xMEDy" id="DM6_$iqYlf" role="1xVPHs">
-                                  <node concept="chp4Y" id="DM6_$iqYlg" role="ri$Ld">
-                                    <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="DM6_$ir0s1" role="2OqNvi">
-                <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
-              </node>
-              <node concept="raruj" id="DM6_$isJh2" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="DM6_$iqYli" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="7gnNafF7ZxM">
-    <property role="TrG5h" value="reduce_PrintTextExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <ref role="3gUMe" to="3xdn:7gnNafF7YMD" resolve="PrintTextExpression" />
-    <node concept="312cEu" id="7gnNafF7ZKS" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="7gnNafF7ZKT" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="37vLTG" id="7gnNafF7ZKU" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="7gnNafF7ZKV" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="7gnNafF7ZKW" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="7gnNafF7ZKX" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7gnNafF7ZKY" role="3clF45" />
-        <node concept="3Tm1VV" id="7gnNafF7ZKZ" role="1B3o_S" />
-        <node concept="3clFbS" id="7gnNafF7ZL0" role="3clF47">
-          <node concept="3clFbF" id="4LU9FcrO9rk" role="3cqZAp">
-            <node concept="2OqwBi" id="4LU9FcrO9rl" role="3clFbG">
-              <node concept="raruj" id="6D0CP__pjLb" role="lGtFl" />
-              <node concept="liA8E" id="4LU9FcrO9rm" role="2OqNvi">
-                <ref role="37wK5l" to="qgo0:5WpmwkrQPWC" resolve="addText" />
-                <node concept="3cpWs3" id="3k3Ji7IudM_" role="37wK5m">
-                  <node concept="Xl_RD" id="3k3Ji7IudWt" role="3uHU7w">
-                    <property role="Xl_RC" value="" />
-                  </node>
-                  <node concept="1eOMI4" id="3k3Ji7IucXI" role="3uHU7B">
-                    <node concept="37vLTw" id="4LU9FcrO9ro" role="1eOMHV">
-                      <node concept="29HgVG" id="4LU9FcrO9rp" role="lGtFl">
-                        <node concept="3NFfHV" id="4LU9FcrO9rq" role="3NFExx">
-                          <node concept="3clFbS" id="4LU9FcrO9rr" role="2VODD2">
-                            <node concept="3clFbF" id="4LU9FcrO9rs" role="3cqZAp">
-                              <node concept="2OqwBi" id="4LU9FcrO9rt" role="3clFbG">
-                                <node concept="3TrEf2" id="4LU9FcrO9ru" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                                </node>
-                                <node concept="30H73N" id="4LU9FcrO9rv" role="2Oq$k0" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="37vLTw" id="4LU9FcrO9rw" role="2Oq$k0">
-                <ref role="3cqZAo" node="7gnNafF7ZKW" resolve="console" />
-                <node concept="1ZhdrF" id="4LU9FcrO9rx" role="lGtFl">
-                  <property role="2qtEX8" value="variableDeclaration" />
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                  <node concept="3$xsQk" id="4LU9FcrO9ry" role="3$ytzL">
-                    <node concept="3clFbS" id="4LU9FcrO9rz" role="2VODD2">
-                      <node concept="3clFbF" id="4LU9FcrO9r$" role="3cqZAp">
-                        <node concept="2OqwBi" id="4LU9FcrO9r_" role="3clFbG">
-                          <node concept="1iwH7S" id="4LU9FcrO9rA" role="2Oq$k0" />
-                          <node concept="1iwH70" id="4LU9FcrO9rB" role="2OqNvi">
-                            <ref role="1iwH77" node="6Wun9yOAct3" resolve="consoleParameter" />
-                            <node concept="2OqwBi" id="4LU9FcrO9rC" role="1iwH7V">
-                              <node concept="30H73N" id="4LU9FcrO9rD" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="4LU9FcrO9rE" role="2OqNvi">
-                                <node concept="1xMEDy" id="4LU9FcrO9rF" role="1xVPHs">
-                                  <node concept="chp4Y" id="4LU9FcrO9rG" role="ri$Ld">
-                                    <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7gnNafF7ZLe" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="4LU9FcrO4Vn">
-    <property role="TrG5h" value="reduce_PrintNodeExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <ref role="3gUMe" to="3xdn:4LU9FcrO3Hp" resolve="PrintNodeExpression" />
-    <node concept="312cEu" id="4LU9FcrO4Zk" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="4LU9FcrO4Zl" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="37vLTG" id="4LU9FcrO4Zm" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="4LU9FcrO4Zn" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="4LU9FcrO4Zo" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="4LU9FcrO4Zp" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="4LU9FcrO4Zq" role="3clF45" />
-        <node concept="3Tm1VV" id="4LU9FcrO4Zr" role="1B3o_S" />
-        <node concept="3clFbS" id="4LU9FcrO4Zs" role="3clF47">
-          <node concept="3cpWs8" id="4LU9FcrP8ZE" role="3cqZAp">
-            <node concept="3cpWsn" id="4LU9FcrP8ZH" role="3cpWs9">
-              <property role="TrG5h" value="node" />
-              <node concept="3uibUv" id="5kx7ze1rEb_" role="1tU5fm">
-                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="4LU9FcrO6VE" role="3cqZAp">
-            <node concept="2OqwBi" id="4LU9FcrO6VF" role="3clFbG">
-              <node concept="raruj" id="6D0CP__pkbk" role="lGtFl" />
-              <node concept="37vLTw" id="4LU9FcrO6VG" role="2Oq$k0">
-                <ref role="3cqZAo" node="4LU9FcrO4Zo" resolve="console" />
-                <node concept="1ZhdrF" id="4LU9FcrO6VH" role="lGtFl">
-                  <property role="2qtEX8" value="variableDeclaration" />
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                  <node concept="3$xsQk" id="4LU9FcrO6VI" role="3$ytzL">
-                    <node concept="3clFbS" id="4LU9FcrO6VJ" role="2VODD2">
-                      <node concept="3clFbF" id="4LU9FcrO6VK" role="3cqZAp">
-                        <node concept="2OqwBi" id="4LU9FcrO6VL" role="3clFbG">
-                          <node concept="1iwH7S" id="4LU9FcrO6VM" role="2Oq$k0" />
-                          <node concept="1iwH70" id="4LU9FcrO6VN" role="2OqNvi">
-                            <ref role="1iwH77" node="6Wun9yOAct3" resolve="consoleParameter" />
-                            <node concept="2OqwBi" id="4LU9FcrO6VO" role="1iwH7V">
-                              <node concept="30H73N" id="4LU9FcrO6VP" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="4LU9FcrO6VQ" role="2OqNvi">
-                                <node concept="1xMEDy" id="4LU9FcrO6VR" role="1xVPHs">
-                                  <node concept="chp4Y" id="4LU9FcrO6VS" role="ri$Ld">
-                                    <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="4LU9FcrO6VT" role="2OqNvi">
-                <ref role="37wK5l" to="qgo0:7Jzw3XJWFQB" resolve="addNode" />
-                <node concept="2YIFZM" id="5kx7ze1rEy1" role="37wK5m">
-                  <ref role="37wK5l" to="w1kc:~CopyUtil.copy(org.jetbrains.mps.openapi.model.SNode):org.jetbrains.mps.openapi.model.SNode" resolve="copy" />
-                  <ref role="1Pybhc" to="w1kc:~CopyUtil" resolve="CopyUtil" />
-                  <node concept="37vLTw" id="5kx7ze1rEOj" role="37wK5m">
-                    <ref role="3cqZAo" node="4LU9FcrP8ZH" resolve="node" />
-                    <node concept="29HgVG" id="5kx7ze1rEOk" role="lGtFl">
-                      <node concept="3NFfHV" id="5kx7ze1rEOl" role="3NFExx">
-                        <node concept="3clFbS" id="5kx7ze1rEOm" role="2VODD2">
-                          <node concept="3clFbF" id="5kx7ze1rEOn" role="3cqZAp">
-                            <node concept="2OqwBi" id="5kx7ze1rEOo" role="3clFbG">
-                              <node concept="3TrEf2" id="5kx7ze1rEOp" role="2OqNvi">
-                                <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                              </node>
-                              <node concept="30H73N" id="5kx7ze1rEOq" role="2Oq$k0" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4LU9FcrO4ZQ" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="3Z0MTj6l$Fi">
-    <property role="TrG5h" value="reduce_NodesExpression" />
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="3gUMe" to="3xdn:2sF4xi8qX2e" resolve="NodesExpression" />
-    <node concept="312cEu" id="3Z0MTj6l_4f" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="3Z0MTj6l_4g" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="3Z0MTj6l_4h" role="3clF45" />
-        <node concept="37vLTG" id="3Z0MTj6l_4i" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="3Z0MTj6l_4j" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="3Z0MTj6l_4k" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="3Z0MTj6l_4l" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="3Z0MTj6l_4m" role="1B3o_S" />
-        <node concept="3clFbS" id="3Z0MTj6l_4n" role="3clF47">
-          <node concept="3clFbF" id="3Z0MTj6l_4o" role="3cqZAp">
-            <node concept="2YIFZM" id="3Z0MTj6lAI4" role="3clFbG">
-              <ref role="37wK5l" to="8w31:hpHLh7Fj2X" resolve="nodes" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="raruj" id="3Z0MTj6lAIs" role="lGtFl" />
-              <node concept="2YIFZM" id="3J6h25QJne$" role="37wK5m">
-                <ref role="37wK5l" to="8w31:3J6h25QHNxY" resolve="createConsoleScope" />
-                <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                <node concept="10Nm6u" id="3J6h25QJnhU" role="37wK5m" />
-                <node concept="10Nm6u" id="3J6h25QJnp5" role="37wK5m" />
-                <node concept="29HgVG" id="3J6h25QJnsR" role="lGtFl">
-                  <node concept="3NFfHV" id="3J6h25QJnsU" role="3NFExx">
-                    <node concept="3clFbS" id="3J6h25QJnsV" role="2VODD2">
-                      <node concept="3clFbF" id="3J6h25QJnt1" role="3cqZAp">
-                        <node concept="2OqwBi" id="3J6h25QJnsW" role="3clFbG">
-                          <node concept="3TrEf2" id="3J6h25QJnsZ" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                          </node>
-                          <node concept="30H73N" id="3J6h25QJnt0" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3Z0MTj6l_4M" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="5uXC5_7dk$A">
-    <property role="TrG5h" value="reduce_ReferencesExpression" />
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="3gUMe" to="3xdn:5uXC5_72l2X" resolve="ReferencesExpression" />
-    <node concept="312cEu" id="5uXC5_7dkZV" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="5uXC5_7dkZW" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="5uXC5_7dkZX" role="3clF45" />
-        <node concept="37vLTG" id="5uXC5_7dkZY" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="5uXC5_7dkZZ" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="5uXC5_7dl00" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="5uXC5_7dl01" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="5uXC5_7dl02" role="1B3o_S" />
-        <node concept="3clFbS" id="5uXC5_7dl03" role="3clF47">
-          <node concept="3clFbF" id="5uXC5_7dl04" role="3cqZAp">
-            <node concept="2YIFZM" id="5uXC5_7dlxS" role="3clFbG">
-              <ref role="37wK5l" to="8w31:1El5OLsHe1P" resolve="references" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="2YIFZM" id="3J6h25QQ7a$" role="37wK5m">
-                <ref role="37wK5l" to="8w31:3J6h25QHNxY" resolve="createConsoleScope" />
-                <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                <node concept="10Nm6u" id="3J6h25QQ7a_" role="37wK5m" />
-                <node concept="10Nm6u" id="3J6h25QQ7aA" role="37wK5m" />
-                <node concept="29HgVG" id="3J6h25QQ7aB" role="lGtFl">
-                  <node concept="3NFfHV" id="3J6h25QQ7aC" role="3NFExx">
-                    <node concept="3clFbS" id="3J6h25QQ7aD" role="2VODD2">
-                      <node concept="3clFbF" id="3J6h25QQ7aE" role="3cqZAp">
-                        <node concept="2OqwBi" id="3J6h25QQ7aF" role="3clFbG">
-                          <node concept="3TrEf2" id="3J6h25QQ7aG" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                          </node>
-                          <node concept="30H73N" id="3J6h25QQ7aH" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="5uXC5_7dlys" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5uXC5_7dl0E" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="5X1VVpPJFde">
-    <property role="TrG5h" value="reduce_ModelsExpression" />
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="3gUMe" to="3xdn:5X1VVpPJEGH" resolve="ModelsExpression" />
-    <node concept="312cEu" id="5X1VVpPJFmb" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="5X1VVpPJFmc" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="5X1VVpPJFmd" role="3clF45" />
-        <node concept="37vLTG" id="5X1VVpPJFme" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="5X1VVpPJFmf" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="5X1VVpPJFmg" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="5X1VVpPJFmh" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="5X1VVpPJFmi" role="1B3o_S" />
-        <node concept="3clFbS" id="5X1VVpPJFmj" role="3clF47">
-          <node concept="3clFbF" id="5X1VVpPJFmk" role="3cqZAp">
-            <node concept="2YIFZM" id="5X1VVpPN21_" role="3clFbG">
-              <ref role="37wK5l" to="8w31:DM6_$imnYd" resolve="models" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="2YIFZM" id="3J6h25QQ6A3" role="37wK5m">
-                <ref role="37wK5l" to="8w31:3J6h25QHNxY" resolve="createConsoleScope" />
-                <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                <node concept="10Nm6u" id="3J6h25QQ6A4" role="37wK5m" />
-                <node concept="10Nm6u" id="3J6h25QQ6A5" role="37wK5m" />
-                <node concept="29HgVG" id="3J6h25QQ6A6" role="lGtFl">
-                  <node concept="3NFfHV" id="3J6h25QQ6A7" role="3NFExx">
-                    <node concept="3clFbS" id="3J6h25QQ6A8" role="2VODD2">
-                      <node concept="3clFbF" id="3J6h25QQ6A9" role="3cqZAp">
-                        <node concept="2OqwBi" id="3J6h25QQ6Aa" role="3clFbG">
-                          <node concept="3TrEf2" id="3J6h25QQ6Ab" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                          </node>
-                          <node concept="30H73N" id="3J6h25QQ6Ac" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="5X1VVpPN21P" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5X1VVpPJFmA" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="5X1VVpPS2IN">
-    <property role="TrG5h" value="reduce_ModulesExpression" />
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="3gUMe" to="3xdn:5X1VVpPN29y" resolve="ModulesExpression" />
-    <node concept="312cEu" id="5X1VVpPS2Qx" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="5X1VVpPS2Qy" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="5X1VVpPS2Qz" role="3clF45" />
-        <node concept="37vLTG" id="5X1VVpPS2Q$" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="5X1VVpPS2Q_" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="5X1VVpPS2QA" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="5X1VVpPS2QB" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="5X1VVpPS2QC" role="1B3o_S" />
-        <node concept="3clFbS" id="5X1VVpPS2QD" role="3clF47">
-          <node concept="3clFbF" id="5X1VVpPS2QE" role="3cqZAp">
-            <node concept="2YIFZM" id="5X1VVpPS2XS" role="3clFbG">
-              <ref role="37wK5l" to="8w31:DM6_$ineY0" resolve="modules" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="2YIFZM" id="3J6h25QQ6np" role="37wK5m">
-                <ref role="37wK5l" to="8w31:3J6h25QHNxY" resolve="createConsoleScope" />
-                <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                <node concept="10Nm6u" id="3J6h25QQ6nq" role="37wK5m" />
-                <node concept="10Nm6u" id="3J6h25QQ6nr" role="37wK5m" />
-                <node concept="29HgVG" id="3J6h25QQ6ns" role="lGtFl">
-                  <node concept="3NFfHV" id="3J6h25QQ6nt" role="3NFExx">
-                    <node concept="3clFbS" id="3J6h25QQ6nu" role="2VODD2">
-                      <node concept="3clFbF" id="3J6h25QQ6nv" role="3cqZAp">
-                        <node concept="2OqwBi" id="3J6h25QQ6nw" role="3clFbG">
-                          <node concept="3TrEf2" id="3J6h25QQ6nx" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:3J6h25Q5Il8" />
-                          </node>
-                          <node concept="30H73N" id="3J6h25QQ6ny" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="5X1VVpPS2Y8" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5X1VVpPS2QW" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="3J6h25QGPcs">
-    <property role="TrG5h" value="reduce_QueryParameterList" />
-    <property role="3GE5qa" value="expression.parameter" />
-    <ref role="3gUMe" to="3xdn:3J6h25Q5HRT" resolve="QueryParameterList" />
-    <node concept="312cEu" id="3J6h25QGPG6" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="3J6h25QGPG7" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="3J6h25QGPG8" role="3clF45" />
-        <node concept="37vLTG" id="3J6h25QGPG9" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="3J6h25QGPGa" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="3J6h25QGPGb" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="3J6h25QGPGc" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="3J6h25QGPGd" role="1B3o_S" />
-        <node concept="3clFbS" id="3J6h25QGPGe" role="3clF47">
-          <node concept="3clFbF" id="3J6h25QHLRA" role="3cqZAp">
-            <node concept="2YIFZM" id="3J6h25QHNTv" role="3clFbG">
-              <ref role="37wK5l" to="8w31:3J6h25QHNxY" resolve="createConsoleScope" />
-              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-              <node concept="10Nm6u" id="3J6h25QHP70" role="37wK5m">
-                <node concept="29HgVG" id="3J6h25QHPEH" role="lGtFl">
-                  <node concept="3NFfHV" id="3J6h25QHPEJ" role="3NFExx">
-                    <node concept="3clFbS" id="3J6h25QHPEL" role="2VODD2">
-                      <node concept="3cpWs8" id="3J6h25QJEyZ" role="3cqZAp">
-                        <node concept="3cpWsn" id="3J6h25QJEz2" role="3cpWs9">
-                          <property role="TrG5h" value="results" />
-                          <node concept="2OqwBi" id="3J6h25QNsHA" role="33vP2m">
-                            <node concept="2OqwBi" id="3J6h25QHTs6" role="2Oq$k0">
-                              <node concept="2OqwBi" id="3J6h25QHPRK" role="2Oq$k0">
-                                <node concept="30H73N" id="3J6h25QHPIF" role="2Oq$k0" />
-                                <node concept="3Tsc0h" id="3J6h25QHR3n" role="2OqNvi">
-                                  <ref role="3TtcxE" to="3xdn:3J6h25QCAaA" />
-                                </node>
-                              </node>
-                              <node concept="3zZkjj" id="3J6h25QI3Py" role="2OqNvi">
-                                <node concept="1bVj0M" id="3J6h25QI3P$" role="23t8la">
-                                  <node concept="3clFbS" id="3J6h25QI3P_" role="1bW5cS">
-                                    <node concept="3clFbF" id="3J6h25QI4fx" role="3cqZAp">
-                                      <node concept="2OqwBi" id="3J6h25QI4WH" role="3clFbG">
-                                        <node concept="37vLTw" id="3J6h25QI4fw" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3J6h25QI3PA" resolve="it" />
-                                        </node>
-                                        <node concept="1mIQ4w" id="3J6h25QI9zR" role="2OqNvi">
-                                          <node concept="chp4Y" id="3J6h25QI9Xb" role="cj9EA">
-                                            <ref role="cht4Q" to="3xdn:3J6h25Q6eOJ" resolve="QueryParameterScope" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="Rh6nW" id="3J6h25QI3PA" role="1bW2Oz">
-                                    <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="3J6h25QI3PB" role="1tU5fm" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3$u5V9" id="3J6h25QNvtH" role="2OqNvi">
-                              <node concept="1bVj0M" id="3J6h25QNvtJ" role="23t8la">
-                                <node concept="3clFbS" id="3J6h25QNvtK" role="1bW5cS">
-                                  <node concept="3clFbF" id="3J6h25QNw2l" role="3cqZAp">
-                                    <node concept="1PxgMI" id="3J6h25QN_u8" role="3clFbG">
-                                      <ref role="1PxNhF" to="3xdn:3J6h25Q6eOJ" resolve="QueryParameterScope" />
-                                      <node concept="37vLTw" id="3J6h25QNw2k" role="1PxMeX">
-                                        <ref role="3cqZAo" node="3J6h25QNvtL" resolve="it" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="Rh6nW" id="3J6h25QNvtL" role="1bW2Oz">
-                                  <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3J6h25QNvtM" role="1tU5fm" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="A3Dl8" id="3J6h25QJHGD" role="1tU5fm">
-                            <node concept="3Tqbb2" id="3J6h25QJEyY" role="A3Ik2">
-                              <ref role="ehGHo" to="3xdn:3J6h25Q6eOJ" resolve="QueryParameterScope" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs6" id="3J6h25QJFxr" role="3cqZAp">
-                        <node concept="3K4zz7" id="3J6h25QJLSB" role="3cqZAk">
-                          <node concept="2c44tf" id="3J6h25QJM7G" role="3K4E3e">
-                            <node concept="10Nm6u" id="3J6h25QJMol" role="2c44tc" />
-                          </node>
-                          <node concept="2OqwBi" id="3J6h25QNI5V" role="3K4GZi">
-                            <node concept="2OqwBi" id="3J6h25QJOMW" role="2Oq$k0">
-                              <node concept="37vLTw" id="3J6h25QJMoQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3J6h25QJEz2" resolve="results" />
-                              </node>
-                              <node concept="1uHKPH" id="3J6h25QJQDe" role="2OqNvi" />
-                            </node>
-                            <node concept="3TrEf2" id="3J6h25QNL58" role="2OqNvi">
-                              <ref role="3Tt5mk" to="3xdn:3J6h25QeYY9" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="3J6h25QJG_T" role="3K4Cdx">
-                            <node concept="37vLTw" id="3J6h25QJGa4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3J6h25QJEz2" resolve="results" />
-                            </node>
-                            <node concept="1v1jN8" id="3J6h25QJJLv" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbT" id="3J6h25QHP3u" role="37wK5m">
-                <node concept="29HgVG" id="3J6h25QIeck" role="lGtFl">
-                  <node concept="3NFfHV" id="3J6h25QIecm" role="3NFExx">
-                    <node concept="3clFbS" id="3J6h25QIeco" role="2VODD2">
-                      <node concept="3cpWs8" id="3J6h25QJRgb" role="3cqZAp">
-                        <node concept="3cpWsn" id="3J6h25QJRgc" role="3cpWs9">
-                          <property role="TrG5h" value="results" />
-                          <node concept="A3Dl8" id="3J6h25QJRgr" role="1tU5fm">
-                            <node concept="3Tqbb2" id="3J6h25QJRgs" role="A3Ik2">
-                              <ref role="ehGHo" to="3xdn:3J6h25Q2URP" resolve="QueryParameter" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="3J6h25QIiae" role="33vP2m">
-                            <node concept="2OqwBi" id="3J6h25QIe_O" role="2Oq$k0">
-                              <node concept="30H73N" id="3J6h25QIev7" role="2Oq$k0" />
-                              <node concept="3Tsc0h" id="3J6h25QIfLv" role="2OqNvi">
-                                <ref role="3TtcxE" to="3xdn:3J6h25QCAaA" />
-                              </node>
-                            </node>
-                            <node concept="3zZkjj" id="3J6h25QIsQE" role="2OqNvi">
-                              <node concept="1bVj0M" id="3J6h25QIsQG" role="23t8la">
-                                <node concept="3clFbS" id="3J6h25QIsQH" role="1bW5cS">
-                                  <node concept="3clFbF" id="3J6h25QItgD" role="3cqZAp">
-                                    <node concept="2OqwBi" id="3J6h25QItXP" role="3clFbG">
-                                      <node concept="37vLTw" id="3J6h25QItgC" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3J6h25QIsQI" resolve="it" />
-                                      </node>
-                                      <node concept="1mIQ4w" id="3J6h25QIw3W" role="2OqNvi">
-                                        <node concept="chp4Y" id="3J6h25QIwtg" role="cj9EA">
-                                          <ref role="cht4Q" to="3xdn:3J6h25Q6eM6" resolve="QueryParameterIncludeReadOnly" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="Rh6nW" id="3J6h25QIsQI" role="1bW2Oz">
-                                  <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="3J6h25QIsQJ" role="1tU5fm" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs6" id="3J6h25QJRgt" role="3cqZAp">
-                        <node concept="3K4zz7" id="3J6h25QJRgu" role="3cqZAk">
-                          <node concept="2c44tf" id="3J6h25QNVnM" role="3K4GZi">
-                            <node concept="3clFbT" id="3J6h25QNVTH" role="2c44tc">
-                              <property role="3clFbU" value="true" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="3J6h25QJRg$" role="3K4Cdx">
-                            <node concept="37vLTw" id="3J6h25QJRg_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3J6h25QJRgc" resolve="results" />
-                            </node>
-                            <node concept="1v1jN8" id="3J6h25QJRgA" role="2OqNvi" />
-                          </node>
-                          <node concept="2c44tf" id="3J6h25QNMhK" role="3K4E3e">
-                            <node concept="3clFbT" id="3J6h25QNQhN" role="2c44tc">
-                              <property role="3clFbU" value="false" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="37vLTw" id="3J6h25QLwgt" role="37wK5m">
-                <ref role="3cqZAo" node="3J6h25QGPG9" resolve="context" />
-                <node concept="1ZhdrF" id="3J6h25QLxrG" role="lGtFl">
-                  <property role="2qtEX8" value="variableDeclaration" />
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                  <node concept="3$xsQk" id="3J6h25QLxrH" role="3$ytzL">
-                    <node concept="3clFbS" id="3J6h25QLxrI" role="2VODD2">
-                      <node concept="3clFbF" id="3J6h25QM44Y" role="3cqZAp">
-                        <node concept="2OqwBi" id="3J6h25QM4dR" role="3clFbG">
-                          <node concept="1iwH7S" id="3J6h25QM44W" role="2Oq$k0" />
-                          <node concept="1iwH70" id="3J6h25QM4$w" role="2OqNvi">
-                            <ref role="1iwH77" node="1El5OLsAWHX" resolve="contextParameter" />
-                            <node concept="2OqwBi" id="3J6h25QLE$V" role="1iwH7V">
-                              <node concept="30H73N" id="3J6h25QLEtZ" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="3J6h25QLLOe" role="2OqNvi">
-                                <node concept="1xMEDy" id="3J6h25QLLOg" role="1xVPHs">
-                                  <node concept="chp4Y" id="3J6h25QLRTR" role="ri$Ld">
-                                    <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="3J6h25QKuam" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3J6h25QGPGx" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="3J6h25QO0bt">
-    <property role="TrG5h" value="reduce_GlobalScopeLiteral" />
-    <property role="3GE5qa" value="expression.parameter" />
-    <ref role="3gUMe" to="3xdn:3J6h25QeHP2" resolve="GlobalScope" />
-    <node concept="312cEu" id="3J6h25QO0gm" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="3J6h25QO0gn" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="3J6h25QO0go" role="3clF45" />
-        <node concept="37vLTG" id="3J6h25QO0gp" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="3J6h25QO0gq" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="3J6h25QO0gr" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="3J6h25QO0gs" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="3J6h25QO0gt" role="1B3o_S" />
-        <node concept="3clFbS" id="3J6h25QO0gu" role="3clF47">
-          <node concept="3clFbF" id="3J6h25QOG$P" role="3cqZAp">
-            <node concept="2YIFZM" id="3J6h25QOIM4" role="3clFbG">
-              <ref role="37wK5l" to="z1c3:~GlobalScope.getInstance():jetbrains.mps.project.GlobalScope" resolve="getInstance" />
-              <ref role="1Pybhc" to="z1c3:~GlobalScope" resolve="GlobalScope" />
-              <node concept="raruj" id="3J6h25QOMpM" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3J6h25QO0hE" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="3J6h25QOL62">
-    <property role="TrG5h" value="reduce_ProjectScopeLiteral" />
-    <property role="3GE5qa" value="expression.parameter" />
-    <ref role="3gUMe" to="3xdn:3J6h25QeHQy" resolve="ProjectScope" />
-    <node concept="312cEu" id="3J6h25QOMzM" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="3J6h25QOMzN" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="3J6h25QOMzO" role="3clF45" />
-        <node concept="37vLTG" id="3J6h25QOMzP" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="3J6h25QOMzQ" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="3J6h25QOMzR" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="3J6h25QOMzS" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="3J6h25QOMzT" role="1B3o_S" />
-        <node concept="3clFbS" id="3J6h25QOMzU" role="3clF47">
-          <node concept="3clFbF" id="3J6h25QOMzV" role="3cqZAp">
-            <node concept="2ShNRf" id="3TUIR3TH$mK" role="3clFbG">
-              <node concept="1pGfFk" id="3TUIR3TIfUB" role="2ShVmc">
-                <ref role="37wK5l" to="mte5:~ProjectScope.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="ProjectScope" />
-                <node concept="2OqwBi" id="3J6h25QP07d" role="37wK5m">
-                  <node concept="37vLTw" id="3J6h25QP00V" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3J6h25QOMzP" resolve="context" />
-                    <node concept="1ZhdrF" id="3J6h25QP85u" role="lGtFl">
-                      <property role="2qtEX8" value="variableDeclaration" />
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                      <node concept="3$xsQk" id="3J6h25QP85v" role="3$ytzL">
-                        <node concept="3clFbS" id="3J6h25QP85w" role="2VODD2">
-                          <node concept="3clFbF" id="3J6h25QP8aX" role="3cqZAp">
-                            <node concept="2OqwBi" id="3J6h25QP8j3" role="3clFbG">
-                              <node concept="1iwH7S" id="3J6h25QP8aW" role="2Oq$k0" />
-                              <node concept="1iwH70" id="3J6h25QP8D2" role="2OqNvi">
-                                <ref role="1iwH77" node="1El5OLsAWHX" resolve="contextParameter" />
-                                <node concept="2OqwBi" id="3J6h25QP8S6" role="1iwH7V">
-                                  <node concept="30H73N" id="3J6h25QP8K0" role="2Oq$k0" />
-                                  <node concept="2Xjw5R" id="3J6h25QPaux" role="2OqNvi">
-                                    <node concept="1xMEDy" id="3J6h25QPauz" role="1xVPHs">
-                                      <node concept="chp4Y" id="3J6h25QPayu" role="ri$Ld">
-                                        <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3J6h25QP0N3" role="2OqNvi">
-                    <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="3J6h25QP0PQ" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3J6h25QOMzY" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="6D0CP__pccc">
-    <property role="TrG5h" value="reduce_BLExpression" />
-    <property role="3GE5qa" value="command" />
-    <ref role="3gUMe" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
-    <node concept="2HLcI0" id="6D0CP__pcr9" role="13RCb5">
-      <node concept="raruj" id="6D0CP__pcvP" role="lGtFl" />
-      <node concept="3clFbS" id="6D0CP__pczX" role="3RSQip">
-        <node concept="3clFbF" id="6_TW7xV984N" role="3cqZAp">
-          <node concept="ikQcf" id="6_TW7xVSaEN" role="3clFbG">
-            <node concept="10Nm6u" id="6_TW7xVSaEP" role="2v23J2">
-              <node concept="29HgVG" id="6_TW7xVSaEQ" role="lGtFl">
-                <node concept="3NFfHV" id="6_TW7xVSaER" role="3NFExx">
-                  <node concept="3clFbS" id="6_TW7xVSaES" role="2VODD2">
-                    <node concept="3clFbF" id="6_TW7xVSaET" role="3cqZAp">
-                      <node concept="2OqwBi" id="6_TW7xVSaEU" role="3clFbG">
-                        <node concept="3TrEf2" id="6_TW7xVSaEV" role="2OqNvi">
-                          <ref role="3Tt5mk" to="3xdn:6D0CP__oaD2" />
-                        </node>
-                        <node concept="30H73N" id="6_TW7xVSaEW" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="bUwia" id="6_TW7xV3y9s">
-    <property role="TrG5h" value="synonyms" />
-    <property role="3GE5qa" value="" />
-    <node concept="3aamgX" id="6D0CP__pcce" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:6D0CP__oaBp" resolve="BLExpression" />
-      <node concept="j$656" id="6D0CP__pccf" role="1lVwrX">
-        <ref role="v9R2y" node="6D0CP__pccc" resolve="reduce_BLExpression" />
-      </node>
-    </node>
-    <node concept="3aamgX" id="6_TW7xVhAkv" role="3acgRq">
-      <ref role="30HIoZ" to="3xdn:6_TW7xVaDdR" resolve="PrintExpression" />
-      <node concept="14YyZ8" id="6_TW7xVhAlu" role="1lVwrX">
-        <node concept="14ZrTv" id="2WuZn$znplc" role="14ZwWg">
-          <node concept="30G5F_" id="2WuZn$znpoi" role="150hEN">
-            <node concept="3clFbS" id="2WuZn$znpoj" role="2VODD2">
-              <node concept="3clFbF" id="2WuZn$znxPl" role="3cqZAp">
-                <node concept="3JuTUA" id="2WuZn$znxPm" role="3clFbG">
-                  <node concept="2c44tf" id="2WuZn$znxPn" role="3JuZjQ">
-                    <node concept="3cqZAl" id="2WuZn$znyqm" role="2c44tc" />
-                  </node>
-                  <node concept="2OqwBi" id="3idupetCFPZ" role="3JuY14">
-                    <node concept="2OqwBi" id="2WuZn$znxPs" role="2Oq$k0">
-                      <node concept="30H73N" id="2WuZn$znxPt" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="2WuZn$znxPu" role="2OqNvi">
-                        <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                      </node>
-                    </node>
-                    <node concept="3JvlWi" id="3idupetCHkP" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="2WuZn$znXpc" role="150oIE">
-            <node concept="10Nm6u" id="2WuZn$znXDU" role="gfFT$">
-              <node concept="29HgVG" id="2WuZn$znXE4" role="lGtFl">
-                <node concept="3NFfHV" id="2WuZn$znXE7" role="3NFExx">
-                  <node concept="3clFbS" id="2WuZn$znXE8" role="2VODD2">
-                    <node concept="3clFbF" id="2WuZn$znXEe" role="3cqZAp">
-                      <node concept="2OqwBi" id="2WuZn$znXE9" role="3clFbG">
-                        <node concept="3TrEf2" id="2WuZn$znXEc" role="2OqNvi">
-                          <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                        </node>
-                        <node concept="30H73N" id="2WuZn$znXEd" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="14ZrTv" id="6_TW7xVhAly" role="14ZwWg">
-          <node concept="30G5F_" id="6_TW7xVhAlz" role="150hEN">
-            <node concept="3clFbS" id="6_TW7xVhAl$" role="2VODD2">
-              <node concept="3clFbF" id="6_TW7xVpwZO" role="3cqZAp">
-                <node concept="3JuTUA" id="6_TW7xVpwZI" role="3clFbG">
-                  <node concept="2c44tf" id="6_TW7xVpxIq" role="3JuZjQ">
-                    <node concept="3Tqbb2" id="6_TW7xVpy7e" role="2c44tc" />
-                  </node>
-                  <node concept="2OqwBi" id="3idupetCH_o" role="3JuY14">
-                    <node concept="2OqwBi" id="3idupetCH_p" role="2Oq$k0">
-                      <node concept="30H73N" id="3idupetCH_q" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="3idupetCH_r" role="2OqNvi">
-                        <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                      </node>
-                    </node>
-                    <node concept="3JvlWi" id="3idupetCH_s" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="6_TW7xVhCyl" role="150oIE">
-            <node concept="2OqwBi" id="6_TW7xViBj9" role="gfFT$">
-              <node concept="1bVj0M" id="6_TW7xViBjn" role="2Oq$k0">
-                <node concept="3clFbS" id="6_TW7xViBjp" role="1bW5cS">
-                  <node concept="3clFbJ" id="6_TW7xVu4jZ" role="3cqZAp">
-                    <node concept="3clFbS" id="6_TW7xVu4k2" role="3clFbx">
-                      <node concept="3clFbF" id="6_TW7xVu9rb" role="3cqZAp">
-                        <node concept="2v220a" id="6_TW7xVu9r9" role="3clFbG">
-                          <node concept="37vLTw" id="7OcVEq$q3qu" role="2v23J2">
-                            <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbC" id="6_TW7xVu8D1" role="3clFbw">
-                      <node concept="10Nm6u" id="6_TW7xVu92i" role="3uHU7w" />
-                      <node concept="37vLTw" id="7OcVEq$q3Ky" role="3uHU7B">
-                        <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
-                      </node>
-                    </node>
-                    <node concept="3eNFk2" id="6_TW7xVuaOF" role="3eNLev">
-                      <node concept="3clFbS" id="6_TW7xVuaOH" role="3eOfB_">
-                        <node concept="3clFbF" id="6_TW7xViF1W" role="3cqZAp">
-                          <node concept="1nExRE" id="6_TW7xViF1U" role="3clFbG">
-                            <node concept="37vLTw" id="5kx7ze1rHjR" role="2v23J2">
-                              <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbC" id="6_TW7xVkpJZ" role="3eO9$A">
-                        <node concept="10Nm6u" id="6_TW7xVkpK0" role="3uHU7w" />
-                        <node concept="2OqwBi" id="6_TW7xVkpK1" role="3uHU7B">
-                          <node concept="liA8E" id="5kx7ze1rHbQ" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getModel():org.jetbrains.mps.openapi.model.SModel" resolve="getModel" />
-                          </node>
-                          <node concept="37vLTw" id="7OcVEq$q2YI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="9aQIb" id="6_TW7xVudkU" role="9aQIa">
-                      <node concept="3clFbS" id="6_TW7xVudkV" role="9aQI4">
-                        <node concept="3clFbF" id="6_TW7xViFVf" role="3cqZAp">
-                          <node concept="14Kevp" id="6_TW7xViGcf" role="3clFbG">
-                            <node concept="37vLTw" id="7OcVEq$q19U" role="2v23J2">
-                              <ref role="3cqZAo" node="7OcVEq$pVXg" resolve="n" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTG" id="7OcVEq$pVXg" role="1bW2Oz">
-                  <property role="TrG5h" value="n" />
-                  <node concept="3uibUv" id="5kx7ze1rGwZ" role="1tU5fm">
-                    <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                  </node>
-                </node>
-              </node>
-              <node concept="1Bd96e" id="6_TW7xViCiJ" role="2OqNvi">
-                <node concept="33vP2n" id="7OcVEq$pX32" role="1BdPVh">
-                  <node concept="29HgVG" id="7OcVEq$pX33" role="lGtFl">
-                    <node concept="3NFfHV" id="7OcVEq$pX34" role="3NFExx">
-                      <node concept="3clFbS" id="7OcVEq$pX35" role="2VODD2">
-                        <node concept="3clFbF" id="7OcVEq$pX36" role="3cqZAp">
-                          <node concept="2OqwBi" id="7OcVEq$pX37" role="3clFbG">
-                            <node concept="3TrEf2" id="7OcVEq$pX38" role="2OqNvi">
-                              <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                            </node>
-                            <node concept="30H73N" id="7OcVEq$pX39" role="2Oq$k0" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="14ZrTv" id="6_TW7xVoFxD" role="14ZwWg">
-          <node concept="30G5F_" id="6_TW7xVoFxE" role="150hEN">
-            <node concept="3clFbS" id="6_TW7xVoFxF" role="2VODD2">
-              <node concept="3cpWs8" id="3idupetCIO0" role="3cqZAp">
-                <node concept="3cpWsn" id="3idupetCIO3" role="3cpWs9">
-                  <property role="TrG5h" value="type" />
-                  <node concept="3Tqbb2" id="3idupetCINY" role="1tU5fm" />
-                  <node concept="2OqwBi" id="3idupetCLJO" role="33vP2m">
-                    <node concept="2OqwBi" id="3idupetCLJP" role="2Oq$k0">
-                      <node concept="30H73N" id="3idupetCLJQ" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="3idupetCLJR" role="2OqNvi">
-                        <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                      </node>
-                    </node>
-                    <node concept="3JvlWi" id="3idupetCLJS" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="6_TW7xVoGn3" role="3cqZAp">
-                <node concept="22lmx$" id="6_TW7xVrRRj" role="3clFbG">
-                  <node concept="22lmx$" id="6_TW7xVrJMT" role="3uHU7B">
-                    <node concept="22lmx$" id="6_TW7xVrsOY" role="3uHU7B">
-                      <node concept="3JuTUA" id="6_TW7xVpBsw" role="3uHU7B">
-                        <node concept="2c44tf" id="6_TW7xVpBsx" role="3JuZjQ">
-                          <node concept="A3Dl8" id="6_TW7xVpBZw" role="2c44tc">
-                            <node concept="3Tqbb2" id="6_TW7xVpCh6" role="A3Ik2" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="3idupetCNgq" role="3JuY14">
-                          <ref role="3cqZAo" node="3idupetCIO3" resolve="type" />
-                        </node>
-                      </node>
-                      <node concept="3JuTUA" id="6_TW7xVru51" role="3uHU7w">
-                        <node concept="2c44tf" id="6_TW7xVru52" role="3JuZjQ">
-                          <node concept="A3Dl8" id="6_TW7xVru53" role="2c44tc">
-                            <node concept="2z4iKi" id="6_TW7xVrGVK" role="A3Ik2" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="3idupetCOay" role="3JuY14">
-                          <ref role="3cqZAo" node="3idupetCIO3" resolve="type" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3JuTUA" id="6_TW7xVrL7E" role="3uHU7w">
-                      <node concept="2c44tf" id="6_TW7xVrL7F" role="3JuZjQ">
-                        <node concept="A3Dl8" id="6_TW7xVrL7G" role="2c44tc">
-                          <node concept="H_c77" id="6_TW7xVrPa$" role="A3Ik2" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="3idupetCOYE" role="3JuY14">
-                        <ref role="3cqZAo" node="3idupetCIO3" resolve="type" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3JuTUA" id="6_TW7xVrTgI" role="3uHU7w">
-                    <node concept="2c44tf" id="6_TW7xVrTgJ" role="3JuZjQ">
-                      <node concept="A3Dl8" id="6_TW7xVrTgK" role="2c44tc">
-                        <node concept="3uibUv" id="6_TW7xVrZ3s" role="A3Ik2">
-                          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="3idupetCPGE" role="3JuY14">
-                      <ref role="3cqZAo" node="3idupetCIO3" resolve="type" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="6_TW7xVqOiJ" role="150oIE">
-            <node concept="i14oR" id="6_TW7xVR_CN" role="gfFT$">
-              <node concept="33vP2n" id="6_TW7xVR_CO" role="2v23J2">
-                <node concept="29HgVG" id="6_TW7xVR_Dk" role="lGtFl">
-                  <node concept="3NFfHV" id="6_TW7xVR_Dn" role="3NFExx">
-                    <node concept="3clFbS" id="6_TW7xVR_Do" role="2VODD2">
-                      <node concept="3clFbF" id="6_TW7xVR_Du" role="3cqZAp">
-                        <node concept="2OqwBi" id="6_TW7xVR_Dp" role="3clFbG">
-                          <node concept="3TrEf2" id="6_TW7xVR_Ds" role="2OqNvi">
-                            <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                          </node>
-                          <node concept="30H73N" id="6_TW7xVR_Dt" role="2Oq$k0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="14ZrTv" id="3m3GNuUc7JY" role="14ZwWg">
-          <node concept="30G5F_" id="3m3GNuUc7N4" role="150hEN">
-            <node concept="3clFbS" id="3m3GNuUc7N5" role="2VODD2">
-              <node concept="3cpWs8" id="31Tct3T$b9Z" role="3cqZAp">
-                <node concept="3cpWsn" id="31Tct3T$ba2" role="3cpWs9">
-                  <property role="TrG5h" value="functionType" />
-                  <node concept="3Tqbb2" id="31Tct3T$b9X" role="1tU5fm">
-                    <ref role="ehGHo" to="tp2c:htajhBZ" resolve="FunctionType" />
-                  </node>
-                  <node concept="1UdQGJ" id="31Tct3TzX1P" role="33vP2m">
-                    <node concept="1YaCAy" id="31Tct3TzXzi" role="1Ub_4A">
-                      <property role="TrG5h" value="functionType" />
-                      <ref role="1YaFvo" to="tp2c:htajhBZ" resolve="FunctionType" />
-                    </node>
-                    <node concept="2OqwBi" id="31Tct3TzXhO" role="1Ub_4B">
-                      <node concept="2OqwBi" id="31Tct3TzXhP" role="2Oq$k0">
-                        <node concept="30H73N" id="31Tct3TzXhQ" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="31Tct3TzXhR" role="2OqNvi">
-                          <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                        </node>
-                      </node>
-                      <node concept="3JvlWi" id="31Tct3TzXhS" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="5No3jep9CZN" role="3cqZAp">
-                <node concept="3y3z36" id="5No3jep9Fu$" role="3cqZAk">
-                  <node concept="10Nm6u" id="5No3jep9F_h" role="3uHU7w" />
-                  <node concept="37vLTw" id="5No3jep9Dqr" role="3uHU7B">
-                    <ref role="3cqZAo" node="31Tct3T$ba2" resolve="functionType" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="3m3GNuUdjaY" role="150oIE">
-            <node concept="2v220a" id="5No3jepaFyl" role="gfFT$">
-              <node concept="Xl_RD" id="5No3jepaFHI" role="2v23J2">
-                <node concept="17Uvod" id="5No3jepaFLG" role="lGtFl">
-                  <property role="2qtEX9" value="value" />
-                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                  <node concept="3zFVjK" id="5No3jepaFLH" role="3zH0cK">
-                    <node concept="3clFbS" id="5No3jepaFLI" role="2VODD2">
-                      <node concept="3clFbF" id="5No3jepaFXF" role="3cqZAp">
-                        <node concept="3cpWs3" id="5No3jepaZ2v" role="3clFbG">
-                          <node concept="Xl_RD" id="5No3jepaZgD" role="3uHU7B">
-                            <property role="Xl_RC" value="closure : " />
-                          </node>
-                          <node concept="2OqwBi" id="5No3jepaHA7" role="3uHU7w">
-                            <node concept="2OqwBi" id="5No3jepaGXE" role="2Oq$k0">
-                              <node concept="2OqwBi" id="5No3jepaG2Z" role="2Oq$k0">
-                                <node concept="30H73N" id="5No3jepaFXE" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="5No3jepaGCH" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                                </node>
-                              </node>
-                              <node concept="3JvlWi" id="5No3jepaHoe" role="2OqNvi" />
-                            </node>
-                            <node concept="2qgKlT" id="5No3jepaHYp" role="2OqNvi">
-                              <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="6_TW7xVhDdj" role="14YRTM">
-          <node concept="2v220a" id="6_TW7xVhDdk" role="gfFT$">
-            <node concept="33vP2n" id="6_TW7xVhDdl" role="2v23J2">
-              <node concept="29HgVG" id="6_TW7xVhDdm" role="lGtFl">
-                <node concept="3NFfHV" id="6_TW7xVhDdn" role="3NFExx">
-                  <node concept="3clFbS" id="6_TW7xVhDdo" role="2VODD2">
-                    <node concept="3clFbF" id="6_TW7xVhDdp" role="3cqZAp">
-                      <node concept="2OqwBi" id="6_TW7xVhDdq" role="3clFbG">
-                        <node concept="3TrEf2" id="6_TW7xVhDdr" role="2OqNvi">
-                          <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                        </node>
-                        <node concept="30H73N" id="6_TW7xVhDds" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="3idupetBr1u" role="30HLyM">
-        <node concept="3clFbS" id="3idupetBr1v" role="2VODD2">
-          <node concept="3clFbF" id="3idupetBtw8" role="3cqZAp">
-            <node concept="2OqwBi" id="3idupetBCSi" role="3clFbG">
-              <node concept="2OqwBi" id="3idupetBtB0" role="2Oq$k0">
-                <node concept="30H73N" id="3idupetBtw7" role="2Oq$k0" />
-                <node concept="2Rf3mk" id="3idupetBy5P" role="2OqNvi">
-                  <node concept="1xMEDy" id="3idupetBy5R" role="1xVPHs">
-                    <node concept="chp4Y" id="3idupetByjq" role="ri$Ld">
-                      <ref role="cht4Q" to="3xdn:6_TW7xVaDdR" resolve="PrintExpression" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1v1jN8" id="3idupetBSWG" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="13MO4I" id="6_TW7xVvrFo">
-    <property role="TrG5h" value="reduce_PrintSequenceExpression" />
-    <property role="3GE5qa" value="expression.print" />
-    <ref role="3gUMe" to="3xdn:6_TW7xVvrpf" resolve="PrintSequenceExpression" />
-    <node concept="312cEu" id="6_TW7xVvrTf" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="6_TW7xVvrTg" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="37vLTG" id="6_TW7xVvrTh" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="6_TW7xVvrTi" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="6_TW7xVvrTj" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="6_TW7xVvrTk" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="6_TW7xVvrTl" role="3clF45" />
-        <node concept="3Tm1VV" id="6_TW7xVvrTm" role="1B3o_S" />
-        <node concept="3clFbS" id="6_TW7xVvrTn" role="3clF47">
-          <node concept="3clFbF" id="7OcVEq$sSvS" role="3cqZAp">
-            <node concept="2OqwBi" id="7OcVEq$tEZB" role="3clFbG">
-              <node concept="1bVj0M" id="7OcVEq$sSvO" role="2Oq$k0">
-                <node concept="3clFbS" id="7OcVEq$sSvQ" role="1bW5cS">
-                  <node concept="3clFbF" id="7OcVEq$sUGP" role="3cqZAp">
-                    <node concept="2YIFZM" id="7OcVEq$sUGQ" role="3clFbG">
-                      <ref role="37wK5l" to="8w31:7OcVEq$r3o_" resolve="printSequence" />
-                      <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                      <node concept="37vLTw" id="7OcVEq$sUGR" role="37wK5m">
-                        <ref role="3cqZAo" node="6_TW7xVvrTj" resolve="console" />
-                        <node concept="1ZhdrF" id="7OcVEq$uDWu" role="lGtFl">
-                          <property role="2qtEX8" value="variableDeclaration" />
-                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                          <node concept="3$xsQk" id="7OcVEq$uDWv" role="3$ytzL">
-                            <node concept="3clFbS" id="7OcVEq$uDWw" role="2VODD2">
-                              <node concept="3clFbF" id="7OcVEq$uFDE" role="3cqZAp">
-                                <node concept="2OqwBi" id="7OcVEq$uHdA" role="3clFbG">
-                                  <node concept="1iwH7S" id="7OcVEq$uFDD" role="2Oq$k0" />
-                                  <node concept="1iwH70" id="7OcVEq$uJ4c" role="2OqNvi">
-                                    <ref role="1iwH77" node="6Wun9yOAct3" resolve="consoleParameter" />
-                                    <node concept="2OqwBi" id="7OcVEq$uN83" role="1iwH7V">
-                                      <node concept="30H73N" id="7OcVEq$uMxA" role="2Oq$k0" />
-                                      <node concept="2Xjw5R" id="7OcVEq$uPYL" role="2OqNvi">
-                                        <node concept="1xMEDy" id="7OcVEq$uPYN" role="1xVPHs">
-                                          <node concept="chp4Y" id="7OcVEq$uVZB" role="ri$Ld">
-                                            <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="7OcVEq$uS2Y" role="37wK5m">
-                        <node concept="37vLTw" id="7OcVEq$sUGS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6_TW7xVvrTh" resolve="context" />
-                          <node concept="1ZhdrF" id="7OcVEq$uXJm" role="lGtFl">
-                            <property role="2qtEX8" value="variableDeclaration" />
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                            <node concept="3$xsQk" id="7OcVEq$uXJn" role="3$ytzL">
-                              <node concept="3clFbS" id="7OcVEq$uXJo" role="2VODD2">
-                                <node concept="3clFbF" id="7OcVEq$v32h" role="3cqZAp">
-                                  <node concept="2OqwBi" id="7OcVEq$v4PZ" role="3clFbG">
-                                    <node concept="1iwH7S" id="7OcVEq$v32g" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="7OcVEq$v6JD" role="2OqNvi">
-                                      <ref role="1iwH77" node="1El5OLsAWHX" resolve="contextParameter" />
-                                      <node concept="2OqwBi" id="7OcVEq$vaUK" role="1iwH7V">
-                                        <node concept="30H73N" id="7OcVEq$vajf" role="2Oq$k0" />
-                                        <node concept="2Xjw5R" id="7OcVEq$vdOy" role="2OqNvi">
-                                          <node concept="1xMEDy" id="7OcVEq$vdO$" role="1xVPHs">
-                                            <node concept="chp4Y" id="7OcVEq$vfAZ" role="ri$Ld">
-                                              <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="7OcVEq$uUgl" role="2OqNvi">
-                          <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
-                        </node>
-                      </node>
-                      <node concept="2YIFZM" id="1oFmEVz8vnb" role="37wK5m">
-                        <ref role="37wK5l" to="8w31:YwfKjlXcuc" resolve="nodesToResults" />
-                        <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                        <node concept="37vLTw" id="1oFmEVz8vnc" role="37wK5m">
-                          <ref role="3cqZAo" node="7OcVEq$t2mT" resolve="seq" />
-                        </node>
-                        <node concept="2OqwBi" id="1oFmEVz8vnd" role="37wK5m">
-                          <node concept="2OqwBi" id="1oFmEVz8vne" role="2Oq$k0">
-                            <node concept="37vLTw" id="1oFmEVz8vnf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6_TW7xVvrTh" resolve="context" />
-                              <node concept="1ZhdrF" id="1oFmEVz8vng" role="lGtFl">
-                                <property role="2qtEX8" value="variableDeclaration" />
-                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                                <node concept="3$xsQk" id="1oFmEVz8vnh" role="3$ytzL">
-                                  <node concept="3clFbS" id="1oFmEVz8vni" role="2VODD2">
-                                    <node concept="3clFbF" id="1oFmEVz8vnj" role="3cqZAp">
-                                      <node concept="2OqwBi" id="1oFmEVz8vnk" role="3clFbG">
-                                        <node concept="1iwH7S" id="1oFmEVz8vnl" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="1oFmEVz8vnm" role="2OqNvi">
-                                          <ref role="1iwH77" node="1El5OLsAWHX" resolve="contextParameter" />
-                                          <node concept="2OqwBi" id="1oFmEVz8vnn" role="1iwH7V">
-                                            <node concept="30H73N" id="1oFmEVz8vno" role="2Oq$k0" />
-                                            <node concept="2Xjw5R" id="1oFmEVz8vnp" role="2OqNvi">
-                                              <node concept="1xMEDy" id="1oFmEVz8vnq" role="1xVPHs">
-                                                <node concept="chp4Y" id="1oFmEVz8vnr" role="ri$Ld">
-                                                  <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="1oFmEVz8vns" role="2OqNvi">
-                              <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="1oFmEVz8vnt" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                          </node>
-                        </node>
-                        <node concept="1ZhdrF" id="1oFmEVz8vnu" role="lGtFl">
-                          <property role="2qtEX8" value="baseMethodDeclaration" />
-                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                          <node concept="3$xsQk" id="1oFmEVz8vnv" role="3$ytzL">
-                            <node concept="3clFbS" id="1oFmEVz8vnw" role="2VODD2">
-                              <node concept="3cpWs8" id="1oFmEVz8vnx" role="3cqZAp">
-                                <node concept="3cpWsn" id="1oFmEVz8vny" role="3cpWs9">
-                                  <property role="TrG5h" value="type" />
-                                  <node concept="3Tqbb2" id="1oFmEVz8vnz" role="1tU5fm" />
-                                  <node concept="2OqwBi" id="1oFmEVz8vn$" role="33vP2m">
-                                    <node concept="2OqwBi" id="1oFmEVz8vn_" role="2Oq$k0">
-                                      <node concept="30H73N" id="1oFmEVz8vnA" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="1oFmEVz8vnB" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                                      </node>
-                                    </node>
-                                    <node concept="3JvlWi" id="1oFmEVz8vnC" role="2OqNvi" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="1oFmEVz8vnD" role="3cqZAp">
-                                <node concept="3clFbS" id="1oFmEVz8vnE" role="3clFbx">
-                                  <node concept="3cpWs6" id="1oFmEVz8vnF" role="3cqZAp">
-                                    <node concept="3fl2lp" id="1oFmEVz8vnG" role="3cqZAk">
-                                      <ref role="3fl3PK" to="8w31:YwfKjlXcuc" resolve="nodesToResults" />
-                                      <node concept="3B5_sB" id="1oFmEVz8vnH" role="3fl3PI">
-                                        <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3JuTUA" id="1oFmEVz8vnI" role="3clFbw">
-                                  <node concept="37vLTw" id="1oFmEVz8vnJ" role="3JuY14">
-                                    <ref role="3cqZAo" node="1oFmEVz8vny" resolve="type" />
-                                  </node>
-                                  <node concept="2c44tf" id="1oFmEVz8vnK" role="3JuZjQ">
-                                    <node concept="A3Dl8" id="1oFmEVz8vnL" role="2c44tc">
-                                      <node concept="3Tqbb2" id="1oFmEVz8vnM" role="A3Ik2" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="1oFmEVz8vnN" role="3cqZAp">
-                                <node concept="3clFbS" id="1oFmEVz8vnO" role="3clFbx">
-                                  <node concept="3cpWs6" id="1oFmEVz8vnP" role="3cqZAp">
-                                    <node concept="3fl2lp" id="1oFmEVz8vnQ" role="3cqZAk">
-                                      <ref role="3fl3PK" to="8w31:YwfKjlXcuc" resolve="nodesToResults" />
-                                      <node concept="3B5_sB" id="1oFmEVz8vnR" role="3fl3PI">
-                                        <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3JuTUA" id="1oFmEVz8vnS" role="3clFbw">
-                                  <node concept="37vLTw" id="1oFmEVz8vnT" role="3JuY14">
-                                    <ref role="3cqZAo" node="1oFmEVz8vny" resolve="type" />
-                                  </node>
-                                  <node concept="2c44tf" id="1oFmEVz8vnU" role="3JuZjQ">
-                                    <node concept="A3Dl8" id="1oFmEVz8vnV" role="2c44tc">
-                                      <node concept="2z4iKi" id="1oFmEVz8vnW" role="A3Ik2" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="1oFmEVz8vnX" role="3cqZAp">
-                                <node concept="3clFbS" id="1oFmEVz8vnY" role="3clFbx">
-                                  <node concept="3cpWs6" id="1oFmEVz8vnZ" role="3cqZAp">
-                                    <node concept="3fl2lp" id="1oFmEVz8vo0" role="3cqZAk">
-                                      <ref role="3fl3PK" to="8w31:YwfKjlXcx9" resolve="modelsToResults" />
-                                      <node concept="3B5_sB" id="1oFmEVz8vo1" role="3fl3PI">
-                                        <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3JuTUA" id="1oFmEVz8vo2" role="3clFbw">
-                                  <node concept="37vLTw" id="1oFmEVz8vo3" role="3JuY14">
-                                    <ref role="3cqZAo" node="1oFmEVz8vny" resolve="type" />
-                                  </node>
-                                  <node concept="2c44tf" id="1oFmEVz8vo4" role="3JuZjQ">
-                                    <node concept="A3Dl8" id="1oFmEVz8vo5" role="2c44tc">
-                                      <node concept="H_c77" id="1oFmEVz8vo6" role="A3Ik2" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="1oFmEVz8vo7" role="3cqZAp">
-                                <node concept="3clFbS" id="1oFmEVz8vo8" role="3clFbx">
-                                  <node concept="3cpWs6" id="1oFmEVz8vo9" role="3cqZAp">
-                                    <node concept="3fl2lp" id="1oFmEVz8voa" role="3cqZAk">
-                                      <ref role="3fl3PK" to="8w31:YwfKjlXcyY" resolve="modulesToResults" />
-                                      <node concept="3B5_sB" id="1oFmEVz8vob" role="3fl3PI">
-                                        <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3JuTUA" id="1oFmEVz8voc" role="3clFbw">
-                                  <node concept="37vLTw" id="1oFmEVz8vod" role="3JuY14">
-                                    <ref role="3cqZAo" node="1oFmEVz8vny" resolve="type" />
-                                  </node>
-                                  <node concept="2c44tf" id="1oFmEVz8voe" role="3JuZjQ">
-                                    <node concept="A3Dl8" id="1oFmEVz8vof" role="2c44tc">
-                                      <node concept="3uibUv" id="1oFmEVz8vog" role="A3Ik2">
-                                        <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3cpWs6" id="1oFmEVz8voh" role="3cqZAp">
-                                <node concept="10Nm6u" id="1oFmEVz8voi" role="3cqZAk" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="7OcVEq$ttxM" role="37wK5m">
-                        <node concept="2YIFZM" id="7OcVEq$tm6X" role="2Oq$k0">
-                          <ref role="37wK5l" to="urs3:5Ffu4tBUwUU" resolve="fromIterable" />
-                          <ref role="1Pybhc" to="urs3:5Ffu4tBUwT$" resolve="Sequence" />
-                          <node concept="37vLTw" id="7OcVEq$tplq" role="37wK5m">
-                            <ref role="3cqZAo" node="7OcVEq$t2mT" resolve="seq" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="7OcVEq$t_m9" role="2OqNvi">
-                          <ref role="37wK5l" to="urs3:5Ffu4tBUx9j" resolve="count" />
-                        </node>
-                      </node>
-                      <node concept="Xl_RD" id="7OcVEq$tDmR" role="37wK5m">
-                        <property role="Xl_RC" value="" />
-                        <node concept="17Uvod" id="7OcVEq$tDmS" role="lGtFl">
-                          <property role="2qtEX9" value="value" />
-                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                          <node concept="3zFVjK" id="7OcVEq$tDmT" role="3zH0cK">
-                            <node concept="3clFbS" id="7OcVEq$tDmU" role="2VODD2">
-                              <node concept="3cpWs8" id="7OcVEq$tDmV" role="3cqZAp">
-                                <node concept="3cpWsn" id="7OcVEq$tDmW" role="3cpWs9">
-                                  <property role="TrG5h" value="type" />
-                                  <node concept="3Tqbb2" id="7OcVEq$tDmX" role="1tU5fm" />
-                                  <node concept="2OqwBi" id="7OcVEq$tDmY" role="33vP2m">
-                                    <node concept="2OqwBi" id="7OcVEq$tDmZ" role="2Oq$k0">
-                                      <node concept="30H73N" id="7OcVEq$tDn0" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="7OcVEq$tDn1" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                                      </node>
-                                    </node>
-                                    <node concept="3JvlWi" id="7OcVEq$tDn2" role="2OqNvi" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="7OcVEq$tDn3" role="3cqZAp">
-                                <node concept="3clFbS" id="7OcVEq$tDn4" role="3clFbx">
-                                  <node concept="3cpWs6" id="7OcVEq$tDn5" role="3cqZAp">
-                                    <node concept="Xl_RD" id="7OcVEq$tDn6" role="3cqZAk">
-                                      <property role="Xl_RC" value="nodes" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3JuTUA" id="7OcVEq$tDn7" role="3clFbw">
-                                  <node concept="37vLTw" id="7OcVEq$tDn8" role="3JuY14">
-                                    <ref role="3cqZAo" node="7OcVEq$tDmW" resolve="type" />
-                                  </node>
-                                  <node concept="2c44tf" id="7OcVEq$tDn9" role="3JuZjQ">
-                                    <node concept="A3Dl8" id="7OcVEq$tDna" role="2c44tc">
-                                      <node concept="3Tqbb2" id="7OcVEq$tDnb" role="A3Ik2" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="7OcVEq$tDnc" role="3cqZAp">
-                                <node concept="3clFbS" id="7OcVEq$tDnd" role="3clFbx">
-                                  <node concept="3cpWs6" id="7OcVEq$tDne" role="3cqZAp">
-                                    <node concept="Xl_RD" id="7OcVEq$tDnf" role="3cqZAk">
-                                      <property role="Xl_RC" value="references" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3JuTUA" id="7OcVEq$tDng" role="3clFbw">
-                                  <node concept="37vLTw" id="7OcVEq$tDnh" role="3JuY14">
-                                    <ref role="3cqZAo" node="7OcVEq$tDmW" resolve="type" />
-                                  </node>
-                                  <node concept="2c44tf" id="7OcVEq$tDni" role="3JuZjQ">
-                                    <node concept="A3Dl8" id="7OcVEq$tDnj" role="2c44tc">
-                                      <node concept="2z4iKi" id="7OcVEq$tDnk" role="A3Ik2" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="7OcVEq$tDnl" role="3cqZAp">
-                                <node concept="3clFbS" id="7OcVEq$tDnm" role="3clFbx">
-                                  <node concept="3cpWs6" id="7OcVEq$tDnn" role="3cqZAp">
-                                    <node concept="Xl_RD" id="7OcVEq$tDno" role="3cqZAk">
-                                      <property role="Xl_RC" value="models" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3JuTUA" id="7OcVEq$tDnp" role="3clFbw">
-                                  <node concept="37vLTw" id="7OcVEq$tDnq" role="3JuY14">
-                                    <ref role="3cqZAo" node="7OcVEq$tDmW" resolve="type" />
-                                  </node>
-                                  <node concept="2c44tf" id="7OcVEq$tDnr" role="3JuZjQ">
-                                    <node concept="A3Dl8" id="7OcVEq$tDns" role="2c44tc">
-                                      <node concept="H_c77" id="7OcVEq$tDnt" role="A3Ik2" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbJ" id="7OcVEq$tDnu" role="3cqZAp">
-                                <node concept="3clFbS" id="7OcVEq$tDnv" role="3clFbx">
-                                  <node concept="3cpWs6" id="7OcVEq$tDnw" role="3cqZAp">
-                                    <node concept="Xl_RD" id="7OcVEq$tDnx" role="3cqZAk">
-                                      <property role="Xl_RC" value="modules" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3JuTUA" id="7OcVEq$tDny" role="3clFbw">
-                                  <node concept="37vLTw" id="7OcVEq$tDnz" role="3JuY14">
-                                    <ref role="3cqZAo" node="7OcVEq$tDmW" resolve="type" />
-                                  </node>
-                                  <node concept="2c44tf" id="7OcVEq$tDn$" role="3JuZjQ">
-                                    <node concept="A3Dl8" id="7OcVEq$tDn_" role="2c44tc">
-                                      <node concept="3uibUv" id="7OcVEq$tDnA" role="A3Ik2">
-                                        <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3cpWs6" id="7OcVEq$tDnB" role="3cqZAp">
-                                <node concept="10Nm6u" id="7OcVEq$tDnC" role="3cqZAk" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTG" id="7OcVEq$t2mT" role="1bW2Oz">
-                  <property role="TrG5h" value="seq" />
-                  <node concept="_YKpA" id="32notsQjgHX" role="1tU5fm">
-                    <node concept="3uibUv" id="32notsQnCO$" role="_ZDj9">
-                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                      <node concept="29HgVG" id="32notsQnDU0" role="lGtFl">
-                        <node concept="3NFfHV" id="32notsQnDU1" role="3NFExx">
-                          <node concept="3clFbS" id="32notsQnDU2" role="2VODD2">
-                            <node concept="3cpWs8" id="32notsQjlp1" role="3cqZAp">
-                              <node concept="3cpWsn" id="32notsQjlp2" role="3cpWs9">
-                                <property role="TrG5h" value="type" />
-                                <node concept="3Tqbb2" id="32notsQjlp3" role="1tU5fm" />
-                                <node concept="2OqwBi" id="32notsQjlp4" role="33vP2m">
-                                  <node concept="2OqwBi" id="32notsQjlp5" role="2Oq$k0">
-                                    <node concept="30H73N" id="32notsQjlp6" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="32notsQjlp7" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                                    </node>
-                                  </node>
-                                  <node concept="3JvlWi" id="32notsQjlp8" role="2OqNvi" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbJ" id="32notsQjlp9" role="3cqZAp">
-                              <node concept="3clFbS" id="32notsQjlpa" role="3clFbx">
-                                <node concept="3cpWs6" id="32notsQjlpb" role="3cqZAp">
-                                  <node concept="2c44tf" id="32notsQjGgL" role="3cqZAk">
-                                    <node concept="3uibUv" id="32notsQkY$J" role="2c44tc">
-                                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3JuTUA" id="32notsQjlpe" role="3clFbw">
-                                <node concept="37vLTw" id="32notsQjlpf" role="3JuY14">
-                                  <ref role="3cqZAo" node="32notsQjlp2" resolve="type" />
-                                </node>
-                                <node concept="2c44tf" id="32notsQjlpg" role="3JuZjQ">
-                                  <node concept="A3Dl8" id="32notsQjlph" role="2c44tc">
-                                    <node concept="3Tqbb2" id="32notsQjlpi" role="A3Ik2" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbJ" id="32notsQjlpj" role="3cqZAp">
-                              <node concept="3clFbS" id="32notsQjlpk" role="3clFbx">
-                                <node concept="3cpWs6" id="32notsQjlpl" role="3cqZAp">
-                                  <node concept="2c44tf" id="32notsQkr6k" role="3cqZAk">
-                                    <node concept="3uibUv" id="32notsQwUhS" role="2c44tc">
-                                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3JuTUA" id="32notsQjlpo" role="3clFbw">
-                                <node concept="37vLTw" id="32notsQjlpp" role="3JuY14">
-                                  <ref role="3cqZAo" node="32notsQjlp2" resolve="type" />
-                                </node>
-                                <node concept="2c44tf" id="32notsQjlpq" role="3JuZjQ">
-                                  <node concept="A3Dl8" id="32notsQjlpr" role="2c44tc">
-                                    <node concept="2z4iKi" id="32notsQjlps" role="A3Ik2" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbJ" id="32notsQjlpt" role="3cqZAp">
-                              <node concept="3clFbS" id="32notsQjlpu" role="3clFbx">
-                                <node concept="3cpWs6" id="32notsQjlpv" role="3cqZAp">
-                                  <node concept="2c44tf" id="32notsQkB4K" role="3cqZAk">
-                                    <node concept="3uibUv" id="32notsQllBl" role="2c44tc">
-                                      <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3JuTUA" id="32notsQjlpy" role="3clFbw">
-                                <node concept="37vLTw" id="32notsQjlpz" role="3JuY14">
-                                  <ref role="3cqZAo" node="32notsQjlp2" resolve="type" />
-                                </node>
-                                <node concept="2c44tf" id="32notsQjlp$" role="3JuZjQ">
-                                  <node concept="A3Dl8" id="32notsQjlp_" role="2c44tc">
-                                    <node concept="H_c77" id="32notsQjlpA" role="A3Ik2" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbJ" id="32notsQjlpB" role="3cqZAp">
-                              <node concept="3clFbS" id="32notsQjlpC" role="3clFbx">
-                                <node concept="3cpWs6" id="32notsQjlpD" role="3cqZAp">
-                                  <node concept="2c44tf" id="32notsQkN3o" role="3cqZAk">
-                                    <node concept="3uibUv" id="32notsQlx8C" role="2c44tc">
-                                      <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3JuTUA" id="32notsQjlpG" role="3clFbw">
-                                <node concept="37vLTw" id="32notsQjlpH" role="3JuY14">
-                                  <ref role="3cqZAo" node="32notsQjlp2" resolve="type" />
-                                </node>
-                                <node concept="2c44tf" id="32notsQjlpI" role="3JuZjQ">
-                                  <node concept="A3Dl8" id="32notsQjlpJ" role="2c44tc">
-                                    <node concept="3uibUv" id="32notsQjlpK" role="A3Ik2">
-                                      <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3cpWs6" id="32notsQjlpL" role="3cqZAp">
-                              <node concept="10Nm6u" id="32notsQjlpM" role="3cqZAk" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1Bd96e" id="7OcVEq$tODe" role="2OqNvi">
-                <node concept="2OqwBi" id="32notsQnRkA" role="1BdPVh">
-                  <node concept="2OqwBi" id="32notsQjdfx" role="2Oq$k0">
-                    <node concept="2Jgcaq" id="7OcVEq$tQ5_" role="2Oq$k0">
-                      <node concept="1dO9Bo" id="7OcVEq$tQ5A" role="1dOa5D" />
-                      <node concept="29HgVG" id="7OcVEq$tQ5B" role="lGtFl">
-                        <node concept="3NFfHV" id="7OcVEq$tQ5C" role="3NFExx">
-                          <node concept="3clFbS" id="7OcVEq$tQ5D" role="2VODD2">
-                            <node concept="3clFbF" id="7OcVEq$tQ5E" role="3cqZAp">
-                              <node concept="2OqwBi" id="7OcVEq$tQ5F" role="3clFbG">
-                                <node concept="30H73N" id="7OcVEq$tQ5G" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="7OcVEq$tQ5H" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3$u5V9" id="32notsQlHlI" role="2OqNvi">
-                      <node concept="1bVj0M" id="32notsQlHlK" role="23t8la">
-                        <node concept="3clFbS" id="32notsQlHlL" role="1bW5cS">
-                          <node concept="3clFbF" id="32notsQlST9" role="3cqZAp">
-                            <node concept="2YIFZM" id="32notsQtx6f" role="3clFbG">
-                              <ref role="37wK5l" to="8w31:32notsQsTE3" resolve="getNodeReference" />
-                              <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                              <node concept="37vLTw" id="32notsQtGcV" role="37wK5m">
-                                <ref role="3cqZAo" node="32notsQlHlM" resolve="it" />
-                              </node>
-                              <node concept="1ZhdrF" id="32notsQtRjh" role="lGtFl">
-                                <property role="2qtEX8" value="baseMethodDeclaration" />
-                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                <node concept="3$xsQk" id="32notsQtRji" role="3$ytzL">
-                                  <node concept="3clFbS" id="32notsQtRjj" role="2VODD2">
-                                    <node concept="3cpWs8" id="32notsQu2uA" role="3cqZAp">
-                                      <node concept="3cpWsn" id="32notsQu2uB" role="3cpWs9">
-                                        <property role="TrG5h" value="type" />
-                                        <node concept="3Tqbb2" id="32notsQu2uC" role="1tU5fm" />
-                                        <node concept="2OqwBi" id="32notsQu2uD" role="33vP2m">
-                                          <node concept="2OqwBi" id="32notsQu2uE" role="2Oq$k0">
-                                            <node concept="30H73N" id="32notsQu2uF" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="32notsQu2uG" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="3xdn:7gnNafF7Ztx" />
-                                            </node>
-                                          </node>
-                                          <node concept="3JvlWi" id="32notsQu2uH" role="2OqNvi" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbJ" id="32notsQu2uI" role="3cqZAp">
-                                      <node concept="3clFbS" id="32notsQu2uJ" role="3clFbx">
-                                        <node concept="3cpWs6" id="32notsQu2uK" role="3cqZAp">
-                                          <node concept="3fl2lp" id="32notsQu2uL" role="3cqZAk">
-                                            <ref role="3fl3PK" to="8w31:32notsQsTE3" resolve="getNodeReference" />
-                                            <node concept="3B5_sB" id="32notsQu2uM" role="3fl3PI">
-                                              <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3JuTUA" id="32notsQu2uN" role="3clFbw">
-                                        <node concept="37vLTw" id="32notsQu2uO" role="3JuY14">
-                                          <ref role="3cqZAo" node="32notsQu2uB" resolve="type" />
-                                        </node>
-                                        <node concept="2c44tf" id="32notsQu2uP" role="3JuZjQ">
-                                          <node concept="A3Dl8" id="32notsQu2uQ" role="2c44tc">
-                                            <node concept="3Tqbb2" id="32notsQu2uR" role="A3Ik2" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbJ" id="32notsQu2uS" role="3cqZAp">
-                                      <node concept="3clFbS" id="32notsQu2uT" role="3clFbx">
-                                        <node concept="3cpWs6" id="32notsQu2uU" role="3cqZAp">
-                                          <node concept="3fl2lp" id="32notsQu2uV" role="3cqZAk">
-                                            <ref role="3fl3PK" to="8w31:32notsQsUA1" resolve="getReferenceReference" />
-                                            <node concept="3B5_sB" id="32notsQu2uW" role="3fl3PI">
-                                              <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3JuTUA" id="32notsQu2uX" role="3clFbw">
-                                        <node concept="37vLTw" id="32notsQu2uY" role="3JuY14">
-                                          <ref role="3cqZAo" node="32notsQu2uB" resolve="type" />
-                                        </node>
-                                        <node concept="2c44tf" id="32notsQu2uZ" role="3JuZjQ">
-                                          <node concept="A3Dl8" id="32notsQu2v0" role="2c44tc">
-                                            <node concept="2z4iKi" id="32notsQu2v1" role="A3Ik2" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbJ" id="32notsQu2v2" role="3cqZAp">
-                                      <node concept="3clFbS" id="32notsQu2v3" role="3clFbx">
-                                        <node concept="3cpWs6" id="32notsQu2v4" role="3cqZAp">
-                                          <node concept="3fl2lp" id="32notsQu2v5" role="3cqZAk">
-                                            <ref role="3fl3PK" to="8w31:32notsQsVkE" resolve="getModelReference" />
-                                            <node concept="3B5_sB" id="32notsQu2v6" role="3fl3PI">
-                                              <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3JuTUA" id="32notsQu2v7" role="3clFbw">
-                                        <node concept="37vLTw" id="32notsQu2v8" role="3JuY14">
-                                          <ref role="3cqZAo" node="32notsQu2uB" resolve="type" />
-                                        </node>
-                                        <node concept="2c44tf" id="32notsQu2v9" role="3JuZjQ">
-                                          <node concept="A3Dl8" id="32notsQu2va" role="2c44tc">
-                                            <node concept="H_c77" id="32notsQu2vb" role="A3Ik2" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbJ" id="32notsQu2vc" role="3cqZAp">
-                                      <node concept="3clFbS" id="32notsQu2vd" role="3clFbx">
-                                        <node concept="3cpWs6" id="32notsQu2ve" role="3cqZAp">
-                                          <node concept="3fl2lp" id="32notsQu2vf" role="3cqZAk">
-                                            <ref role="3fl3PK" to="8w31:32notsQsW4c" resolve="getModuleReference" />
-                                            <node concept="3B5_sB" id="32notsQu2vg" role="3fl3PI">
-                                              <ref role="3B5MYn" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3JuTUA" id="32notsQu2vh" role="3clFbw">
-                                        <node concept="37vLTw" id="32notsQu2vi" role="3JuY14">
-                                          <ref role="3cqZAo" node="32notsQu2uB" resolve="type" />
-                                        </node>
-                                        <node concept="2c44tf" id="32notsQu2vj" role="3JuZjQ">
-                                          <node concept="A3Dl8" id="32notsQu2vk" role="2c44tc">
-                                            <node concept="3uibUv" id="32notsQu2vl" role="A3Ik2">
-                                              <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3cpWs6" id="32notsQu2vm" role="3cqZAp">
-                                      <node concept="10Nm6u" id="32notsQu2vn" role="3cqZAk" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="32notsQlHlM" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="32notsQlHlN" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="ANE8D" id="32notsQo2yM" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="raruj" id="7OcVEq$tRMm" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6_TW7xVvrTQ" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="31Tct3TvJ$l">
-    <property role="TrG5h" value="reduce_ModelScopeLiteral" />
-    <property role="3GE5qa" value="expression.parameter" />
-    <ref role="3gUMe" to="3xdn:31Tct3Tk$xe" resolve="ModelScope" />
-    <node concept="312cEu" id="31Tct3TvJKU" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="31Tct3TvJKV" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="31Tct3TvJKW" role="3clF45" />
-        <node concept="37vLTG" id="31Tct3TvJKX" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="31Tct3TvJKY" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="31Tct3TvJKZ" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="31Tct3TvJL0" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="31Tct3TvJL1" role="1B3o_S" />
-        <node concept="3clFbS" id="31Tct3TvJL2" role="3clF47">
-          <node concept="3clFbF" id="31Tct3TvJL3" role="3cqZAp">
-            <node concept="2ShNRf" id="31Tct3TvJL4" role="3clFbG">
-              <node concept="1pGfFk" id="31Tct3TvJL5" role="2ShVmc">
-                <ref role="37wK5l" to="mte5:~ModelsScope.&lt;init&gt;(java.lang.Iterable)" resolve="ModelsScope" />
-                <node concept="2ShNRf" id="31Tct3TvJL6" role="37wK5m">
-                  <node concept="Tc6Ow" id="5kx7ze1soco" role="2ShVmc">
-                    <node concept="3uibUv" id="5kx7ze1sE$1" role="HW$YZ">
-                      <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-                    </node>
-                    <node concept="10Nm6u" id="5kx7ze1socq" role="HW$Y0">
-                      <node concept="2b32R4" id="5kx7ze1socr" role="lGtFl">
-                        <node concept="3JmXsc" id="5kx7ze1socs" role="2P8S$">
-                          <node concept="3clFbS" id="5kx7ze1soct" role="2VODD2">
-                            <node concept="3clFbF" id="5kx7ze1socu" role="3cqZAp">
-                              <node concept="2OqwBi" id="5kx7ze1socv" role="3clFbG">
-                                <node concept="3Tsc0h" id="5kx7ze1socw" role="2OqNvi">
-                                  <ref role="3TtcxE" to="3xdn:31Tct3Tk$xf" />
-                                </node>
-                                <node concept="30H73N" id="5kx7ze1socx" role="2Oq$k0" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="31Tct3TvJLi" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="31Tct3TvJLj" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="31Tct3Tzi3L">
-    <property role="TrG5h" value="reduce_CustomScope" />
-    <property role="3GE5qa" value="expression.parameter" />
-    <ref role="3gUMe" to="3xdn:31Tct3Txnn9" resolve="CustomScope" />
-    <node concept="312cEu" id="31Tct3TziB0" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="31Tct3TziB1" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="31Tct3TziB2" role="3clF45" />
-        <node concept="37vLTG" id="31Tct3TziB3" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="31Tct3TziB4" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="31Tct3TziB5" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="31Tct3TziB6" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="31Tct3TziB7" role="1B3o_S" />
-        <node concept="3clFbS" id="31Tct3TziB8" role="3clF47">
-          <node concept="3clFbF" id="31Tct3Tzjm1" role="3cqZAp">
-            <node concept="10Nm6u" id="31Tct3Tzjm0" role="3clFbG">
-              <node concept="raruj" id="31Tct3Tzjmc" role="lGtFl" />
-              <node concept="29HgVG" id="31Tct3Tzjme" role="lGtFl">
-                <node concept="3NFfHV" id="31Tct3Tzjmh" role="3NFExx">
-                  <node concept="3clFbS" id="31Tct3Tzjmi" role="2VODD2">
-                    <node concept="3clFbF" id="31Tct3Tzjmo" role="3cqZAp">
-                      <node concept="2OqwBi" id="31Tct3Tzjmj" role="3clFbG">
-                        <node concept="3TrEf2" id="31Tct3Tzjmm" role="2OqNvi">
-                          <ref role="3Tt5mk" to="3xdn:31Tct3Txpke" />
-                        </node>
-                        <node concept="30H73N" id="31Tct3Tzjmn" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="31Tct3TziBp" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="31Tct3TnZm2">
-    <property role="TrG5h" value="reduce_ModuleScopeLiteral" />
-    <property role="3GE5qa" value="expression.parameter" />
-    <ref role="3gUMe" to="3xdn:2oWvAovDHkX" resolve="ModulesScope" />
-    <node concept="312cEu" id="31Tct3TnZLz" role="13RCb5">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Main" />
-      <node concept="2YIFZL" id="31Tct3TnZL$" role="jymVt">
-        <property role="TrG5h" value="execute" />
-        <node concept="3cqZAl" id="31Tct3TnZL_" role="3clF45" />
-        <node concept="37vLTG" id="31Tct3TnZLA" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="31Tct3TnZLB" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="31Tct3TnZLC" role="3clF46">
-          <property role="TrG5h" value="console" />
-          <node concept="3uibUv" id="31Tct3TnZLD" role="1tU5fm">
-            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="31Tct3TnZLE" role="1B3o_S" />
-        <node concept="3clFbS" id="31Tct3TnZLF" role="3clF47">
-          <node concept="3clFbF" id="31Tct3TnZLG" role="3cqZAp">
-            <node concept="2ShNRf" id="31Tct3TnZLH" role="3clFbG">
-              <node concept="1pGfFk" id="31Tct3TnZLI" role="2ShVmc">
-                <ref role="37wK5l" to="mte5:~ModulesScope.&lt;init&gt;(java.lang.Iterable)" resolve="ModulesScope" />
-                <node concept="2ShNRf" id="31Tct3TuFId" role="37wK5m">
-                  <node concept="Tc6Ow" id="31Tct3TuKiN" role="2ShVmc">
-                    <node concept="10Nm6u" id="31Tct3TuXBs" role="HW$Y0">
-                      <node concept="2b32R4" id="31Tct3TuYWE" role="lGtFl">
-                        <node concept="3JmXsc" id="31Tct3TuYWH" role="2P8S$">
-                          <node concept="3clFbS" id="31Tct3TuYWI" role="2VODD2">
-                            <node concept="3clFbF" id="31Tct3TuYWO" role="3cqZAp">
-                              <node concept="2OqwBi" id="31Tct3TuYWJ" role="3clFbG">
-                                <node concept="3Tsc0h" id="31Tct3TuYWM" role="2OqNvi">
-                                  <ref role="3TtcxE" to="3xdn:31Tct3TiJtC" />
-                                </node>
-                                <node concept="30H73N" id="31Tct3TuYWN" role="2Oq$k0" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="5WfJj_A2NVl" role="HW$YZ">
-                      <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="31Tct3TnZLY" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="31Tct3TnZLZ" role="1B3o_S" />
-    </node>
-  </node>
-  <node concept="13MO4I" id="1H31ARNQ$RB">
-    <property role="TrG5h" value="reduce_WithStatement" />
-    <property role="3GE5qa" value="expression.query" />
-    <ref role="3gUMe" to="3xdn:3F2FyKbNNqb" resolve="WithStatement" />
-    <node concept="9aQIb" id="1H31ARNQ$Sk" role="13RCb5">
-      <node concept="3clFbS" id="1H31ARNQ$Sm" role="9aQI4">
-        <node concept="3cpWs8" id="1H31ARNQ$U8" role="3cqZAp">
-          <node concept="3cpWsn" id="1H31ARNQ$U9" role="3cpWs9">
-            <property role="TrG5h" value="context" />
-            <node concept="3uibUv" id="1H31ARNQ$Ua" role="1tU5fm">
-              <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-            </node>
-            <node concept="2ShNRf" id="6ysF3v1j_n4" role="33vP2m">
-              <node concept="YeOm9" id="6ysF3v1j_n5" role="2ShVmc">
-                <node concept="1Y3b0j" id="6ysF3v1j_n6" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
-                  <node concept="3Tm1VV" id="6ysF3v1j_n7" role="1B3o_S" />
-                  <node concept="3clFb_" id="6ysF3v1j_n8" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getProject" />
-                    <node concept="3uibUv" id="6ysF3v1j_n9" role="3clF45">
-                      <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-                    </node>
-                    <node concept="3Tm1VV" id="6ysF3v1j_na" role="1B3o_S" />
-                    <node concept="3clFbS" id="6ysF3v1j_nb" role="3clF47">
-                      <node concept="YS8fn" id="1H31ARNQXFx" role="3cqZAp">
-                        <node concept="2ShNRf" id="1H31ARNQXG5" role="YScLw">
-                          <node concept="1pGfFk" id="1H31ARNQZp9" role="2ShVmc">
-                            <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="1hGiwlkUV2G" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getDefaultSearchscope" />
-                    <node concept="3uibUv" id="1hGiwlkUV2H" role="3clF45">
-                      <ref role="3uigEE" to="lui2:~SearchScope" resolve="SearchScope" />
-                    </node>
-                    <node concept="3Tm1VV" id="1hGiwlkUV2I" role="1B3o_S" />
-                    <node concept="3clFbS" id="1hGiwlkUV2L" role="3clF47">
-                      <node concept="3cpWs6" id="1hGiwlkVSwr" role="3cqZAp">
-                        <node concept="2YIFZM" id="1H31ARNRdyq" role="3cqZAk">
-                          <ref role="37wK5l" to="8w31:1H31ARNR264" resolve="createScope" />
-                          <ref role="1Pybhc" to="8w31:hpHLh7Fj1$" resolve="CommandUtil" />
-                          <node concept="10Nm6u" id="1H31ARNRd_x" role="37wK5m">
-                            <node concept="29HgVG" id="1H31ARNRdP3" role="lGtFl">
-                              <node concept="3NFfHV" id="1H31ARNRdSb" role="3NFExx">
-                                <node concept="3clFbS" id="1H31ARNRdSc" role="2VODD2">
-                                  <node concept="3clFbF" id="1H31ARNRdV6" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1H31ARNRdY7" role="3clFbG">
-                                      <node concept="30H73N" id="1H31ARNRdV5" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="1H31ARNReaT" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="3xdn:3F2FyKbNNqR" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="6ysF3v1j_nh" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getConsoleTab" />
-                    <node concept="3uibUv" id="4gO8GruTyO8" role="3clF45">
-                      <ref role="3uigEE" to="qgo0:4gO8Gruz$1J" resolve="BaseConsoleTab" />
-                    </node>
-                    <node concept="3Tm1VV" id="6ysF3v1j_nj" role="1B3o_S" />
-                    <node concept="3clFbS" id="6ysF3v1j_nk" role="3clF47">
-                      <node concept="YS8fn" id="1H31ARNQZqB" role="3cqZAp">
-                        <node concept="2ShNRf" id="1H31ARNQZqC" role="YScLw">
-                          <node concept="1pGfFk" id="1H31ARNQZqD" role="2ShVmc">
-                            <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1H31ARNQ$UD" role="3cqZAp">
-          <node concept="10Nm6u" id="1H31ARNQ$UB" role="3clFbG" />
-          <node concept="2b32R4" id="1H31ARNQAaI" role="lGtFl">
-            <node concept="3JmXsc" id="1H31ARNQAaK" role="2P8S$">
-              <node concept="3clFbS" id="1H31ARNQAaM" role="2VODD2">
-                <node concept="3clFbF" id="1H31ARNQAg7" role="3cqZAp">
-                  <node concept="2OqwBi" id="1H31ARNQB5f" role="3clFbG">
-                    <node concept="2OqwBi" id="1H31ARNQAm6" role="2Oq$k0">
-                      <node concept="30H73N" id="1H31ARNQAg6" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="1H31ARNQABq" role="2OqNvi">
-                        <ref role="3Tt5mk" to="3xdn:3F2FyKbNNqc" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="1H31ARNQBKB" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpee:fzcqZ_x" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="raruj" id="1H31ARNQ$UT" role="lGtFl" />
-    </node>
-  </node>
-</model>
-
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated
deleted file mode 100644
index 075739f6a4fd..000000000000
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="5sja23ju5l7wbd9qviej9liwi7c20g9" />
-
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies
deleted file mode 100644
index 652a6c6eadf8..000000000000
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependenciesRoot>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_Behavior" file="AbstractPrintExpression_Behavior.java">
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_BehaviorDescriptor" file="AbstractPrintExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_Behavior" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.BLCommand_Behavior" file="BLCommand_Behavior.java">
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="java.util.ArrayList" />
-    <classNode dependClassName="java.util.List" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
-    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
-    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.BLCommand_BehaviorDescriptor" file="BLCommand_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="java.util.List" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.IMethodLike_Behavior" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.IMethodLike_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.IStatementListContainer_Behavior" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.IStatementListContainer_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.BLCommand_Behavior" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="java.lang.Cloneable" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.BLExpression_Behavior" file="BLExpression_Behavior.java">
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.BLExpression_BehaviorDescriptor" file="BLExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.BLExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.lang.core.behavior.IWrapper_BehaviorDescriptor" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode extendsClassName="java.lang.Cloneable" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.BehaviorAspectDescriptor" file="BehaviorAspectDescriptor.java">
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="java.util.Arrays" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.BLCommand_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.BLExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.CustomScope_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ExceptionHolder_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.GlobalScope_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.InstancesExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ModelScope_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ModelsExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ModulesExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ModulesScope_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.NodesExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.PrintExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.PrintNodeExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.PrintNodeReferenceExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.PrintSequenceExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.PrintTextExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ProjectExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ProjectScope_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryParameterIncludeReadOnly_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryParameterList_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryParameterScope_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ReferencesExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ShowExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.UsagesExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.WithStatement_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.smodel.runtime.BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior" file="ConsoleExpression_Behavior.java">
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor" file="ConsoleExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor" />
-    <classNode extendsClassName="java.lang.Cloneable" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior" file="ConsoleOperation_Behavior.java">
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor" file="ConsoleOperation_BehaviorDescriptor.java">
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor" />
-    <classNode extendsClassName="java.lang.Cloneable" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.CustomScope_BehaviorDescriptor" file="CustomScope_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ScopeParameter_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ExceptionHolder_Behavior" file="ExceptionHolder_Behavior.java">
-    <classNode dependClassName="com.intellij.ide.CopyPasteManagerEx" />
-    <classNode dependClassName="com.intellij.openapi.project.Project" />
-    <classNode dependClassName="java.awt.datatransfer.StringSelection" />
-    <classNode dependClassName="jetbrains.mps.ide.actions.AnalyzeStacktraceDialog" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ExceptionHolder_BehaviorDescriptor" file="ExceptionHolder_BehaviorDescriptor.java">
-    <classNode dependClassName="com.intellij.openapi.project.Project" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.IClickable_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ExceptionHolder_Behavior" />
-    <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="java.lang.Cloneable" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.GlobalScope_BehaviorDescriptor" file="GlobalScope_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ScopeParameter_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.InstancesExpression_Behavior" file="InstancesExpression_Behavior.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Object" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="java.util.ArrayList" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.InstancesExpression_BehaviorDescriptor" file="InstancesExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.InstancesExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ModelScope_BehaviorDescriptor" file="ModelScope_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ScopeParameter_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ModelsExpression_Behavior" file="ModelsExpression_Behavior.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.util.ArrayList" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ModelsExpression_BehaviorDescriptor" file="ModelsExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ModelsExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ModulesExpression_Behavior" file="ModulesExpression_Behavior.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.util.ArrayList" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ModulesExpression_BehaviorDescriptor" file="ModulesExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ModulesExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ModulesScope_BehaviorDescriptor" file="ModulesScope_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ScopeParameter_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.NodesExpression_Behavior" file="NodesExpression_Behavior.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.util.ArrayList" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.NodesExpression_BehaviorDescriptor" file="NodesExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.NodesExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.PrintExpression_Behavior" file="PrintExpression_Behavior.java">
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.PrintExpression_BehaviorDescriptor" file="PrintExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.PrintExpression_Behavior" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode extendsClassName="java.lang.Cloneable" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.PrintNodeExpression_BehaviorDescriptor" file="PrintNodeExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.PrintNodeReferenceExpression_BehaviorDescriptor" file="PrintNodeReferenceExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.PrintSequenceExpression_BehaviorDescriptor" file="PrintSequenceExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.PrintTextExpression_BehaviorDescriptor" file="PrintTextExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ProjectExpression_Behavior" file="ProjectExpression_Behavior.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ProjectExpression_BehaviorDescriptor" file="ProjectExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ProjectExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ProjectScope_BehaviorDescriptor" file="ProjectScope_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ScopeParameter_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.QueryExpression_Behavior" file="QueryExpression_Behavior.java">
-    <classNode dependClassName="java.lang.Class" />
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Object" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" file="QueryExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_Behavior" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="java.lang.Cloneable" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.QueryParameterIncludeReadOnly_BehaviorDescriptor" file="QueryParameterIncludeReadOnly_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryParameter_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.QueryParameterList_BehaviorDescriptor" file="QueryParameterList_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.QueryParameterScope_BehaviorDescriptor" file="QueryParameterScope_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryParameter_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.QueryParameter_BehaviorDescriptor" file="QueryParameter_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ReferencesExpression_Behavior" file="ReferencesExpression_Behavior.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.util.ArrayList" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ReferencesExpression_BehaviorDescriptor" file="ReferencesExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ReferencesExpression_Behavior" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ScopeParameter_BehaviorDescriptor" file="ScopeParameter_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ShowExpression_Behavior" file="ShowExpression_Behavior.java">
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.ShowExpression_BehaviorDescriptor" file="ShowExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ShowExpression_Behavior" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode extendsClassName="java.lang.Cloneable" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.UsagesExpression_Behavior" file="UsagesExpression_Behavior.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Object" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="java.util.ArrayList" />
-    <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
-    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
-    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
-    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorReflection" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.UsagesExpression_BehaviorDescriptor" file="UsagesExpression_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Iterable" />
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.UsagesExpression_Behavior" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-  <dependency className="jetbrains.mps.console.blCommand.behavior.WithStatement_BehaviorDescriptor" file="WithStatement_BehaviorDescriptor.java">
-    <classNode dependClassName="java.lang.Override" />
-    <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Statement_BehaviorDescriptor" />
-    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
-  </dependency>
-</dependenciesRoot>
-
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated
deleted file mode 100644
index 578dc60ec193..000000000000
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="9imem7t1vfevjc6yjvx8zyh0p2vadcu" />
-
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated
deleted file mode 100644
index 48894a569918..000000000000
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="ehi22t8wiusxe6kc1qio99y4it9tlfb" />
-
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated
deleted file mode 100644
index 07248bc004eb..000000000000
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-6m20bojwx16nqv4sqxqy7wqnvdn8x74" />
-
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated
deleted file mode 100644
index e800006649cd..000000000000
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="etzlspnagwzxdc5lzie2gxyqirvzuaj" />
-
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated
deleted file mode 100644
index 24999f1437ef..000000000000
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="4l63k9l53d29r2nzdoduaqebmfwnjne" />
-
diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated
deleted file mode 100644
index 6d56b9311860..000000000000
--- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="79qzastlkfwpwhmpjpbn2w2tw0i88er" />
-
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java
deleted file mode 100644
index d5a24a10948d..000000000000
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package jetbrains.mps.console.blCommand.behavior;
-
-/*Generated by MPS */
-
-import jetbrains.mps.smodel.runtime.BehaviorDescriptor;
-import java.util.Arrays;
-import jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted;
-
-public class BehaviorAspectDescriptor implements jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor {
-  public BehaviorAspectDescriptor() {
-  }
-  public BehaviorDescriptor getDescriptor(String fqName) {
-    switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) {
-      case 0:
-        return new BLCommand_BehaviorDescriptor();
-      case 13:
-        return new PrintNodeReferenceExpression_BehaviorDescriptor();
-      case 23:
-        return new UsagesExpression_BehaviorDescriptor();
-      case 22:
-        return new ShowExpression_BehaviorDescriptor();
-      case 5:
-        return new InstancesExpression_BehaviorDescriptor();
-      case 16:
-        return new ProjectExpression_BehaviorDescriptor();
-      case 15:
-        return new PrintTextExpression_BehaviorDescriptor();
-      case 12:
-        return new PrintNodeExpression_BehaviorDescriptor();
-      case 10:
-        return new NodesExpression_BehaviorDescriptor();
-      case 21:
-        return new ReferencesExpression_BehaviorDescriptor();
-      case 7:
-        return new ModelsExpression_BehaviorDescriptor();
-      case 8:
-        return new ModulesExpression_BehaviorDescriptor();
-      case 3:
-        return new ExceptionHolder_BehaviorDescriptor();
-      case 19:
-        return new QueryParameterList_BehaviorDescriptor();
-      case 18:
-        return new QueryParameterIncludeReadOnly_BehaviorDescriptor();
-      case 20:
-        return new QueryParameterScope_BehaviorDescriptor();
-      case 4:
-        return new GlobalScope_BehaviorDescriptor();
-      case 17:
-        return new ProjectScope_BehaviorDescriptor();
-      case 1:
-        return new BLExpression_BehaviorDescriptor();
-      case 11:
-        return new PrintExpression_BehaviorDescriptor();
-      case 14:
-        return new PrintSequenceExpression_BehaviorDescriptor();
-      case 9:
-        return new ModulesScope_BehaviorDescriptor();
-      case 6:
-        return new ModelScope_BehaviorDescriptor();
-      case 2:
-        return new CustomScope_BehaviorDescriptor();
-      case 24:
-        return new WithStatement_BehaviorDescriptor();
-      default:
-        return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName);
-    }
-  }
-  private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.BLCommand", "jetbrains.mps.console.blCommand.structure.BLExpression", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.ExceptionHolder", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"};
-}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java
deleted file mode 100644
index 50e43a14ea62..000000000000
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package jetbrains.mps.console.blCommand.behavior;
-
-/*Generated by MPS */
-
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor;
-
-public interface ConsoleExpression_BehaviorDescriptor extends ConsoleHelpProvider_BehaviorDescriptor {
-}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java
deleted file mode 100644
index 6d2d20bf588d..000000000000
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package jetbrains.mps.console.blCommand.behavior;
-
-/*Generated by MPS */
-
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor;
-
-public interface ConsoleOperation_BehaviorDescriptor extends ConsoleHelpProvider_BehaviorDescriptor {
-}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java
deleted file mode 100644
index 4d079157b9ac..000000000000
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package jetbrains.mps.console.blCommand.behavior;
-
-/*Generated by MPS */
-
-import org.jetbrains.mps.openapi.language.SConcept;
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior;
-
-public class PrintExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor {
-  public PrintExpression_BehaviorDescriptor() {
-  }
-  public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
-  }
-  public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
-  }
-  public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
-  }
-  public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
-    return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept);
-  }
-  public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
-  }
-  public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
-    return PrintExpression_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
-  }
-  @Override
-  public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.PrintExpression";
-  }
-}
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info
deleted file mode 100644
index ada7d468314e..000000000000
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info
+++ /dev/null
@@ -1,500 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<debug-info>
-  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
-  <root>
-    <file name="AbstractPrintExpression_BehaviorDescriptor.java">
-      <unit at="8,0,19,0" name="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_BehaviorDescriptor" />
-    </file>
-    <file name="BLCommand_BehaviorDescriptor.java">
-      <unit at="14,0,55,0" name="jetbrains.mps.console.blCommand.behavior.BLCommand_BehaviorDescriptor" />
-    </file>
-    <file name="BLExpression_BehaviorDescriptor.java">
-      <unit at="9,0,23,0" name="jetbrains.mps.console.blCommand.behavior.BLExpression_BehaviorDescriptor" />
-    </file>
-    <file name="BehaviorAspectDescriptor.java">
-      <unit at="9,0,70,0" name="jetbrains.mps.console.blCommand.behavior.BehaviorAspectDescriptor" />
-    </file>
-    <file name="ConsoleExpression_BehaviorDescriptor.java">
-      <unit at="7,0,9,0" name="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor" />
-    </file>
-    <file name="ConsoleOperation_BehaviorDescriptor.java">
-      <unit at="7,0,9,0" name="jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor" />
-    </file>
-    <file name="CustomScope_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.CustomScope_BehaviorDescriptor" />
-    </file>
-    <file name="ExceptionHolder_BehaviorDescriptor.java">
-      <unit at="10,0,24,0" name="jetbrains.mps.console.blCommand.behavior.ExceptionHolder_BehaviorDescriptor" />
-    </file>
-    <file name="GlobalScope_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.GlobalScope_BehaviorDescriptor" />
-    </file>
-    <file name="InstancesExpression_BehaviorDescriptor.java">
-      <unit at="8,0,25,0" name="jetbrains.mps.console.blCommand.behavior.InstancesExpression_BehaviorDescriptor" />
-    </file>
-    <file name="ModelScope_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.ModelScope_BehaviorDescriptor" />
-    </file>
-    <file name="ModelsExpression_BehaviorDescriptor.java">
-      <unit at="8,0,19,0" name="jetbrains.mps.console.blCommand.behavior.ModelsExpression_BehaviorDescriptor" />
-    </file>
-    <file name="ModulesExpression_BehaviorDescriptor.java">
-      <unit at="8,0,19,0" name="jetbrains.mps.console.blCommand.behavior.ModulesExpression_BehaviorDescriptor" />
-    </file>
-    <file name="ModulesScope_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.ModulesScope_BehaviorDescriptor" />
-    </file>
-    <file name="NodesExpression_BehaviorDescriptor.java">
-      <unit at="8,0,19,0" name="jetbrains.mps.console.blCommand.behavior.NodesExpression_BehaviorDescriptor" />
-    </file>
-    <file name="PrintExpression_BehaviorDescriptor.java">
-      <unit at="8,0,34,0" name="jetbrains.mps.console.blCommand.behavior.PrintExpression_BehaviorDescriptor" />
-    </file>
-    <file name="PrintNodeExpression_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.PrintNodeExpression_BehaviorDescriptor" />
-    </file>
-    <file name="PrintNodeReferenceExpression_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.PrintNodeReferenceExpression_BehaviorDescriptor" />
-    </file>
-    <file name="PrintSequenceExpression_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.PrintSequenceExpression_BehaviorDescriptor" />
-    </file>
-    <file name="PrintTextExpression_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.PrintTextExpression_BehaviorDescriptor" />
-    </file>
-    <file name="ProjectExpression_BehaviorDescriptor.java">
-      <unit at="8,0,19,0" name="jetbrains.mps.console.blCommand.behavior.ProjectExpression_BehaviorDescriptor" />
-    </file>
-    <file name="ProjectScope_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.ProjectScope_BehaviorDescriptor" />
-    </file>
-    <file name="QueryExpression_BehaviorDescriptor.java">
-      <unit at="10,0,40,0" name="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
-    </file>
-    <file name="QueryParameterIncludeReadOnly_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.QueryParameterIncludeReadOnly_BehaviorDescriptor" />
-    </file>
-    <file name="QueryParameterList_BehaviorDescriptor.java">
-      <unit at="7,0,15,0" name="jetbrains.mps.console.blCommand.behavior.QueryParameterList_BehaviorDescriptor" />
-    </file>
-    <file name="QueryParameterScope_BehaviorDescriptor.java">
-      <unit at="6,0,14,0" name="jetbrains.mps.console.blCommand.behavior.QueryParameterScope_BehaviorDescriptor" />
-    </file>
-    <file name="QueryParameter_BehaviorDescriptor.java">
-      <unit at="7,0,15,0" name="jetbrains.mps.console.blCommand.behavior.QueryParameter_BehaviorDescriptor" />
-    </file>
-    <file name="ReferencesExpression_BehaviorDescriptor.java">
-      <unit at="8,0,19,0" name="jetbrains.mps.console.blCommand.behavior.ReferencesExpression_BehaviorDescriptor" />
-    </file>
-    <file name="ScopeParameter_BehaviorDescriptor.java">
-      <unit at="7,0,15,0" name="jetbrains.mps.console.blCommand.behavior.ScopeParameter_BehaviorDescriptor" />
-    </file>
-    <file name="ShowExpression_BehaviorDescriptor.java">
-      <unit at="9,0,38,0" name="jetbrains.mps.console.blCommand.behavior.ShowExpression_BehaviorDescriptor" />
-    </file>
-    <file name="UsagesExpression_BehaviorDescriptor.java">
-      <unit at="8,0,25,0" name="jetbrains.mps.console.blCommand.behavior.UsagesExpression_BehaviorDescriptor" />
-    </file>
-    <file name="WithStatement_BehaviorDescriptor.java">
-      <unit at="7,0,15,0" name="jetbrains.mps.console.blCommand.behavior.WithStatement_BehaviorDescriptor" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/2699636778858778743">
-    <file name="BLCommand_Behavior.java">
-      <node id="2699636778858790466" at="19,80,20,47" concept="4" />
-      <node id="2699636778858790750" at="22,69,23,178" concept="4" />
-      <node id="2699636778858876361" at="25,91,26,48" concept="3" />
-      <node id="2699636778858878821" at="26,48,27,84" concept="1" />
-      <node id="2699636778858801153" at="27,84,28,18" concept="4" />
-      <node id="7006261637493130861" at="30,94,31,38" concept="4" />
-      <node id="7006261637493131792" at="33,104,34,30" concept="4" />
-      <node id="2699636778858790492" at="36,60,37,63" concept="3" />
-      <node id="2699636778858790492" at="37,63,38,30" concept="3" />
-      <node id="2699636778858790492" at="38,30,39,220" concept="0" />
-      <node id="2699636778858790492" at="38,30,39,220" concept="0" />
-      <node id="2699636778858790492" at="38,30,39,220" concept="1" />
-      <node id="2699636778858790492" at="39,220,40,24" concept="4" />
-      <node id="2699636778858912197" at="42,62,43,63" concept="3" />
-      <node id="2699636778858912197" at="43,63,44,30" concept="3" />
-      <node id="2699636778858912197" at="44,30,45,227" concept="1" />
-      <node id="2699636778858912197" at="45,227,46,438" concept="1" />
-      <node id="2699636778858912197" at="46,438,47,24" concept="4" />
-      <node id="2699636778858778743" at="17,0,19,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="2699636778858912197" at="44,30,46,438" concept="0" />
-      <node id="2699636778858912197" at="44,30,46,438" concept="0" />
-      <node id="2699636778858778743" at="19,0,22,0" concept="5" trace="virtual_getExpectedRetType_1239354342632#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="2699636778858778743" at="22,0,25,0" concept="5" trace="virtual_getBody_1239354440022#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="2699636778858778743" at="30,0,33,0" concept="5" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="2699636778858778743" at="33,0,36,0" concept="5" trace="virtual_getShortDisplayString_7006261637493126103#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="2699636778858778743" at="25,0,30,0" concept="5" trace="virtual_getThrowableTypes_6204026822016975623#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/util/List;" />
-      <node id="2699636778858790492" at="36,0,42,0" concept="5" trace="_quotation_createNode_1tnz54_a0a0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="2699636778858912197" at="42,0,49,0" concept="5" trace="_quotation_createNode_1tnz54_a0a1a2#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="2699636778858778896" at="17,43,17,43" />
-      <scope id="2699636778858779397" at="19,80,20,47" />
-      <scope id="2699636778858779403" at="22,69,23,178" />
-      <scope id="7006261637493130711" at="30,94,31,38" />
-      <scope id="7006261637493131068" at="33,104,34,30" />
-      <scope id="2699636778858790492" at="38,30,39,220" />
-      <scope id="2699636778858778743" at="17,0,19,0">
-        <var name="thisNode" id="2699636778858778743" />
-      </scope>
-      <scope id="2699636778858912197" at="44,30,46,438" />
-      <scope id="2699636778858778743" at="19,0,22,0">
-        <var name="thisNode" id="2699636778858778743" />
-      </scope>
-      <scope id="2699636778858778743" at="22,0,25,0">
-        <var name="thisNode" id="2699636778858778743" />
-      </scope>
-      <scope id="2699636778858779409" at="25,91,28,18">
-        <var name="result" id="2699636778858876364" />
-      </scope>
-      <scope id="2699636778858778743" at="30,0,33,0">
-        <var name="thisConcept" id="2699636778858778743" />
-      </scope>
-      <scope id="2699636778858778743" at="33,0,36,0">
-        <var name="thisConcept" id="2699636778858778743" />
-      </scope>
-      <scope id="2699636778858790492" at="36,60,40,24">
-        <var name="facade" id="2699636778858790492" />
-        <var name="quotedNode_1" id="2699636778858790492" />
-      </scope>
-      <scope id="2699636778858778743" at="25,0,30,0">
-        <var name="thisNode" id="2699636778858778743" />
-      </scope>
-      <scope id="2699636778858912197" at="42,62,47,24">
-        <var name="facade" id="2699636778858912197" />
-        <var name="quotedNode_1" id="2699636778858912197" />
-      </scope>
-      <scope id="2699636778858790492" at="36,0,42,0" />
-      <scope id="2699636778858912197" at="42,0,49,0" />
-      <unit id="2699636778858778743" at="16,0,50,0" name="jetbrains.mps.console.blCommand.behavior.BLCommand_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4225915845891288151">
-    <file name="ShowExpression_Behavior.java">
-      <node id="4225915845891288167" at="11,100,12,16" concept="4" />
-      <node id="7006261637496577698" at="14,94,15,87" concept="4" />
-      <node id="4225915845891288151" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4225915845891288151" at="11,0,14,0" concept="5" trace="virtual_legalAsStatement_1262430001741498032#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Z" />
-      <node id="4225915845891288151" at="14,0,17,0" concept="5" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="4225915845891288153" at="9,43,9,43" />
-      <scope id="4225915845891288157" at="11,100,12,16" />
-      <scope id="7006261637496568945" at="14,94,15,87" />
-      <scope id="4225915845891288151" at="9,0,11,0">
-        <var name="thisNode" id="4225915845891288151" />
-      </scope>
-      <scope id="4225915845891288151" at="11,0,14,0">
-        <var name="thisConcept" id="4225915845891288151" />
-      </scope>
-      <scope id="4225915845891288151" at="14,0,17,0">
-        <var name="thisConcept" id="4225915845891288151" />
-      </scope>
-      <unit id="4225915845891288151" at="8,0,18,0" name="jetbrains.mps.console.blCommand.behavior.ShowExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4225915845891297187">
-    <file name="AbstractPrintExpression_Behavior.java">
-      <node id="4225915845891297203" at="11,100,12,16" concept="4" />
-      <node id="4225915845891297187" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4225915845891297187" at="11,0,14,0" concept="5" trace="virtual_legalAsStatement_1262430001741498032#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Z" />
-      <scope id="4225915845891297189" at="9,43,9,43" />
-      <scope id="4225915845891297193" at="11,100,12,16" />
-      <scope id="4225915845891297187" at="9,0,11,0">
-        <var name="thisNode" id="4225915845891297187" />
-      </scope>
-      <scope id="4225915845891297187" at="11,0,14,0">
-        <var name="thisConcept" id="4225915845891297187" />
-      </scope>
-      <unit id="4225915845891297187" at="8,0,15,0" name="jetbrains.mps.console.blCommand.behavior.AbstractPrintExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4307205004146936308">
-    <file name="UsagesExpression_Behavior.java">
-      <node id="3470161847490034786" at="16,114,17,435" concept="4" />
-      <node id="1433263869219693597" at="19,94,20,303" concept="4" />
-      <node id="2410037095038282257" at="22,99,23,239" concept="4" />
-      <node id="4307205004146936308" at="14,0,16,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4307205004146936308" at="16,0,19,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
-      <node id="4307205004146936308" at="19,0,22,0" concept="5" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="4307205004146936308" at="22,0,25,0" concept="5" trace="virtual_getDisplayString_6891027939994892943#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="4307205004146936310" at="14,43,14,43" />
-      <scope id="4307205004146983753" at="16,114,17,435" />
-      <scope id="1433263869220246216" at="19,94,20,303" />
-      <scope id="2410037095038282252" at="22,99,23,239" />
-      <scope id="4307205004146936308" at="14,0,16,0">
-        <var name="thisNode" id="4307205004146936308" />
-      </scope>
-      <scope id="4307205004146936308" at="16,0,19,0">
-        <var name="thisConcept" id="4307205004146936308" />
-      </scope>
-      <scope id="4307205004146936308" at="19,0,22,0">
-        <var name="thisConcept" id="4307205004146936308" />
-      </scope>
-      <scope id="4307205004146936308" at="22,0,25,0">
-        <var name="thisConcept" id="4307205004146936308" />
-      </scope>
-      <unit id="4307205004146936308" at="13,0,26,0" name="jetbrains.mps.console.blCommand.behavior.UsagesExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4307205004146945906">
-    <file name="QueryExpression_Behavior.java">
-      <node id="4225915845891111332" at="16,100,17,16" concept="4" />
-      <node id="1433263869219709154" at="19,94,20,46" concept="3" />
-      <node id="1433263869219780383" at="21,483,22,98" concept="1" />
-      <node id="1433263869219777969" at="24,493,25,81" concept="1" />
-      <node id="1433263869219798899" at="26,12,27,76" concept="1" />
-      <node id="1433263869219766829" at="28,5,29,18" concept="4" />
-      <node id="6891027939994775901" at="31,99,32,244" concept="3" />
-      <node id="6891027939994783838" at="33,304,34,20" concept="4" />
-      <node id="6891027939994786004" at="35,12,36,37" concept="4" />
-      <node id="4307205004146945906" at="14,0,16,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="1433263869219798588" at="26,10,28,5" concept="0" />
-      <node id="6891027939994784978" at="35,10,37,5" concept="0" />
-      <node id="4307205004146945906" at="16,0,19,0" concept="5" trace="virtual_legalAsStatement_1262430001741498032#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Z" />
-      <node id="1433263869219780381" at="20,46,23,5" concept="2" />
-      <node id="1433263869219703458" at="23,5,28,5" concept="2" />
-      <node id="6891027939994778323" at="32,244,37,5" concept="2" />
-      <node id="4307205004146945906" at="31,0,39,0" concept="5" trace="virtual_getDisplayString_6891027939994892943#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="4307205004146945906" at="19,0,31,0" concept="5" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="4307205004146945908" at="14,43,14,43" />
-      <scope id="4225915845891111311" at="16,100,17,16" />
-      <scope id="1433263869219780382" at="21,483,22,98" />
-      <scope id="1433263869219703459" at="24,493,25,81" />
-      <scope id="1433263869219798589" at="26,12,27,76" />
-      <scope id="6891027939994778325" at="33,304,34,20" />
-      <scope id="6891027939994786005" at="35,12,36,37" />
-      <scope id="4307205004146945906" at="14,0,16,0">
-        <var name="thisNode" id="4307205004146945906" />
-      </scope>
-      <scope id="4307205004146945906" at="16,0,19,0">
-        <var name="thisConcept" id="4307205004146945906" />
-      </scope>
-      <scope id="6891027939994745815" at="31,99,37,5">
-        <var name="result" id="6891027939994775902" />
-      </scope>
-      <scope id="4307205004146945906" at="31,0,39,0">
-        <var name="thisConcept" id="4307205004146945906" />
-      </scope>
-      <scope id="1433263869219703331" at="19,94,29,18">
-        <var name="result" id="1433263869219709157" />
-      </scope>
-      <scope id="4307205004146945906" at="19,0,31,0">
-        <var name="thisConcept" id="4307205004146945906" />
-      </scope>
-      <unit id="4307205004146945906" at="13,0,40,0" name="jetbrains.mps.console.blCommand.behavior.QueryExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4307205004146945952">
-    <file name="NodesExpression_Behavior.java">
-      <node id="4830115408592167482" at="14,114,15,435" concept="4" />
-      <node id="4307205004146945952" at="12,0,14,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4307205004146945952" at="14,0,17,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
-      <scope id="4307205004146945954" at="12,43,12,43" />
-      <scope id="4307205004146945960" at="14,114,15,435" />
-      <scope id="4307205004146945952" at="12,0,14,0">
-        <var name="thisNode" id="4307205004146945952" />
-      </scope>
-      <scope id="4307205004146945952" at="14,0,17,0">
-        <var name="thisConcept" id="4307205004146945952" />
-      </scope>
-      <unit id="4307205004146945952" at="11,0,18,0" name="jetbrains.mps.console.blCommand.behavior.NodesExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4307205004146956485">
-    <file name="ModulesExpression_Behavior.java">
-      <node id="4830115408592155729" at="14,114,15,435" concept="4" />
-      <node id="4307205004146956485" at="12,0,14,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4307205004146956485" at="14,0,17,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
-      <scope id="4307205004146956487" at="12,43,12,43" />
-      <scope id="4307205004146956535" at="14,114,15,435" />
-      <scope id="4307205004146956485" at="12,0,14,0">
-        <var name="thisNode" id="4307205004146956485" />
-      </scope>
-      <scope id="4307205004146956485" at="14,0,17,0">
-        <var name="thisConcept" id="4307205004146956485" />
-      </scope>
-      <unit id="4307205004146956485" at="11,0,18,0" name="jetbrains.mps.console.blCommand.behavior.ModulesExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4307205004146963229">
-    <file name="ModelsExpression_Behavior.java">
-      <node id="4830115408592112296" at="14,114,15,435" concept="4" />
-      <node id="4307205004146963229" at="12,0,14,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4307205004146963229" at="14,0,17,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
-      <scope id="4307205004146963231" at="12,43,12,43" />
-      <scope id="4307205004146963279" at="14,114,15,435" />
-      <scope id="4307205004146963229" at="12,0,14,0">
-        <var name="thisNode" id="4307205004146963229" />
-      </scope>
-      <scope id="4307205004146963229" at="14,0,17,0">
-        <var name="thisConcept" id="4307205004146963229" />
-      </scope>
-      <unit id="4307205004146963229" at="11,0,18,0" name="jetbrains.mps.console.blCommand.behavior.ModelsExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4307205004146970004">
-    <file name="InstancesExpression_Behavior.java">
-      <node id="3470161847490021102" at="16,114,17,435" concept="4" />
-      <node id="1433263869220247007" at="19,94,20,303" concept="4" />
-      <node id="2410037095038320797" at="22,99,23,242" concept="4" />
-      <node id="4307205004146970004" at="14,0,16,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4307205004146970004" at="16,0,19,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
-      <node id="4307205004146970004" at="19,0,22,0" concept="5" trace="virtual_getHelpPage_7006261637493125297#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="4307205004146970004" at="22,0,25,0" concept="5" trace="virtual_getDisplayString_6891027939994892943#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="4307205004146970006" at="14,43,14,43" />
-      <scope id="4307205004146970054" at="16,114,17,435" />
-      <scope id="1433263869220247006" at="19,94,20,303" />
-      <scope id="2410037095038320792" at="22,99,23,242" />
-      <scope id="4307205004146970004" at="14,0,16,0">
-        <var name="thisNode" id="4307205004146970004" />
-      </scope>
-      <scope id="4307205004146970004" at="16,0,19,0">
-        <var name="thisConcept" id="4307205004146970004" />
-      </scope>
-      <scope id="4307205004146970004" at="19,0,22,0">
-        <var name="thisConcept" id="4307205004146970004" />
-      </scope>
-      <scope id="4307205004146970004" at="22,0,25,0">
-        <var name="thisConcept" id="4307205004146970004" />
-      </scope>
-      <unit id="4307205004146970004" at="13,0,26,0" name="jetbrains.mps.console.blCommand.behavior.InstancesExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/4307205004146976962">
-    <file name="ReferencesExpression_Behavior.java">
-      <node id="4830115408592183139" at="14,114,15,435" concept="4" />
-      <node id="4307205004146976962" at="12,0,14,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4307205004146976962" at="14,0,17,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
-      <scope id="4307205004146976964" at="12,43,12,43" />
-      <scope id="4307205004146977012" at="14,114,15,435" />
-      <scope id="4307205004146976962" at="12,0,14,0">
-        <var name="thisNode" id="4307205004146976962" />
-      </scope>
-      <scope id="4307205004146976962" at="14,0,17,0">
-        <var name="thisConcept" id="4307205004146976962" />
-      </scope>
-      <unit id="4307205004146976962" at="11,0,18,0" name="jetbrains.mps.console.blCommand.behavior.ReferencesExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/5932042262275648698">
-    <file name="ConsoleOperation_Behavior.java">
-      <node id="5932042262275683930" at="11,90,12,23" concept="4" />
-      <node id="5932042262275648698" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="5932042262275648698" at="11,0,14,0" concept="5" trace="virtual_getKind_7006261637493126084#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="5932042262275648700" at="9,43,9,43" />
-      <scope id="5932042262275683923" at="11,90,12,23" />
-      <scope id="5932042262275648698" at="9,0,11,0">
-        <var name="thisNode" id="5932042262275648698" />
-      </scope>
-      <scope id="5932042262275648698" at="11,0,14,0">
-        <var name="thisConcept" id="5932042262275648698" />
-      </scope>
-      <unit id="5932042262275648698" at="8,0,15,0" name="jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/6558068108108193352">
-    <file name="ExceptionHolder_Behavior.java">
-      <node id="4221956679900513485" at="16,91,17,222" concept="3" />
-      <node id="4221956679900513493" at="17,222,18,61" concept="1" />
-      <node id="4221956679900513501" at="18,61,19,80" concept="3" />
-      <node id="4221956679900513512" at="19,80,20,18" concept="1" />
-      <node id="6558068108108282033" at="22,80,23,189" concept="4" />
-      <node id="6558068108108193352" at="14,0,16,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="6558068108108193352" at="22,0,25,0" concept="5" trace="virtual_canExecute_3282455643657932881#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
-      <node id="6558068108108193352" at="16,0,22,0" concept="5" trace="virtual_execute_8517397753922085153#(Lorg/jetbrains/mps/openapi/model/SNode;Lcom/intellij/openapi/project/Project;)V" />
-      <scope id="6558068108108193505" at="14,43,14,43" />
-      <scope id="6558068108108193832" at="22,80,23,189" />
-      <scope id="6558068108108193352" at="14,0,16,0">
-        <var name="thisNode" id="6558068108108193352" />
-      </scope>
-      <scope id="6558068108108193352" at="22,0,25,0">
-        <var name="thisNode" id="6558068108108193352" />
-      </scope>
-      <scope id="6558068108108193824" at="16,91,20,18">
-        <var name="contents" id="4221956679900513486" />
-        <var name="dialog" id="4221956679900513502" />
-      </scope>
-      <scope id="6558068108108193352" at="16,0,22,0">
-        <var name="project" id="6558068108108193825" />
-        <var name="thisNode" id="6558068108108193352" />
-      </scope>
-      <unit id="6558068108108193352" at="13,0,26,0" name="jetbrains.mps.console.blCommand.behavior.ExceptionHolder_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/7006261637493132074">
-    <file name="BLExpression_Behavior.java">
-      <node id="7006261637493132088" at="11,94,12,57" concept="4" />
-      <node id="7006261637493135794" at="14,104,15,26" concept="4" />
-      <node id="7006261637493132074" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7006261637493132074" at="11,0,14,0" concept="5" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <node id="7006261637493132074" at="14,0,17,0" concept="5" trace="virtual_getShortDisplayString_7006261637493126103#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="7006261637493132076" at="9,43,9,43" />
-      <scope id="7006261637493132081" at="11,94,12,57" />
-      <scope id="7006261637493135778" at="14,104,15,26" />
-      <scope id="7006261637493132074" at="9,0,11,0">
-        <var name="thisNode" id="7006261637493132074" />
-      </scope>
-      <scope id="7006261637493132074" at="11,0,14,0">
-        <var name="thisConcept" id="7006261637493132074" />
-      </scope>
-      <scope id="7006261637493132074" at="14,0,17,0">
-        <var name="thisConcept" id="7006261637493132074" />
-      </scope>
-      <unit id="7006261637493132074" at="8,0,18,0" name="jetbrains.mps.console.blCommand.behavior.BLExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/7006261637496548522">
-    <file name="ConsoleExpression_Behavior.java">
-      <node id="7006261637496548544" at="11,90,12,24" concept="4" />
-      <node id="7006261637496548522" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7006261637496548522" at="11,0,14,0" concept="5" trace="virtual_getKind_7006261637493126084#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="7006261637496548524" at="9,43,9,43" />
-      <scope id="7006261637496548537" at="11,90,12,24" />
-      <scope id="7006261637496548522" at="9,0,11,0">
-        <var name="thisNode" id="7006261637496548522" />
-      </scope>
-      <scope id="7006261637496548522" at="11,0,14,0">
-        <var name="thisConcept" id="7006261637496548522" />
-      </scope>
-      <unit id="7006261637496548522" at="8,0,15,0" name="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/7006261637496586602">
-    <file name="PrintExpression_Behavior.java">
-      <node id="7006261637496599738" at="11,94,12,43" concept="4" />
-      <node id="7006261637496586602" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7006261637496586602" at="11,0,14,0" concept="5" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
-      <scope id="7006261637496586604" at="9,43,9,43" />
-      <scope id="7006261637496586609" at="11,94,12,43" />
-      <scope id="7006261637496586602" at="9,0,11,0">
-        <var name="thisNode" id="7006261637496586602" />
-      </scope>
-      <scope id="7006261637496586602" at="11,0,14,0">
-        <var name="thisConcept" id="7006261637496586602" />
-      </scope>
-      <unit id="7006261637496586602" at="8,0,15,0" name="jetbrains.mps.console.blCommand.behavior.PrintExpression_Behavior" />
-    </file>
-  </root>
-  <root nodeRef="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)/7284872370239343379">
-    <file name="ProjectExpression_Behavior.java">
-      <node id="4225915845891119382" at="11,114,12,16" concept="4" />
-      <node id="7284872370239343379" at="9,0,11,0" concept="5" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7284872370239343379" at="11,0,14,0" concept="5" trace="virtual_getSupportedParameters_4307205004146936444#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/Iterable;" />
-      <scope id="7284872370239343381" at="9,43,9,43" />
-      <scope id="7284872370239343433" at="11,114,12,16" />
-      <scope id="7284872370239343379" at="9,0,11,0">
-        <var name="thisNode" id="7284872370239343379" />
-      </scope>
-      <scope id="7284872370239343379" at="11,0,14,0">
-        <var name="thisConcept" id="7284872370239343379" />
-      </scope>
-      <unit id="7284872370239343379" at="8,0,15,0" name="jetbrains.mps.console.blCommand.behavior.ProjectExpression_Behavior" />
-    </file>
-  </root>
-</debug-info>
-
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java
deleted file mode 100644
index 1662d3c84774..000000000000
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package jetbrains.mps.console.blCommand.structure;
-
-/*Generated by MPS */
-
-import jetbrains.mps.smodel.runtime.BaseStructureAspectDescriptor;
-import jetbrains.mps.smodel.runtime.ConceptDescriptor;
-import jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder;
-import jetbrains.mps.smodel.adapter.ids.MetaIdFactory;
-import java.util.Collection;
-import java.util.Arrays;
-import org.jetbrains.annotations.Nullable;
-
-public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
-
-  /*package*/ final ConceptDescriptor myConceptAbstractPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).childDescriptors(new ConceptDescriptorBuilder.Link(8365379837260461921L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).abstract_().create();
-  /*package*/ final ConceptDescriptor myConceptBLCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.BLCommand", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.baseLanguage.structure.IMethodLike", "jetbrains.mps.baseLanguage.structure.IStatementListContainer").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x1208f458d37L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11750ef8265L)).childDescriptors(new ConceptDescriptorBuilder.Link(1769790395579689573L, "body", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false)).children(new String[]{"body"}, new boolean[]{false}).alias("{", "baseLanguage statements").create();
-  /*package*/ final ConceptDescriptor myConceptBLExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.BLExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.lang.core.structure.IWrapper").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x11c6fd75034L)).childDescriptors(new ConceptDescriptorBuilder.Link(7656298970878093890L, "expression", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"expression"}, new boolean[]{false}).alias("", "baseLanguage expression").create();
-  /*package*/ final ConceptDescriptor myConceptConsoleExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).interface_().parents("jetbrains.mps.console.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).create();
-  /*package*/ final ConceptDescriptor myConceptConsoleOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleOperation", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.console.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).create();
-  /*package*/ final ConceptDescriptor myConceptCustomScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.CustomScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759611770126L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"scope"}, new boolean[]{false}).alias("custom", "? extends SearchScope").create();
-  /*package*/ final ConceptDescriptor myConceptExceptionHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ExceptionHolder", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(6558068108108282025L, "stackTrace")).properties("stackTrace").create();
-  /*package*/ final ConceptDescriptor myConceptGlobalScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.GlobalScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("global", "").create();
-  /*package*/ final ConceptDescriptor myConceptInstancesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.InstancesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(7738379549910147342L, "conceptArg", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x118f285e4f7L), false, false, false)).children(new String[]{"conceptArg"}, new boolean[]{false}).alias("#instances", "instances of a concept in scope").create();
-  /*package*/ final ConceptDescriptor myConceptModelScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModelScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759608408143L, "model", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"model"}, new boolean[]{true}).alias("models", "").create();
-  /*package*/ final ConceptDescriptor myConceptModelsExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModelsExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675beab2dL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#models", "all models in scope").create();
-  /*package*/ final ConceptDescriptor myConceptModulesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModulesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675cc2262L)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#modules", "all modules in scope").create();
-  /*package*/ final ConceptDescriptor myConceptModulesScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModulesScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759607928680L, "module", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"module"}, new boolean[]{true}).alias("modules", "").create();
-  /*package*/ final ConceptDescriptor myConceptNodesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.NodesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#nodes", "all nodes in scope").create();
-  /*package*/ final ConceptDescriptor myConceptPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).alias("#print", "smart print depending on content").create();
-  /*package*/ final ConceptDescriptor myConceptPrintNodeExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintNodeExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4c7a26b31bd03b59L)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).alias("#printNode", "print node copy").create();
-  /*package*/ final ConceptDescriptor myConceptPrintNodeReferenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f195a051bd9bddcL)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).alias("#printNodeRef", "print reference to the node").create();
-  /*package*/ final ConceptDescriptor myConceptPrintSequenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b7db64fL)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).alias("#printSequence", "print size with link to usages view").create();
-  /*package*/ final ConceptDescriptor myConceptPrintTextExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintTextExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x7417cca3eb1feca9L)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).alias("#printText", "print as string").create();
-  /*package*/ final ConceptDescriptor myConceptProjectExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ProjectExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0xa721a59126bb908L)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#project", "the current project").create();
-  /*package*/ final ConceptDescriptor myConceptProjectScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ProjectScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("project", "").create();
-  /*package*/ final ConceptDescriptor myConceptQueryExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004132279624L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L), false, false, false)).children(new String[]{"parameter"}, new boolean[]{false}).abstract_().create();
-  /*package*/ final ConceptDescriptor myConceptQueryParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create();
-  /*package*/ final ConceptDescriptor myConceptQueryParameterIncludeReadOnly = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L)).super_("jetbrains.mps.console.blCommand.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.console.blCommand.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("r/o+", "include read only").create();
-  /*package*/ final ConceptDescriptor myConceptQueryParameterList = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryParameterList", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004141421222L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L), true, true, false)).children(new String[]{"parameter"}, new boolean[]{true}).alias("< .. >", "").create();
-  /*package*/ final ConceptDescriptor myConceptQueryParameterScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryParameterScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL)).super_("jetbrains.mps.console.blCommand.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.console.blCommand.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004134707081L, "value", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL), false, false, false)).children(new String[]{"value"}, new boolean[]{false}).alias("scope", "used search scope").create();
-  /*package*/ final ConceptDescriptor myConceptReferencesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ReferencesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#references", "all references in scope").create();
-  /*package*/ final ConceptDescriptor myConceptScopeParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ScopeParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create();
-  /*package*/ final ConceptDescriptor myConceptShowExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ShowExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(7600370246423275637L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).alias("#show", "show in usage view").create();
-  /*package*/ final ConceptDescriptor myConceptUsagesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.UsagesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963816172L, "node", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"node"}, new boolean[]{false}).alias("#usages", "direct references to a node in scope").create();
-  /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.WithStatement", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create();
-
-  @Override
-  public Collection<ConceptDescriptor> getDescriptors() {
-    return Arrays.asList(myConceptAbstractPrintExpression, myConceptBLCommand, myConceptBLExpression, myConceptConsoleExpression, myConceptConsoleOperation, myConceptCustomScope, myConceptExceptionHolder, myConceptGlobalScope, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptShowExpression, myConceptUsagesExpression, myConceptWithStatement);
-  }
-
-  @Override
-  @Nullable
-  public ConceptDescriptor getDescriptor(String conceptFqName) {
-    switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0jb, conceptFqName)) {
-      case 0:
-        return myConceptAbstractPrintExpression;
-      case 1:
-        return myConceptBLCommand;
-      case 2:
-        return myConceptBLExpression;
-      case 3:
-        return myConceptConsoleExpression;
-      case 4:
-        return myConceptConsoleOperation;
-      case 5:
-        return myConceptCustomScope;
-      case 6:
-        return myConceptExceptionHolder;
-      case 7:
-        return myConceptGlobalScope;
-      case 8:
-        return myConceptInstancesExpression;
-      case 9:
-        return myConceptModelScope;
-      case 10:
-        return myConceptModelsExpression;
-      case 11:
-        return myConceptModulesExpression;
-      case 12:
-        return myConceptModulesScope;
-      case 13:
-        return myConceptNodesExpression;
-      case 14:
-        return myConceptPrintExpression;
-      case 15:
-        return myConceptPrintNodeExpression;
-      case 16:
-        return myConceptPrintNodeReferenceExpression;
-      case 17:
-        return myConceptPrintSequenceExpression;
-      case 18:
-        return myConceptPrintTextExpression;
-      case 19:
-        return myConceptProjectExpression;
-      case 20:
-        return myConceptProjectScope;
-      case 21:
-        return myConceptQueryExpression;
-      case 22:
-        return myConceptQueryParameter;
-      case 23:
-        return myConceptQueryParameterIncludeReadOnly;
-      case 24:
-        return myConceptQueryParameterList;
-      case 25:
-        return myConceptQueryParameterScope;
-      case 26:
-        return myConceptReferencesExpression;
-      case 27:
-        return myConceptScopeParameter;
-      case 28:
-        return myConceptShowExpression;
-      case 29:
-        return myConceptUsagesExpression;
-      case 30:
-        return myConceptWithStatement;
-      default:
-        return null;
-    }
-  }
-  private static String[] stringSwitchCases_1htk8d_a0a0jb = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.BLCommand", "jetbrains.mps.console.blCommand.structure.BLExpression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression", "jetbrains.mps.console.blCommand.structure.ConsoleOperation", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.ExceptionHolder", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"};
-}
diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd
deleted file mode 100644
index db292b56875a..000000000000
--- a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.console.blCommand.runtime" uuid="7726760c-95f5-4242-b36a-e069417e9d94" pluginKind="PLUGIN_OTHER" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <sourcePath />
-  <dependencies>
-    <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
-    <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
-    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)</dependency>
-    <dependency reexport="false">de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)</dependency>
-    <dependency reexport="false">1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)</dependency>
-    <dependency reexport="false">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
-    <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
-    <dependency reexport="false">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
-    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="1" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" fqName="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
-    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" fqName="jetbrains.mps.console.base" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" fqName="jetbrains.mps.lang.pattern" version="0" />
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-  </languageVersions>
-</solution>
-
diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated
deleted file mode 100644
index 4bc04af21e92..000000000000
--- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="4irb781gmw1yq8kmn84ctth278uu4kv" />
-
diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info
deleted file mode 100644
index da41a01ba025..000000000000
--- a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<debug-info>
-  <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.Statement" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
-  <concept fqn="jetbrains.mps.baseLanguage.structure.TryCatchStatement" />
-  <root nodeRef="r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)/313482946808721508">
-    <file name="CommandUtil.java">
-      <node id="6322385757206087378" at="55,51,56,48" concept="5" />
-      <node id="1915462833256354217" at="63,55,64,49" concept="5" />
-      <node id="5348835480204269736" at="69,60,70,48" concept="5" />
-      <node id="5348835480204262779" at="73,62,74,30" concept="5" />
-      <node id="5348835480204364716" at="77,78,78,143" concept="5" />
-      <node id="7738379549910165782" at="81,90,82,131" concept="5" />
-      <node id="1125969196844503718" at="86,9,87,104" concept="1" />
-      <node id="7820875636627963753" at="89,41,90,66" concept="1" />
-      <node id="7600370246423004420" at="95,107,96,245" concept="4" />
-      <node id="7600370246423004426" at="96,245,97,175" concept="1" />
-      <node id="7600370246423004437" at="97,175,98,76" concept="1" />
-      <node id="7600370246423022285" at="98,76,99,37" concept="1" />
-      <node id="8627797991303080446" at="103,28,104,40" concept="1" />
-      <node id="7600370246426903881" at="107,30,108,45" concept="1" />
-      <node id="1125969196844644448" at="116,44,117,68" concept="4" />
-      <node id="8433118097516180044" at="119,52,120,72" concept="5" />
-      <node id="1125969196844650213" at="123,48,124,121" concept="1" />
-      <node id="1125969196844632110" at="126,11,127,19" concept="5" />
-      <node id="1125969196844733218" at="134,45,135,70" concept="4" />
-      <node id="8433118097516120579" at="137,53,138,72" concept="5" />
-      <node id="1125969196844733231" at="141,49,142,122" concept="1" />
-      <node id="1125969196844733244" at="144,11,145,19" concept="5" />
-      <node id="1125969196844733358" at="152,46,153,72" concept="4" />
-      <node id="8433118097516189970" at="155,54,156,72" concept="5" />
-      <node id="1125969196844733371" at="159,50,160,123" concept="1" />
-      <node id="1125969196844733384" at="162,11,163,19" concept="5" />
-      <node id="1597470200014094243" at="165,6,166,0" concept="6" />
-      <node id="3501374812263049616" at="169,62,170,37" concept="5" />
-      <node id="3501374812264201946" at="172,77,173,63" concept="5" />
-      <node id="3501374812263054977" at="175,66,176,38" concept="5" />
-      <node id="3501374812263057320" at="178,70,179,39" concept="5" />
-      <node id="2348043250037290191" at="182,76,183,245" concept="4" />
-      <node id="2348043250038028746" at="183,245,184,174" concept="1" />
-      <node id="2348043250037266919" at="184,174,185,26" concept="1" />
-      <node id="6558068108107683969" at="188,129,189,45" concept="4" />
-      <node id="6558068108107683974" at="189,45,190,55" concept="1" />
-      <node id="6558068108107682276" at="190,55,191,0" concept="6" />
-      <node id="6558068108108370769" at="191,0,192,251" concept="4" />
-      <node id="6558068108108373959" at="192,251,193,194" concept="1" />
-      <node id="6558068108108580762" at="193,194,194,201" concept="1" />
-      <node id="6558068108108409359" at="194,201,195,37" concept="1" />
-      <node id="5348835480204234277" at="198,148,199,90" concept="4" />
-      <node id="5348835480204239188" at="199,90,200,73" concept="5" />
-      <node id="1964420931776163294" at="203,55,204,34" concept="5" />
-      <node id="1964420931776193452" at="206,57,207,36" concept="5" />
-      <node id="1964420931776287150" at="209,68,210,54" concept="4" />
-      <node id="1964420931776266791" at="211,26,212,31" concept="5" />
-      <node id="1964420931776300221" at="213,5,214,115" concept="5" />
-      <node id="1964420931776202325" at="216,58,217,37" concept="5" />
-      <node id="313482946808721508" at="220,0,221,0" concept="7" trace="LOG" />
-      <node id="8655184070256908283" at="222,36,223,66" concept="5" />
-      <node id="8655184070256908283" at="224,5,225,16" concept="5" />
-      <node id="8433118097516181695" at="228,36,229,51" concept="5" />
-      <node id="8433118097516181695" at="230,5,231,16" concept="5" />
-      <node id="8433118097516065555" at="234,36,235,51" concept="5" />
-      <node id="8433118097516065555" at="236,5,237,16" concept="5" />
-      <node id="8433118097516122705" at="240,36,241,51" concept="5" />
-      <node id="8433118097516122705" at="242,5,243,16" concept="5" />
-      <node id="8433118097516066790" at="246,36,247,51" concept="5" />
-      <node id="8433118097516066790" at="248,5,249,16" concept="5" />
-      <node id="8433118097516192532" at="252,36,253,51" concept="5" />
-      <node id="8433118097516192532" at="254,5,255,16" concept="5" />
-      <node id="8433118097516068019" at="258,36,259,51" concept="5" />
-      <node id="8433118097516068019" at="260,5,261,16" concept="5" />
-      <node id="8433118097516021348" at="264,36,265,46" concept="5" />
-      <node id="8433118097516021348" at="266,5,267,16" concept="5" />
-      <node id="8433118097516021591" at="270,36,271,46" concept="5" />
-      <node id="8433118097516021591" at="272,5,273,16" concept="5" />
-      <node id="8433118097516021444" at="276,36,277,47" concept="5" />
-      <node id="8433118097516021444" at="278,5,279,16" concept="5" />
-      <node id="8433118097516021734" at="282,36,283,46" concept="5" />
-      <node id="8433118097516021734" at="284,5,285,16" concept="5" />
-      <node id="8433118097516022984" at="288,36,289,52" concept="5" />
-      <node id="8433118097516022984" at="290,5,291,16" concept="5" />
-      <node id="6322385757206087376" at="55,0,58,0" concept="3" trace="translate#(Lorg/jetbrains/mps/openapi/model/SModel;)Ljava/lang/Iterable;" />
-      <node id="1915462833256353669" at="63,0,66,0" concept="3" trace="translate#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/Iterable;" />
-      <node id="752693057586560909" at="69,0,72,0" concept="8" trace="models#(Lorg/jetbrains/mps/openapi/module/SearchScope;)Ljava/lang/Iterable;" />
-      <node id="752693057586786176" at="73,0,76,0" concept="8" trace="modules#(Lorg/jetbrains/mps/openapi/module/SearchScope;)Ljava/lang/Iterable;" />
-      <node id="7738379549905453304" at="77,0,80,0" concept="8" trace="usages#(Lorg/jetbrains/mps/openapi/module/SearchScope;Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/util/Collection;" />
-      <node id="7738379549910165780" at="81,0,84,0" concept="8" trace="instances#(Lorg/jetbrains/mps/openapi/module/SearchScope;Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/util/Collection;" />
-      <node id="7820875636627963753" at="88,27,91,7" concept="0" />
-      <node id="7820875636627963753" at="88,27,91,7" concept="2" />
-      <node id="328850564587494307" at="107,0,110,0" concept="3" trace="invoke#()V" />
-      <node id="8433118097516179211" at="119,0,122,0" concept="3" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNodeReference;)Z" />
-      <node id="1125969196844649929" at="123,0,126,0" concept="3" trace="visit#(Lorg/jetbrains/mps/openapi/model/SNodeReference;)V" />
-      <node id="8433118097516119746" at="137,0,140,0" concept="3" trace="accept#(Lorg/jetbrains/mps/openapi/model/SModelReference;)Z" />
-      <node id="1125969196844733229" at="141,0,144,0" concept="3" trace="visit#(Lorg/jetbrains/mps/openapi/model/SModelReference;)V" />
-      <node id="8433118097516189137" at="155,0,158,0" concept="3" trace="accept#(Lorg/jetbrains/mps/openapi/module/SModuleReference;)Z" />
-      <node id="1125969196844733369" at="159,0,162,0" concept="3" trace="visit#(Lorg/jetbrains/mps/openapi/module/SModuleReference;)V" />
-      <node id="3501374812263258755" at="169,0,172,0" concept="8" trace="getNodeReference#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNodeReference;" />
-      <node id="3501374812263262593" at="172,0,175,0" concept="8" trace="getReferenceReference#(Lorg/jetbrains/mps/openapi/model/SReference;)Lorg/jetbrains/mps/openapi/model/SNodeReference;" />
-      <node id="3501374812263265578" at="175,0,178,0" concept="8" trace="getModelReference#(Lorg/jetbrains/mps/openapi/model/SModel;)Lorg/jetbrains/mps/openapi/model/SModelReference;" />
-      <node id="3501374812263268620" at="178,0,181,0" concept="8" trace="getModuleReference#(Lorg/jetbrains/mps/openapi/module/SModule;)Lorg/jetbrains/mps/openapi/module/SModuleReference;" />
-      <node id="1964420931776160132" at="203,0,206,0" concept="8" trace="createScope#(Lorg/jetbrains/mps/openapi/model/SModel;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
-      <node id="1964420931776193450" at="206,0,209,0" concept="8" trace="createScope#(Lorg/jetbrains/mps/openapi/module/SModule;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
-      <node id="1964420931776263498" at="210,54,213,5" concept="2" />
-      <node id="1964420931776202323" at="216,0,219,0" concept="8" trace="createScope#(Ljetbrains/mps/project/Project;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
-      <node id="8655184070256908283" at="221,110,224,5" concept="2" />
-      <node id="8433118097516181695" at="227,111,230,5" concept="2" />
-      <node id="8433118097516065555" at="233,113,236,5" concept="2" />
-      <node id="8433118097516122705" at="239,113,242,5" concept="2" />
-      <node id="8433118097516066790" at="245,115,248,5" concept="2" />
-      <node id="8433118097516192532" at="251,115,254,5" concept="2" />
-      <node id="8433118097516068019" at="257,117,260,5" concept="2" />
-      <node id="8433118097516021348" at="263,77,266,5" concept="2" />
-      <node id="8433118097516021591" at="269,77,272,5" concept="2" />
-      <node id="8433118097516021444" at="275,74,278,5" concept="2" />
-      <node id="8433118097516021734" at="281,79,284,5" concept="2" />
-      <node id="8433118097516022984" at="287,81,290,5" concept="2" />
-      <node id="4307205004142786686" at="198,0,202,0" concept="8" trace="createConsoleScope#(Lorg/jetbrains/mps/openapi/module/SearchScope;ZLjetbrains/mps/console/tool/ConsoleContext;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
-      <node id="3820104862372919953" at="53,58,58,7" concept="5" />
-      <node id="6864030874026229328" at="61,68,66,7" concept="5" />
-      <node id="8627797991303084740" at="105,12,110,49" concept="1" />
-      <node id="2348043250037244792" at="182,0,187,0" concept="8" trace="addNodeReference#(Ljetbrains/mps/console/tool/ConsoleStream;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7600370246426607093" at="95,0,101,0" concept="8" trace="printClosure#(Ljetbrains/mps/console/tool/ConsoleStream;Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_void_P0_E0;Ljava/lang/String;)V" />
-      <node id="8627797991303082080" at="105,10,111,5" concept="0" />
-      <node id="8655184070256908283" at="221,0,227,0" concept="8" trace="check_1pinza_a0a0a0n#(Lcom/intellij/openapi/project/Project;)Ljetbrains/mps/ide/findusages/view/UsagesViewTool;" />
-      <node id="8433118097516181695" at="227,0,233,0" concept="8" trace="check_1pinza_a0a0a0a0b0a0a91#(Lorg/jetbrains/mps/openapi/model/SNodeReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="8433118097516065555" at="233,0,239,0" concept="8" trace="check_1pinza_a0a0a0a0a0b0a0a91#(Lorg/jetbrains/mps/openapi/model/SNodeReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="8433118097516122705" at="239,0,245,0" concept="8" trace="check_1pinza_a0a0a0a0b0a0a12#(Lorg/jetbrains/mps/openapi/model/SModelReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SModel;" />
-      <node id="8433118097516066790" at="245,0,251,0" concept="8" trace="check_1pinza_a0a0a0a0a0b0a0a12#(Lorg/jetbrains/mps/openapi/model/SModelReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SModel;" />
-      <node id="8433118097516192532" at="251,0,257,0" concept="8" trace="check_1pinza_a0a0a0a0b0a0a32#(Lorg/jetbrains/mps/openapi/module/SModuleReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/module/SModule;" />
-      <node id="8433118097516068019" at="257,0,263,0" concept="8" trace="check_1pinza_a0a0a0a0a0b0a0a32#(Lorg/jetbrains/mps/openapi/module/SModuleReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/module/SModule;" />
-      <node id="8433118097516021348" at="263,0,269,0" concept="8" trace="check_1pinza_a0a52#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNodeReference;" />
-      <node id="8433118097516021591" at="269,0,275,0" concept="8" trace="check_1pinza_a0a62#(Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNodeReference;" />
-      <node id="8433118097516021444" at="275,0,281,0" concept="8" trace="check_1pinza_a0a0ab#(Lorg/jetbrains/mps/openapi/model/SReference;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="8433118097516021734" at="281,0,287,0" concept="8" trace="check_1pinza_a0a72#(Lorg/jetbrains/mps/openapi/model/SModel;)Lorg/jetbrains/mps/openapi/model/SModelReference;" />
-      <node id="8433118097516022984" at="287,0,293,0" concept="8" trace="check_1pinza_a0a82#(Lorg/jetbrains/mps/openapi/module/SModule;)Lorg/jetbrains/mps/openapi/module/SModuleReference;" />
-      <node id="313482946808721597" at="53,0,60,0" concept="8" trace="nodes#(Lorg/jetbrains/mps/openapi/module/SearchScope;)Ljava/lang/Iterable;" />
-      <node id="1915462833256325237" at="61,0,68,0" concept="8" trace="references#(Lorg/jetbrains/mps/openapi/module/SearchScope;)Ljava/lang/Iterable;" />
-      <node id="7820875636627959262" at="85,101,92,5" concept="9" />
-      <node id="1964420931776186920" at="209,0,216,0" concept="8" trace="createScope#(Ljava/lang/Iterable;)Lorg/jetbrains/mps/openapi/module/SearchScope;" />
-      <node id="1125969196844614696" at="85,0,94,0" concept="8" trace="show#(Ljetbrains/mps/project/Project;Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;)V" />
-      <node id="8627797991303072799" at="102,195,111,5" concept="2" />
-      <node id="1125969196844645054" at="117,68,126,11" concept="1" />
-      <node id="1125969196844733225" at="135,70,144,11" concept="1" />
-      <node id="1125969196844733365" at="153,72,162,11" concept="1" />
-      <node id="2699636778862353917" at="188,0,197,0" concept="8" trace="registerAnalyzeStacktraceDialogClosure#(Ljetbrains/mps/console/tool/ConsoleContext;Ljetbrains/mps/console/tool/ConsoleStream;Ljava/lang/Throwable;)V" />
-      <node id="9010839353952056869" at="102,0,113,0" concept="8" trace="printSequence#(Ljetbrains/mps/console/tool/ConsoleStream;Ljetbrains/mps/project/Project;Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;ILjava/lang/String;)V" />
-      <node id="1597470200014229947" at="116,0,129,0" concept="3" trace="invoke#()Ljetbrains/mps/ide/findusages/model/SearchResults;" />
-      <node id="1597470200014090902" at="134,0,147,0" concept="3" trace="invoke#()Ljetbrains/mps/ide/findusages/model/SearchResults;" />
-      <node id="1597470200014094812" at="152,0,165,0" concept="3" trace="invoke#()Ljetbrains/mps/ide/findusages/model/SearchResults;" />
-      <node id="1597470200014229951" at="114,154,129,6" concept="5" />
-      <node id="1597470200014090906" at="132,157,147,6" concept="5" />
-      <node id="1597470200014094811" at="150,160,165,6" concept="5" />
-      <node id="1125969196844631948" at="114,0,131,0" concept="8" trace="nodesToResults#(Ljava/lang/Iterable;Lorg/jetbrains/mps/openapi/module/SRepository;)Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;" />
-      <node id="1125969196844632137" at="132,0,149,0" concept="8" trace="modelsToResults#(Ljava/lang/Iterable;Lorg/jetbrains/mps/openapi/module/SRepository;)Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;" />
-      <node id="1125969196844632254" at="150,0,168,0" concept="8" trace="modulesToResults#(Ljava/lang/Iterable;Lorg/jetbrains/mps/openapi/module/SRepository;)Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;" />
-      <scope id="6322385757206087377" at="55,51,56,48" />
-      <scope id="1915462833256353670" at="63,55,64,49" />
-      <scope id="752693057586560912" at="69,60,70,48" />
-      <scope id="752693057586786179" at="73,62,74,30" />
-      <scope id="7738379549905453307" at="77,78,78,143" />
-      <scope id="7738379549910165781" at="81,90,82,131" />
-      <scope id="7820875636627959264" at="86,9,87,104" />
-      <scope id="7820875636627963753" at="89,41,90,66" />
-      <scope id="8627797991303072802" at="103,28,104,40" />
-      <scope id="328850564587494309" at="107,30,108,45" />
-      <scope id="8433118097516179212" at="119,52,120,72" />
-      <scope id="1125969196844649930" at="123,48,124,121" />
-      <scope id="8433118097516119747" at="137,53,138,72" />
-      <scope id="1125969196844733230" at="141,49,142,122" />
-      <scope id="8433118097516189138" at="155,54,156,72" />
-      <scope id="1125969196844733370" at="159,50,160,123" />
-      <scope id="3501374812263049615" at="169,62,170,37" />
-      <scope id="3501374812263040859" at="172,77,173,63" />
-      <scope id="3501374812263054976" at="175,66,176,38" />
-      <scope id="3501374812263057319" at="178,70,179,39" />
-      <scope id="1964420931776160133" at="203,55,204,34" />
-      <scope id="1964420931776193451" at="206,57,207,36" />
-      <scope id="1964420931776263500" at="211,26,212,31" />
-      <scope id="1964420931776202324" at="216,58,217,37" />
-      <scope id="8655184070256908283" at="222,36,223,66" />
-      <scope id="8433118097516181695" at="228,36,229,51" />
-      <scope id="8433118097516065555" at="234,36,235,51" />
-      <scope id="8433118097516122705" at="240,36,241,51" />
-      <scope id="8433118097516066790" at="246,36,247,51" />
-      <scope id="8433118097516192532" at="252,36,253,51" />
-      <scope id="8433118097516068019" at="258,36,259,51" />
-      <scope id="8433118097516021348" at="264,36,265,46" />
-      <scope id="8433118097516021591" at="270,36,271,46" />
-      <scope id="8433118097516021444" at="276,36,277,47" />
-      <scope id="8433118097516021734" at="282,36,283,46" />
-      <scope id="8433118097516022984" at="288,36,289,52" />
-      <scope id="4307205004142746594" at="198,148,200,73">
-        <var name="scope" id="5348835480204234278" />
-      </scope>
-      <scope id="6322385757206087376" at="55,0,58,0">
-        <var name="it" id="6322385757206087376" />
-      </scope>
-      <scope id="1915462833256353669" at="63,0,66,0">
-        <var name="it" id="1915462833256353669" />
-      </scope>
-      <scope id="752693057586560909" at="69,0,72,0">
-        <var name="scope" id="8030615961116887658" />
-      </scope>
-      <scope id="752693057586786176" at="73,0,76,0">
-        <var name="scope" id="752693057586789742" />
-      </scope>
-      <scope id="7738379549905453304" at="77,0,80,0">
-        <var name="node" id="7738379549905453607" />
-        <var name="scope" id="7738379549905453557" />
-      </scope>
-      <scope id="7738379549910165780" at="81,0,84,0">
-        <var name="concept" id="7738379549910165797" />
-        <var name="scope" id="7738379549910165795" />
-      </scope>
-      <scope id="7820875636627959265" at="88,0,91,7">
-        <var name="e" id="7820875636627959267" />
-      </scope>
-      <scope id="7820875636627959271" at="88,27,91,7" />
-      <scope id="7820875636627963753" at="88,27,91,7" />
-      <scope id="328850564587494307" at="107,0,110,0" />
-      <scope id="8433118097516179211" at="119,0,122,0">
-        <var name="it" id="8433118097516179211" />
-      </scope>
-      <scope id="1125969196844649929" at="123,0,126,0">
-        <var name="it" id="1125969196844649929" />
-      </scope>
-      <scope id="8433118097516119746" at="137,0,140,0">
-        <var name="it" id="8433118097516119746" />
-      </scope>
-      <scope id="1125969196844733229" at="141,0,144,0">
-        <var name="it" id="1125969196844733229" />
-      </scope>
-      <scope id="8433118097516189137" at="155,0,158,0">
-        <var name="it" id="8433118097516189137" />
-      </scope>
-      <scope id="1125969196844733369" at="159,0,162,0">
-        <var name="it" id="1125969196844733369" />
-      </scope>
-      <scope id="3501374812263258755" at="169,0,172,0">
-        <var name="aNode" id="3501374812263049623" />
-      </scope>
-      <scope id="3501374812263262593" at="172,0,175,0">
-        <var name="aReference" id="3501374812263043791" />
-      </scope>
-      <scope id="3501374812263265578" at="175,0,178,0">
-        <var name="aModel" id="3501374812263054984" />
-      </scope>
-      <scope id="3501374812263268620" at="178,0,181,0">
-        <var name="aModule" id="3501374812263057327" />
-      </scope>
-      <scope id="2348043250037244795" at="182,76,185,26">
-        <var name="node" id="2348043250037290194" />
-      </scope>
-      <scope id="1964420931776160132" at="203,0,206,0">
-        <var name="model" id="1964420931776162620" />
-      </scope>
-      <scope id="1964420931776193450" at="206,0,209,0">
-        <var name="module" id="1964420931776193458" />
-      </scope>
-      <scope id="1964420931776202323" at="216,0,219,0">
-        <var name="project" id="1964420931776202331" />
-      </scope>
-      <scope id="7600370246426607096" at="95,107,99,37">
-        <var name="nodeWithClosure" id="7600370246423004421" />
-      </scope>
-      <scope id="4307205004142786686" at="198,0,202,0">
-        <var name="baseScope" id="4307205004142749181" />
-        <var name="context" id="4307205004143739297" />
-        <var name="includeReadOnly" id="4307205004142749928" />
-      </scope>
-      <scope id="8655184070256908283" at="221,110,225,16" />
-      <scope id="8433118097516181695" at="227,111,231,16" />
-      <scope id="8433118097516065555" at="233,113,237,16" />
-      <scope id="8433118097516122705" at="239,113,243,16" />
-      <scope id="8433118097516066790" at="245,115,249,16" />
-      <scope id="8433118097516192532" at="251,115,255,16" />
-      <scope id="8433118097516068019" at="257,117,261,16" />
-      <scope id="8433118097516021348" at="263,77,267,16" />
-      <scope id="8433118097516021591" at="269,77,273,16" />
-      <scope id="8433118097516021444" at="275,74,279,16" />
-      <scope id="8433118097516021734" at="281,79,285,16" />
-      <scope id="8433118097516022984" at="287,81,291,16" />
-      <scope id="313482946808721586" at="53,58,58,7" />
-      <scope id="1915462833256325240" at="61,68,66,7" />
-      <scope id="8627797991303082081" at="105,12,110,49" />
-      <scope id="2348043250037244792" at="182,0,187,0">
-        <var name="console" id="2348043250037266070" />
-        <var name="target" id="2348043250037246335" />
-      </scope>
-      <scope id="1964420931776186921" at="209,68,214,115">
-        <var name="it" id="1964420931776287151" />
-      </scope>
-      <scope id="7600370246426607093" at="95,0,101,0">
-        <var name="closure" id="7600370246426637725" />
-        <var name="console" id="7600370246426628933" />
-        <var name="text" id="7600370246426662642" />
-      </scope>
-      <scope id="8655184070256908283" at="221,0,227,0">
-        <var name="checkedDotOperand" id="8655184070256908283" />
-      </scope>
-      <scope id="8433118097516181695" at="227,0,233,0">
-        <var name="checkedDotOperand" id="8433118097516181695" />
-        <var name="repository" id="8433118097516181695" />
-      </scope>
-      <scope id="8433118097516065555" at="233,0,239,0">
-        <var name="checkedDotOperand" id="8433118097516065555" />
-        <var name="repository" id="8433118097516065555" />
-      </scope>
-      <scope id="8433118097516122705" at="239,0,245,0">
-        <var name="checkedDotOperand" id="8433118097516122705" />
-        <var name="repository" id="8433118097516122705" />
-      </scope>
-      <scope id="8433118097516066790" at="245,0,251,0">
-        <var name="checkedDotOperand" id="8433118097516066790" />
-        <var name="repository" id="8433118097516066790" />
-      </scope>
-      <scope id="8433118097516192532" at="251,0,257,0">
-        <var name="checkedDotOperand" id="8433118097516192532" />
-        <var name="repository" id="8433118097516192532" />
-      </scope>
-      <scope id="8433118097516068019" at="257,0,263,0">
-        <var name="checkedDotOperand" id="8433118097516068019" />
-        <var name="repository" id="8433118097516068019" />
-      </scope>
-      <scope id="8433118097516021348" at="263,0,269,0">
-        <var name="checkedDotOperand" id="8433118097516021348" />
-      </scope>
-      <scope id="8433118097516021591" at="269,0,275,0">
-        <var name="checkedDotOperand" id="8433118097516021591" />
-      </scope>
-      <scope id="8433118097516021444" at="275,0,281,0">
-        <var name="checkedDotOperand" id="8433118097516021444" />
-      </scope>
-      <scope id="8433118097516021734" at="281,0,287,0">
-        <var name="checkedDotOperand" id="8433118097516021734" />
-      </scope>
-      <scope id="8433118097516022984" at="287,0,293,0">
-        <var name="checkedDotOperand" id="8433118097516022984" />
-      </scope>
-      <scope id="313482946808721597" at="53,0,60,0">
-        <var name="scope" id="8030615961116951985" />
-      </scope>
-      <scope id="1915462833256325237" at="61,0,68,0">
-        <var name="scope" id="8030615961116973438" />
-      </scope>
-      <scope id="1125969196844503566" at="85,101,92,5" />
-      <scope id="2699636778862353920" at="188,129,195,37">
-        <var name="exceptionHolder" id="6558068108108370772" />
-        <var name="writer" id="6558068108107683970" />
-      </scope>
-      <scope id="1964420931776186920" at="209,0,216,0">
-        <var name="modelsAndModules" id="1964420931776186928" />
-      </scope>
-      <scope id="1125969196844614696" at="85,0,94,0">
-        <var name="p" id="1125969196844503638" />
-        <var name="results" id="1125969196844503650" />
-      </scope>
-      <scope id="9010839353952056872" at="102,195,111,5" />
-      <scope id="2699636778862353917" at="188,0,197,0">
-        <var name="console" id="2699636778862397633" />
-        <var name="context" id="2699636778862391409" />
-        <var name="exception" id="2699636778862408377" />
-      </scope>
-      <scope id="9010839353952056869" at="102,0,113,0">
-        <var name="console" id="9010839353952385979" />
-        <var name="project" id="9010839353952403934" />
-        <var name="resultDescription" id="9010839353952432657" />
-        <var name="results" id="9010839353952414816" />
-        <var name="resultsCount" id="9010839353952422879" />
-      </scope>
-      <scope id="1597470200014229949" at="116,44,127,19">
-        <var name="res" id="1125969196844644449" />
-      </scope>
-      <scope id="1597470200014090904" at="134,45,145,19">
-        <var name="res" id="1125969196844733219" />
-      </scope>
-      <scope id="1597470200014094813" at="152,46,163,19">
-        <var name="res" id="1125969196844733359" />
-      </scope>
-      <scope id="1597470200014229947" at="116,0,129,0" />
-      <scope id="1597470200014090902" at="134,0,147,0" />
-      <scope id="1597470200014094812" at="152,0,165,0" />
-      <scope id="1125969196844631951" at="114,154,129,6" />
-      <scope id="1125969196844632138" at="132,157,147,6" />
-      <scope id="1125969196844632255" at="150,160,166,0" />
-      <scope id="1125969196844631948" at="114,0,131,0">
-        <var name="nodes" id="1125969196844632046" />
-        <var name="repository" id="3501374812260708327" />
-      </scope>
-      <scope id="1125969196844632137" at="132,0,149,0">
-        <var name="models" id="1125969196844632143" />
-        <var name="repository" id="3501374812260691176" />
-      </scope>
-      <scope id="1125969196844632254" at="150,0,168,0">
-        <var name="modules" id="1125969196844632260" />
-        <var name="repository" id="3501374812260697537" />
-      </scope>
-      <unit id="6322385757206087376" at="54,62,58,5" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$1" />
-      <unit id="1915462833256353669" at="62,61,66,5" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$2" />
-      <unit id="328850564587494307" at="106,44,110,7" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$3" />
-      <unit id="8433118097516179211" at="118,47,122,9" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$5" />
-      <unit id="1125969196844649929" at="122,24,126,9" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$5" />
-      <unit id="8433118097516119746" at="136,48,140,9" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$6" />
-      <unit id="1125969196844733229" at="140,24,144,9" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$6" />
-      <unit id="8433118097516189137" at="154,49,158,9" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$7" />
-      <unit id="1125969196844733369" at="158,24,162,9" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$7" />
-      <unit id="1597470200014229947" at="115,15,129,5" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$4" />
-      <unit id="1597470200014090902" at="133,15,147,5" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$5" />
-      <unit id="1597470200014094812" at="151,15,165,5" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil$6" />
-      <unit id="313482946808721508" at="51,0,294,0" name="jetbrains.mps.console.blCommand.runtime.util.CommandUtil" />
-    </file>
-  </root>
-</debug-info>
-
diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated
index 9eb1eb256040..fa529bfaf11b 100644
--- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated
+++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="5zjh8wv9sgw5baiaoc6eqccs08ysyyc" />
+<dependencies version="2" modelHash="-304167y9aw91kacuiuf63cvafu8c774" />
 
diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java
index e03ccdbec8a6..4f626035153e 100644
--- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java
+++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java
@@ -58,18 +58,41 @@ public static Object referenceMacro_GetReferent_5582028874769201330(final Refere
   public static Object referenceMacro_GetReferent_5582028874769201340(final ReferenceMacroContext _context) {
     return BehaviorReflection.invokeVirtual((Class<SNode>) ((Class) Object.class), _context.getNode(), "virtual_getParameterDeclaration_5582028874769074473", new Object[]{});
   }
-  public static Object referenceMacro_GetReferent_5582028874771857731(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_5308946314782030193(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
-  public static Object referenceMacro_GetReferent_5308946314782036448(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
   public static Object referenceMacro_GetReferent_5932042262276049107(final ReferenceMacroContext _context) {
     return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getReferenceLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x5252d9021b8b45a8L, 0x5252d9021b8c25b0L, "requestedAspect"));
   }
+  public static Object referenceMacro_GetReferent_1095064659819954416(final ReferenceMacroContext _context) {
+    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")));
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a31())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263258755");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a31())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263262593");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a31())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263265578");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a31())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263268620");
+    }
+    return null;
+  }
+  public static Object referenceMacro_GetReferent_1095064659819954476(final ReferenceMacroContext _context) {
+    SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")));
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a41())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844631948");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a41())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844631948");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a41())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844632137");
+    }
+    if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a41())) {
+      return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844632254");
+    }
+    return null;
+  }
   public static boolean ifMacro_Condition_4615018937607135820(final IfMacroContext _context) {
     return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL, 0x276b371e77c0a2f0L, "argument")) != null;
   }
@@ -115,6 +138,9 @@ public static SNode sourceNodeQuery_4615018937607279093(final SourceSubstituteMa
   public static SNode sourceNodeQuery_4615018937607279112(final SourceSubstituteMacroNodeContext _context) {
     return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL, 0x276b371e77c0a2f0L, "argument"));
   }
+  public static SNode sourceNodeQuery_1095064659819954403(final SourceSubstituteMacroNodeContext _context) {
+    return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"));
+  }
   public static Iterable<SNode> sourceNodesQuery_5582028874769201358(final SourceSubstituteMacroNodesContext _context) {
     return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587adL, 0x4d7759afce9587afL, "parameter"));
   }
@@ -182,4 +208,78 @@ private static SNode _quotation_createNode_x583g4_b0a0a7() {
     quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
     return quotedNode_1;
   }
+  private static SNode _quotation_createNode_x583g4_b0a1a31() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a2a31() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a3a31() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a4a31() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a1a41() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a2a41() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a3a41() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false);
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
+  private static SNode _quotation_createNode_x583g4_b0a4a41() {
+    PersistenceFacade facade = PersistenceFacade.getInstance();
+    SNode quotedNode_1 = null;
+    SNode quotedNode_2 = null;
+    quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false);
+    quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false);
+    quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule")));
+    quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2);
+    return quotedNode_1;
+  }
 }
diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info
index ddd64bfdaf12..004c1f44a2f1 100644
--- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info
+++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info
@@ -2,248 +2,445 @@
 <debug-info>
   <concept fqn="jetbrains.mps.baseLanguage.structure.BlockStatement" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
+  <concept fqn="jetbrains.mps.baseLanguage.structure.IfStatement" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
   <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
   <root>
     <file name="QueriesGenerated.java">
-      <unit at="23,0,186,0" name="jetbrains.mps.console.ideCommands.generator.template.main.QueriesGenerated" />
+      <unit at="23,0,286,0" name="jetbrains.mps.console.ideCommands.generator.template.main.QueriesGenerated" />
+    </file>
+  </root>
+  <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/1125969196844485895">
+    <file name="QueriesGenerated.java">
+      <node id="1095064659819954418" at="64,109,65,233" concept="3" />
+      <node id="1095064659819954428" at="66,114,67,130" concept="4" />
+      <node id="1095064659819954438" at="69,114,70,130" concept="4" />
+      <node id="1095064659819954448" at="72,114,73,130" concept="4" />
+      <node id="1095064659819954458" at="75,114,76,130" concept="4" />
+      <node id="1095064659819954466" at="77,5,78,16" concept="4" />
+      <node id="1095064659819954478" at="80,109,81,233" concept="3" />
+      <node id="1095064659819954488" at="82,114,83,130" concept="4" />
+      <node id="1095064659819954498" at="85,114,86,130" concept="4" />
+      <node id="1095064659819954508" at="88,114,89,130" concept="4" />
+      <node id="1095064659819954518" at="91,114,92,130" concept="4" />
+      <node id="1095064659819954526" at="93,5,94,16" concept="4" />
+      <node id="1095064659819954405" at="141,108,142,190" concept="4" />
+      <node id="1095064659819954433" at="211,63,212,63" concept="3" />
+      <node id="1095064659819954433" at="212,63,213,30" concept="3" />
+      <node id="1095064659819954433" at="213,30,214,30" concept="3" />
+      <node id="1095064659819954433" at="214,30,215,237" concept="1" />
+      <node id="1095064659819954433" at="215,237,216,221" concept="1" />
+      <node id="1095064659819954433" at="216,221,217,168" concept="1" />
+      <node id="1095064659819954433" at="217,168,218,24" concept="4" />
+      <node id="1095064659819954443" at="220,63,221,63" concept="3" />
+      <node id="1095064659819954443" at="221,63,222,30" concept="3" />
+      <node id="1095064659819954443" at="222,30,223,30" concept="3" />
+      <node id="1095064659819954443" at="223,30,224,237" concept="1" />
+      <node id="1095064659819954443" at="224,237,225,231" concept="1" />
+      <node id="1095064659819954443" at="225,231,226,168" concept="1" />
+      <node id="1095064659819954443" at="226,168,227,24" concept="4" />
+      <node id="1095064659819954453" at="229,63,230,63" concept="3" />
+      <node id="1095064659819954453" at="230,63,231,30" concept="3" />
+      <node id="1095064659819954453" at="231,30,232,30" concept="3" />
+      <node id="1095064659819954453" at="232,30,233,237" concept="1" />
+      <node id="1095064659819954453" at="233,237,234,222" concept="1" />
+      <node id="1095064659819954453" at="234,222,235,168" concept="1" />
+      <node id="1095064659819954453" at="235,168,236,24" concept="4" />
+      <node id="1095064659819954463" at="238,63,239,63" concept="3" />
+      <node id="1095064659819954463" at="239,63,240,30" concept="3" />
+      <node id="1095064659819954463" at="240,30,241,30" concept="3" />
+      <node id="1095064659819954463" at="241,30,242,237" concept="1" />
+      <node id="1095064659819954463" at="242,237,243,227" concept="1" />
+      <node id="1095064659819954463" at="243,227,244,467" concept="1" />
+      <node id="1095064659819954463" at="244,467,245,168" concept="1" />
+      <node id="1095064659819954463" at="245,168,246,24" concept="4" />
+      <node id="1095064659819954493" at="248,63,249,63" concept="3" />
+      <node id="1095064659819954493" at="249,63,250,30" concept="3" />
+      <node id="1095064659819954493" at="250,30,251,30" concept="3" />
+      <node id="1095064659819954493" at="251,30,252,237" concept="1" />
+      <node id="1095064659819954493" at="252,237,253,221" concept="1" />
+      <node id="1095064659819954493" at="253,221,254,168" concept="1" />
+      <node id="1095064659819954493" at="254,168,255,24" concept="4" />
+      <node id="1095064659819954503" at="257,63,258,63" concept="3" />
+      <node id="1095064659819954503" at="258,63,259,30" concept="3" />
+      <node id="1095064659819954503" at="259,30,260,30" concept="3" />
+      <node id="1095064659819954503" at="260,30,261,237" concept="1" />
+      <node id="1095064659819954503" at="261,237,262,231" concept="1" />
+      <node id="1095064659819954503" at="262,231,263,168" concept="1" />
+      <node id="1095064659819954503" at="263,168,264,24" concept="4" />
+      <node id="1095064659819954513" at="266,63,267,63" concept="3" />
+      <node id="1095064659819954513" at="267,63,268,30" concept="3" />
+      <node id="1095064659819954513" at="268,30,269,30" concept="3" />
+      <node id="1095064659819954513" at="269,30,270,237" concept="1" />
+      <node id="1095064659819954513" at="270,237,271,222" concept="1" />
+      <node id="1095064659819954513" at="271,222,272,168" concept="1" />
+      <node id="1095064659819954513" at="272,168,273,24" concept="4" />
+      <node id="1095064659819954523" at="275,63,276,63" concept="3" />
+      <node id="1095064659819954523" at="276,63,277,30" concept="3" />
+      <node id="1095064659819954523" at="277,30,278,30" concept="3" />
+      <node id="1095064659819954523" at="278,30,279,237" concept="1" />
+      <node id="1095064659819954523" at="279,237,280,227" concept="1" />
+      <node id="1095064659819954523" at="280,227,281,467" concept="1" />
+      <node id="1095064659819954523" at="281,467,282,168" concept="1" />
+      <node id="1095064659819954523" at="282,168,283,24" concept="4" />
+      <node id="1095064659819954433" at="215,237,217,168" concept="0" />
+      <node id="1095064659819954433" at="215,237,217,168" concept="0" />
+      <node id="1095064659819954443" at="224,237,226,168" concept="0" />
+      <node id="1095064659819954443" at="224,237,226,168" concept="0" />
+      <node id="1095064659819954453" at="233,237,235,168" concept="0" />
+      <node id="1095064659819954453" at="233,237,235,168" concept="0" />
+      <node id="1095064659819954493" at="252,237,254,168" concept="0" />
+      <node id="1095064659819954493" at="252,237,254,168" concept="0" />
+      <node id="1095064659819954503" at="261,237,263,168" concept="0" />
+      <node id="1095064659819954503" at="261,237,263,168" concept="0" />
+      <node id="1095064659819954513" at="270,237,272,168" concept="0" />
+      <node id="1095064659819954513" at="270,237,272,168" concept="0" />
+      <node id="1095064659819954426" at="65,233,68,5" concept="2" />
+      <node id="1095064659819954436" at="68,5,71,5" concept="2" />
+      <node id="1095064659819954446" at="71,5,74,5" concept="2" />
+      <node id="1095064659819954456" at="74,5,77,5" concept="2" />
+      <node id="1095064659819954486" at="81,233,84,5" concept="2" />
+      <node id="1095064659819954496" at="84,5,87,5" concept="2" />
+      <node id="1095064659819954506" at="87,5,90,5" concept="2" />
+      <node id="1095064659819954516" at="90,5,93,5" concept="2" />
+      <node id="1095064659819954433" at="214,30,217,168" concept="0" />
+      <node id="1095064659819954433" at="214,30,217,168" concept="0" />
+      <node id="1095064659819954443" at="223,30,226,168" concept="0" />
+      <node id="1095064659819954443" at="223,30,226,168" concept="0" />
+      <node id="1095064659819954453" at="232,30,235,168" concept="0" />
+      <node id="1095064659819954453" at="232,30,235,168" concept="0" />
+      <node id="1095064659819954463" at="242,237,245,168" concept="0" />
+      <node id="1095064659819954463" at="242,237,245,168" concept="0" />
+      <node id="1095064659819954493" at="251,30,254,168" concept="0" />
+      <node id="1095064659819954493" at="251,30,254,168" concept="0" />
+      <node id="1095064659819954503" at="260,30,263,168" concept="0" />
+      <node id="1095064659819954503" at="260,30,263,168" concept="0" />
+      <node id="1095064659819954513" at="269,30,272,168" concept="0" />
+      <node id="1095064659819954513" at="269,30,272,168" concept="0" />
+      <node id="1095064659819954523" at="279,237,282,168" concept="0" />
+      <node id="1095064659819954523" at="279,237,282,168" concept="0" />
+      <node id="1095064659819954463" at="241,30,245,168" concept="0" />
+      <node id="1095064659819954463" at="241,30,245,168" concept="0" />
+      <node id="1095064659819954523" at="278,30,282,168" concept="0" />
+      <node id="1095064659819954523" at="278,30,282,168" concept="0" />
+      <node id="1095064659819954433" at="211,0,220,0" concept="5" trace="_quotation_createNode_x583g4_b0a1a31#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1095064659819954443" at="220,0,229,0" concept="5" trace="_quotation_createNode_x583g4_b0a2a31#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1095064659819954453" at="229,0,238,0" concept="5" trace="_quotation_createNode_x583g4_b0a3a31#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1095064659819954493" at="248,0,257,0" concept="5" trace="_quotation_createNode_x583g4_b0a1a41#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1095064659819954503" at="257,0,266,0" concept="5" trace="_quotation_createNode_x583g4_b0a2a41#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1095064659819954513" at="266,0,275,0" concept="5" trace="_quotation_createNode_x583g4_b0a3a41#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1095064659819954463" at="238,0,248,0" concept="5" trace="_quotation_createNode_x583g4_b0a4a31#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1095064659819954523" at="275,0,285,0" concept="5" trace="_quotation_createNode_x583g4_b0a4a41#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="1095064659819954427" at="66,114,67,130" />
+      <scope id="1095064659819954437" at="69,114,70,130" />
+      <scope id="1095064659819954447" at="72,114,73,130" />
+      <scope id="1095064659819954457" at="75,114,76,130" />
+      <scope id="1095064659819954487" at="82,114,83,130" />
+      <scope id="1095064659819954497" at="85,114,86,130" />
+      <scope id="1095064659819954507" at="88,114,89,130" />
+      <scope id="1095064659819954517" at="91,114,92,130" />
+      <scope id="1095064659819954404" at="141,108,142,190" />
+      <scope id="1095064659819954433" at="215,237,217,168" />
+      <scope id="1095064659819954443" at="224,237,226,168" />
+      <scope id="1095064659819954453" at="233,237,235,168" />
+      <scope id="1095064659819954493" at="252,237,254,168" />
+      <scope id="1095064659819954503" at="261,237,263,168" />
+      <scope id="1095064659819954513" at="270,237,272,168" />
+      <scope id="1095064659819954433" at="214,30,217,168" />
+      <scope id="1095064659819954443" at="223,30,226,168" />
+      <scope id="1095064659819954453" at="232,30,235,168" />
+      <scope id="1095064659819954463" at="242,237,245,168" />
+      <scope id="1095064659819954493" at="251,30,254,168" />
+      <scope id="1095064659819954503" at="260,30,263,168" />
+      <scope id="1095064659819954513" at="269,30,272,168" />
+      <scope id="1095064659819954523" at="279,237,282,168" />
+      <scope id="1095064659819954463" at="241,30,245,168" />
+      <scope id="1095064659819954523" at="278,30,282,168" />
+      <scope id="1095064659819954433" at="211,63,218,24">
+        <var name="facade" id="1095064659819954433" />
+        <var name="quotedNode_1" id="1095064659819954433" />
+        <var name="quotedNode_2" id="1095064659819954433" />
+      </scope>
+      <scope id="1095064659819954443" at="220,63,227,24">
+        <var name="facade" id="1095064659819954443" />
+        <var name="quotedNode_1" id="1095064659819954443" />
+        <var name="quotedNode_2" id="1095064659819954443" />
+      </scope>
+      <scope id="1095064659819954453" at="229,63,236,24">
+        <var name="facade" id="1095064659819954453" />
+        <var name="quotedNode_1" id="1095064659819954453" />
+        <var name="quotedNode_2" id="1095064659819954453" />
+      </scope>
+      <scope id="1095064659819954493" at="248,63,255,24">
+        <var name="facade" id="1095064659819954493" />
+        <var name="quotedNode_1" id="1095064659819954493" />
+        <var name="quotedNode_2" id="1095064659819954493" />
+      </scope>
+      <scope id="1095064659819954503" at="257,63,264,24">
+        <var name="facade" id="1095064659819954503" />
+        <var name="quotedNode_1" id="1095064659819954503" />
+        <var name="quotedNode_2" id="1095064659819954503" />
+      </scope>
+      <scope id="1095064659819954513" at="266,63,273,24">
+        <var name="facade" id="1095064659819954513" />
+        <var name="quotedNode_1" id="1095064659819954513" />
+        <var name="quotedNode_2" id="1095064659819954513" />
+      </scope>
+      <scope id="1095064659819954463" at="238,63,246,24">
+        <var name="facade" id="1095064659819954463" />
+        <var name="quotedNode_1" id="1095064659819954463" />
+        <var name="quotedNode_2" id="1095064659819954463" />
+      </scope>
+      <scope id="1095064659819954523" at="275,63,283,24">
+        <var name="facade" id="1095064659819954523" />
+        <var name="quotedNode_1" id="1095064659819954523" />
+        <var name="quotedNode_2" id="1095064659819954523" />
+      </scope>
+      <scope id="1095064659819954433" at="211,0,220,0" />
+      <scope id="1095064659819954443" at="220,0,229,0" />
+      <scope id="1095064659819954453" at="229,0,238,0" />
+      <scope id="1095064659819954493" at="248,0,257,0" />
+      <scope id="1095064659819954503" at="257,0,266,0" />
+      <scope id="1095064659819954513" at="266,0,275,0" />
+      <scope id="1095064659819954463" at="238,0,248,0" />
+      <scope id="1095064659819954523" at="275,0,285,0" />
+      <scope id="1095064659819954417" at="64,109,78,16">
+        <var name="type" id="1095064659819954419" />
+      </scope>
+      <scope id="1095064659819954477" at="80,109,94,16">
+        <var name="type" id="1095064659819954479" />
+      </scope>
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/2840424593938271879">
     <file name="QueriesGenerated.java">
-      <node id="5308946314782030195" at="64,109,65,296" concept="3" />
-      <node id="4615018937607276572" at="79,94,80,200" concept="3" />
-      <node id="4615018937607276591" at="82,94,83,200" concept="3" />
-      <node id="4615018937607276583" at="106,108,107,192" concept="3" />
-      <node id="4615018937607276602" at="109,108,110,192" concept="3" />
-      <scope id="5308946314782030194" at="64,109,65,296" />
-      <scope id="4615018937607276571" at="79,94,80,200" />
-      <scope id="4615018937607276590" at="82,94,83,200" />
-      <scope id="4615018937607276582" at="106,108,107,192" />
-      <scope id="4615018937607276601" at="109,108,110,192" />
+      <node id="4615018937607276572" at="102,94,103,200" concept="4" />
+      <node id="4615018937607276591" at="105,94,106,200" concept="4" />
+      <node id="4615018937607276583" at="129,108,130,192" concept="4" />
+      <node id="4615018937607276602" at="132,108,133,192" concept="4" />
+      <scope id="4615018937607276571" at="102,94,103,200" />
+      <scope id="4615018937607276590" at="105,94,106,200" />
+      <scope id="4615018937607276582" at="129,108,130,192" />
+      <scope id="4615018937607276601" at="132,108,133,192" />
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/2840424593984905033">
     <file name="QueriesGenerated.java">
-      <node id="5308946314782036450" at="67,109,68,296" concept="3" />
-      <node id="4615018937607279084" at="85,94,86,200" concept="3" />
-      <node id="4615018937607279103" at="88,94,89,200" concept="3" />
-      <node id="4615018937607279095" at="112,108,113,192" concept="3" />
-      <node id="4615018937607279114" at="115,108,116,192" concept="3" />
-      <scope id="5308946314782036449" at="67,109,68,296" />
-      <scope id="4615018937607279083" at="85,94,86,200" />
-      <scope id="4615018937607279102" at="88,94,89,200" />
-      <scope id="4615018937607279094" at="112,108,113,192" />
-      <scope id="4615018937607279113" at="115,108,116,192" />
+      <node id="4615018937607279084" at="108,94,109,200" concept="4" />
+      <node id="4615018937607279103" at="111,94,112,200" concept="4" />
+      <node id="4615018937607279095" at="135,108,136,192" concept="4" />
+      <node id="4615018937607279114" at="138,108,139,192" concept="4" />
+      <scope id="4615018937607279083" at="108,94,109,200" />
+      <scope id="4615018937607279102" at="111,94,112,200" />
+      <scope id="4615018937607279094" at="135,108,136,192" />
+      <scope id="4615018937607279113" at="138,108,139,192" />
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/5308946314780128204">
     <file name="QueriesGenerated.java">
-      <node id="5308946314780163355" at="25,110,26,165" concept="3" />
-      <node id="5308946314780193566" at="28,110,29,165" concept="3" />
-      <node id="5308946314780189666" at="31,110,32,165" concept="3" />
-      <node id="5308946314780198527" at="34,110,35,165" concept="3" />
-      <node id="5308946314780166156" at="121,62,122,63" concept="2" />
-      <node id="5308946314780166156" at="122,63,123,30" concept="2" />
-      <node id="5308946314780166156" at="123,30,124,222" concept="0" />
-      <node id="5308946314780166156" at="123,30,124,222" concept="0" />
-      <node id="5308946314780166156" at="123,30,124,222" concept="1" />
-      <node id="5308946314780166156" at="124,222,125,24" concept="3" />
-      <node id="5308946314780193571" at="127,62,128,63" concept="2" />
-      <node id="5308946314780193571" at="128,63,129,30" concept="2" />
-      <node id="5308946314780193571" at="129,30,130,30" concept="2" />
-      <node id="5308946314780193571" at="130,30,131,237" concept="1" />
-      <node id="5308946314780193571" at="131,237,132,222" concept="1" />
-      <node id="5308946314780193571" at="132,222,133,168" concept="1" />
-      <node id="5308946314780193571" at="133,168,134,24" concept="3" />
-      <node id="5308946314780191249" at="136,62,137,63" concept="2" />
-      <node id="5308946314780191249" at="137,63,138,30" concept="2" />
-      <node id="5308946314780191249" at="138,30,139,227" concept="1" />
-      <node id="5308946314780191249" at="139,227,140,467" concept="1" />
-      <node id="5308946314780191249" at="140,467,141,24" concept="3" />
-      <node id="5308946314780198532" at="143,62,144,63" concept="2" />
-      <node id="5308946314780198532" at="144,63,145,30" concept="2" />
-      <node id="5308946314780198532" at="145,30,146,30" concept="2" />
-      <node id="5308946314780198532" at="146,30,147,237" concept="1" />
-      <node id="5308946314780198532" at="147,237,148,227" concept="1" />
-      <node id="5308946314780198532" at="148,227,149,467" concept="1" />
-      <node id="5308946314780198532" at="149,467,150,168" concept="1" />
-      <node id="5308946314780198532" at="150,168,151,24" concept="3" />
-      <node id="5308946314780193571" at="131,237,133,168" concept="0" />
-      <node id="5308946314780193571" at="131,237,133,168" concept="0" />
-      <node id="5308946314780191249" at="138,30,140,467" concept="0" />
-      <node id="5308946314780191249" at="138,30,140,467" concept="0" />
-      <node id="5308946314780193571" at="130,30,133,168" concept="0" />
-      <node id="5308946314780193571" at="130,30,133,168" concept="0" />
-      <node id="5308946314780198532" at="147,237,150,168" concept="0" />
-      <node id="5308946314780198532" at="147,237,150,168" concept="0" />
-      <node id="5308946314780198532" at="146,30,150,168" concept="0" />
-      <node id="5308946314780198532" at="146,30,150,168" concept="0" />
-      <node id="5308946314780166156" at="121,0,127,0" concept="4" trace="_quotation_createNode_x583g4_b0a0a0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5308946314780191249" at="136,0,143,0" concept="4" trace="_quotation_createNode_x583g4_b0a0a2#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5308946314780193571" at="127,0,136,0" concept="4" trace="_quotation_createNode_x583g4_b0a0a1#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5308946314780198532" at="143,0,153,0" concept="4" trace="_quotation_createNode_x583g4_b0a0a3#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5308946314780163355" at="25,110,26,165" concept="4" />
+      <node id="5308946314780193566" at="28,110,29,165" concept="4" />
+      <node id="5308946314780189666" at="31,110,32,165" concept="4" />
+      <node id="5308946314780198527" at="34,110,35,165" concept="4" />
+      <node id="5308946314780166156" at="147,62,148,63" concept="3" />
+      <node id="5308946314780166156" at="148,63,149,30" concept="3" />
+      <node id="5308946314780166156" at="149,30,150,222" concept="0" />
+      <node id="5308946314780166156" at="149,30,150,222" concept="0" />
+      <node id="5308946314780166156" at="149,30,150,222" concept="1" />
+      <node id="5308946314780166156" at="150,222,151,24" concept="4" />
+      <node id="5308946314780193571" at="153,62,154,63" concept="3" />
+      <node id="5308946314780193571" at="154,63,155,30" concept="3" />
+      <node id="5308946314780193571" at="155,30,156,30" concept="3" />
+      <node id="5308946314780193571" at="156,30,157,237" concept="1" />
+      <node id="5308946314780193571" at="157,237,158,222" concept="1" />
+      <node id="5308946314780193571" at="158,222,159,168" concept="1" />
+      <node id="5308946314780193571" at="159,168,160,24" concept="4" />
+      <node id="5308946314780191249" at="162,62,163,63" concept="3" />
+      <node id="5308946314780191249" at="163,63,164,30" concept="3" />
+      <node id="5308946314780191249" at="164,30,165,227" concept="1" />
+      <node id="5308946314780191249" at="165,227,166,467" concept="1" />
+      <node id="5308946314780191249" at="166,467,167,24" concept="4" />
+      <node id="5308946314780198532" at="169,62,170,63" concept="3" />
+      <node id="5308946314780198532" at="170,63,171,30" concept="3" />
+      <node id="5308946314780198532" at="171,30,172,30" concept="3" />
+      <node id="5308946314780198532" at="172,30,173,237" concept="1" />
+      <node id="5308946314780198532" at="173,237,174,227" concept="1" />
+      <node id="5308946314780198532" at="174,227,175,467" concept="1" />
+      <node id="5308946314780198532" at="175,467,176,168" concept="1" />
+      <node id="5308946314780198532" at="176,168,177,24" concept="4" />
+      <node id="5308946314780193571" at="157,237,159,168" concept="0" />
+      <node id="5308946314780193571" at="157,237,159,168" concept="0" />
+      <node id="5308946314780191249" at="164,30,166,467" concept="0" />
+      <node id="5308946314780191249" at="164,30,166,467" concept="0" />
+      <node id="5308946314780193571" at="156,30,159,168" concept="0" />
+      <node id="5308946314780193571" at="156,30,159,168" concept="0" />
+      <node id="5308946314780198532" at="173,237,176,168" concept="0" />
+      <node id="5308946314780198532" at="173,237,176,168" concept="0" />
+      <node id="5308946314780198532" at="172,30,176,168" concept="0" />
+      <node id="5308946314780198532" at="172,30,176,168" concept="0" />
+      <node id="5308946314780166156" at="147,0,153,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a0#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5308946314780191249" at="162,0,169,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a2#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5308946314780193571" at="153,0,162,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a1#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5308946314780198532" at="169,0,179,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a3#()Lorg/jetbrains/mps/openapi/model/SNode;" />
       <scope id="5308946314780158243" at="25,110,26,165" />
       <scope id="5308946314780193565" at="28,110,29,165" />
       <scope id="5308946314780189665" at="31,110,32,165" />
       <scope id="5308946314780198526" at="34,110,35,165" />
-      <scope id="5308946314780166156" at="123,30,124,222" />
-      <scope id="5308946314780193571" at="131,237,133,168" />
-      <scope id="5308946314780191249" at="138,30,140,467" />
-      <scope id="5308946314780193571" at="130,30,133,168" />
-      <scope id="5308946314780198532" at="147,237,150,168" />
-      <scope id="5308946314780166156" at="121,62,125,24">
+      <scope id="5308946314780166156" at="149,30,150,222" />
+      <scope id="5308946314780193571" at="157,237,159,168" />
+      <scope id="5308946314780191249" at="164,30,166,467" />
+      <scope id="5308946314780193571" at="156,30,159,168" />
+      <scope id="5308946314780198532" at="173,237,176,168" />
+      <scope id="5308946314780166156" at="147,62,151,24">
         <var name="facade" id="5308946314780166156" />
         <var name="quotedNode_1" id="5308946314780166156" />
       </scope>
-      <scope id="5308946314780198532" at="146,30,150,168" />
-      <scope id="5308946314780191249" at="136,62,141,24">
+      <scope id="5308946314780198532" at="172,30,176,168" />
+      <scope id="5308946314780191249" at="162,62,167,24">
         <var name="facade" id="5308946314780191249" />
         <var name="quotedNode_1" id="5308946314780191249" />
       </scope>
-      <scope id="5308946314780166156" at="121,0,127,0" />
-      <scope id="5308946314780193571" at="127,62,134,24">
+      <scope id="5308946314780166156" at="147,0,153,0" />
+      <scope id="5308946314780193571" at="153,62,160,24">
         <var name="facade" id="5308946314780193571" />
         <var name="quotedNode_1" id="5308946314780193571" />
         <var name="quotedNode_2" id="5308946314780193571" />
       </scope>
-      <scope id="5308946314780191249" at="136,0,143,0" />
-      <scope id="5308946314780198532" at="143,62,151,24">
+      <scope id="5308946314780191249" at="162,0,169,0" />
+      <scope id="5308946314780198532" at="169,62,177,24">
         <var name="facade" id="5308946314780198532" />
         <var name="quotedNode_1" id="5308946314780198532" />
         <var name="quotedNode_2" id="5308946314780198532" />
       </scope>
-      <scope id="5308946314780193571" at="127,0,136,0" />
-      <scope id="5308946314780198532" at="143,0,153,0" />
+      <scope id="5308946314780193571" at="153,0,162,0" />
+      <scope id="5308946314780198532" at="169,0,179,0" />
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/5308946314780204124">
     <file name="QueriesGenerated.java">
-      <node id="5308946314780204134" at="37,110,38,165" concept="3" />
-      <node id="5308946314780204147" at="40,110,41,165" concept="3" />
-      <node id="5308946314780204171" at="43,110,44,165" concept="3" />
-      <node id="5308946314780204158" at="46,110,47,165" concept="3" />
-      <node id="5308946314780204139" at="153,62,154,63" concept="2" />
-      <node id="5308946314780204139" at="154,63,155,30" concept="2" />
-      <node id="5308946314780204139" at="155,30,156,222" concept="0" />
-      <node id="5308946314780204139" at="155,30,156,222" concept="0" />
-      <node id="5308946314780204139" at="155,30,156,222" concept="1" />
-      <node id="5308946314780204139" at="156,222,157,24" concept="3" />
-      <node id="5308946314780204152" at="159,62,160,63" concept="2" />
-      <node id="5308946314780204152" at="160,63,161,30" concept="2" />
-      <node id="5308946314780204152" at="161,30,162,30" concept="2" />
-      <node id="5308946314780204152" at="162,30,163,237" concept="1" />
-      <node id="5308946314780204152" at="163,237,164,222" concept="1" />
-      <node id="5308946314780204152" at="164,222,165,168" concept="1" />
-      <node id="5308946314780204152" at="165,168,166,24" concept="3" />
-      <node id="5308946314780204176" at="168,62,169,63" concept="2" />
-      <node id="5308946314780204176" at="169,63,170,30" concept="2" />
-      <node id="5308946314780204176" at="170,30,171,227" concept="1" />
-      <node id="5308946314780204176" at="171,227,172,467" concept="1" />
-      <node id="5308946314780204176" at="172,467,173,24" concept="3" />
-      <node id="5308946314780204163" at="175,62,176,63" concept="2" />
-      <node id="5308946314780204163" at="176,63,177,30" concept="2" />
-      <node id="5308946314780204163" at="177,30,178,30" concept="2" />
-      <node id="5308946314780204163" at="178,30,179,237" concept="1" />
-      <node id="5308946314780204163" at="179,237,180,227" concept="1" />
-      <node id="5308946314780204163" at="180,227,181,467" concept="1" />
-      <node id="5308946314780204163" at="181,467,182,168" concept="1" />
-      <node id="5308946314780204163" at="182,168,183,24" concept="3" />
-      <node id="5308946314780204152" at="163,237,165,168" concept="0" />
-      <node id="5308946314780204152" at="163,237,165,168" concept="0" />
-      <node id="5308946314780204176" at="170,30,172,467" concept="0" />
-      <node id="5308946314780204176" at="170,30,172,467" concept="0" />
-      <node id="5308946314780204152" at="162,30,165,168" concept="0" />
-      <node id="5308946314780204152" at="162,30,165,168" concept="0" />
-      <node id="5308946314780204163" at="179,237,182,168" concept="0" />
-      <node id="5308946314780204163" at="179,237,182,168" concept="0" />
-      <node id="5308946314780204163" at="178,30,182,168" concept="0" />
-      <node id="5308946314780204163" at="178,30,182,168" concept="0" />
-      <node id="5308946314780204139" at="153,0,159,0" concept="4" trace="_quotation_createNode_x583g4_b0a0a4#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5308946314780204176" at="168,0,175,0" concept="4" trace="_quotation_createNode_x583g4_b0a0a6#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5308946314780204152" at="159,0,168,0" concept="4" trace="_quotation_createNode_x583g4_b0a0a5#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5308946314780204163" at="175,0,185,0" concept="4" trace="_quotation_createNode_x583g4_b0a0a7#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5308946314780204134" at="37,110,38,165" concept="4" />
+      <node id="5308946314780204147" at="40,110,41,165" concept="4" />
+      <node id="5308946314780204171" at="43,110,44,165" concept="4" />
+      <node id="5308946314780204158" at="46,110,47,165" concept="4" />
+      <node id="5308946314780204139" at="179,62,180,63" concept="3" />
+      <node id="5308946314780204139" at="180,63,181,30" concept="3" />
+      <node id="5308946314780204139" at="181,30,182,222" concept="0" />
+      <node id="5308946314780204139" at="181,30,182,222" concept="0" />
+      <node id="5308946314780204139" at="181,30,182,222" concept="1" />
+      <node id="5308946314780204139" at="182,222,183,24" concept="4" />
+      <node id="5308946314780204152" at="185,62,186,63" concept="3" />
+      <node id="5308946314780204152" at="186,63,187,30" concept="3" />
+      <node id="5308946314780204152" at="187,30,188,30" concept="3" />
+      <node id="5308946314780204152" at="188,30,189,237" concept="1" />
+      <node id="5308946314780204152" at="189,237,190,222" concept="1" />
+      <node id="5308946314780204152" at="190,222,191,168" concept="1" />
+      <node id="5308946314780204152" at="191,168,192,24" concept="4" />
+      <node id="5308946314780204176" at="194,62,195,63" concept="3" />
+      <node id="5308946314780204176" at="195,63,196,30" concept="3" />
+      <node id="5308946314780204176" at="196,30,197,227" concept="1" />
+      <node id="5308946314780204176" at="197,227,198,467" concept="1" />
+      <node id="5308946314780204176" at="198,467,199,24" concept="4" />
+      <node id="5308946314780204163" at="201,62,202,63" concept="3" />
+      <node id="5308946314780204163" at="202,63,203,30" concept="3" />
+      <node id="5308946314780204163" at="203,30,204,30" concept="3" />
+      <node id="5308946314780204163" at="204,30,205,237" concept="1" />
+      <node id="5308946314780204163" at="205,237,206,227" concept="1" />
+      <node id="5308946314780204163" at="206,227,207,467" concept="1" />
+      <node id="5308946314780204163" at="207,467,208,168" concept="1" />
+      <node id="5308946314780204163" at="208,168,209,24" concept="4" />
+      <node id="5308946314780204152" at="189,237,191,168" concept="0" />
+      <node id="5308946314780204152" at="189,237,191,168" concept="0" />
+      <node id="5308946314780204176" at="196,30,198,467" concept="0" />
+      <node id="5308946314780204176" at="196,30,198,467" concept="0" />
+      <node id="5308946314780204152" at="188,30,191,168" concept="0" />
+      <node id="5308946314780204152" at="188,30,191,168" concept="0" />
+      <node id="5308946314780204163" at="205,237,208,168" concept="0" />
+      <node id="5308946314780204163" at="205,237,208,168" concept="0" />
+      <node id="5308946314780204163" at="204,30,208,168" concept="0" />
+      <node id="5308946314780204163" at="204,30,208,168" concept="0" />
+      <node id="5308946314780204139" at="179,0,185,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a4#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5308946314780204176" at="194,0,201,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a6#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5308946314780204152" at="185,0,194,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a5#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5308946314780204163" at="201,0,211,0" concept="5" trace="_quotation_createNode_x583g4_b0a0a7#()Lorg/jetbrains/mps/openapi/model/SNode;" />
       <scope id="5308946314780204133" at="37,110,38,165" />
       <scope id="5308946314780204146" at="40,110,41,165" />
       <scope id="5308946314780204170" at="43,110,44,165" />
       <scope id="5308946314780204157" at="46,110,47,165" />
-      <scope id="5308946314780204139" at="155,30,156,222" />
-      <scope id="5308946314780204152" at="163,237,165,168" />
-      <scope id="5308946314780204176" at="170,30,172,467" />
-      <scope id="5308946314780204152" at="162,30,165,168" />
-      <scope id="5308946314780204163" at="179,237,182,168" />
-      <scope id="5308946314780204139" at="153,62,157,24">
+      <scope id="5308946314780204139" at="181,30,182,222" />
+      <scope id="5308946314780204152" at="189,237,191,168" />
+      <scope id="5308946314780204176" at="196,30,198,467" />
+      <scope id="5308946314780204152" at="188,30,191,168" />
+      <scope id="5308946314780204163" at="205,237,208,168" />
+      <scope id="5308946314780204139" at="179,62,183,24">
         <var name="facade" id="5308946314780204139" />
         <var name="quotedNode_1" id="5308946314780204139" />
       </scope>
-      <scope id="5308946314780204163" at="178,30,182,168" />
-      <scope id="5308946314780204176" at="168,62,173,24">
+      <scope id="5308946314780204163" at="204,30,208,168" />
+      <scope id="5308946314780204176" at="194,62,199,24">
         <var name="facade" id="5308946314780204176" />
         <var name="quotedNode_1" id="5308946314780204176" />
       </scope>
-      <scope id="5308946314780204139" at="153,0,159,0" />
-      <scope id="5308946314780204152" at="159,62,166,24">
+      <scope id="5308946314780204139" at="179,0,185,0" />
+      <scope id="5308946314780204152" at="185,62,192,24">
         <var name="facade" id="5308946314780204152" />
         <var name="quotedNode_1" id="5308946314780204152" />
         <var name="quotedNode_2" id="5308946314780204152" />
       </scope>
-      <scope id="5308946314780204176" at="168,0,175,0" />
-      <scope id="5308946314780204163" at="175,62,183,24">
+      <scope id="5308946314780204176" at="194,0,201,0" />
+      <scope id="5308946314780204163" at="201,62,209,24">
         <var name="facade" id="5308946314780204163" />
         <var name="quotedNode_1" id="5308946314780204163" />
         <var name="quotedNode_2" id="5308946314780204163" />
       </scope>
-      <scope id="5308946314780204152" at="159,0,168,0" />
-      <scope id="5308946314780204163" at="175,0,185,0" />
+      <scope id="5308946314780204152" at="185,0,194,0" />
+      <scope id="5308946314780204163" at="201,0,211,0" />
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/5582028874769201297">
     <file name="QueriesGenerated.java">
-      <node id="5582028874769201313" at="52,109,53,188" concept="3" />
-      <node id="5582028874769201332" at="55,109,56,363" concept="3" />
-      <node id="5582028874769201342" at="58,109,59,174" concept="3" />
-      <node id="5582028874769201353" at="91,108,92,189" concept="3" />
-      <node id="5582028874769201360" at="118,120,119,195" concept="3" />
+      <node id="5582028874769201313" at="52,109,53,188" concept="4" />
+      <node id="5582028874769201332" at="55,109,56,363" concept="4" />
+      <node id="5582028874769201342" at="58,109,59,174" concept="4" />
+      <node id="5582028874769201353" at="114,108,115,189" concept="4" />
+      <node id="5582028874769201360" at="144,120,145,195" concept="4" />
       <scope id="5582028874769201312" at="52,109,53,188" />
       <scope id="5582028874769201331" at="55,109,56,363" />
       <scope id="5582028874769201341" at="58,109,59,174" />
-      <scope id="5582028874769201352" at="91,108,92,189" />
-      <scope id="5582028874769201359" at="118,120,119,195" />
+      <scope id="5582028874769201352" at="114,108,115,189" />
+      <scope id="5582028874769201359" at="144,120,145,195" />
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/5582028874769203950">
     <file name="QueriesGenerated.java">
-      <node id="5582028874769203962" at="94,108,95,196" concept="3" />
-      <scope id="5582028874769203961" at="94,108,95,196" />
+      <node id="5582028874769203962" at="117,108,118,196" concept="4" />
+      <scope id="5582028874769203961" at="117,108,118,196" />
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/5582028874769203973">
     <file name="QueriesGenerated.java">
-      <node id="5582028874769203993" at="97,108,98,195" concept="3" />
-      <scope id="5582028874769203992" at="97,108,98,195" />
+      <node id="5582028874769203993" at="120,108,121,195" concept="4" />
+      <scope id="5582028874769203992" at="120,108,121,195" />
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/5582028874771857716">
     <file name="QueriesGenerated.java">
-      <node id="587413522925224720" at="49,111,50,578" concept="3" />
-      <node id="5582028874771857733" at="61,109,62,296" concept="3" />
-      <node id="4615018937607219504" at="73,94,74,200" concept="3" />
-      <node id="4615018937607230204" at="76,94,77,200" concept="3" />
-      <node id="4615018937607216977" at="100,108,101,192" concept="3" />
-      <node id="4615018937607230215" at="103,108,104,192" concept="3" />
+      <node id="587413522925224720" at="49,111,50,578" concept="4" />
+      <node id="4615018937607219504" at="96,94,97,200" concept="4" />
+      <node id="4615018937607230204" at="99,94,100,200" concept="4" />
+      <node id="4615018937607216977" at="123,108,124,192" concept="4" />
+      <node id="4615018937607230215" at="126,108,127,192" concept="4" />
       <scope id="587413522925224719" at="49,111,50,578" />
-      <scope id="5582028874771857732" at="61,109,62,296" />
-      <scope id="4615018937607135822" at="73,94,74,200" />
-      <scope id="4615018937607230203" at="76,94,77,200" />
-      <scope id="4615018937607216899" at="100,108,101,192" />
-      <scope id="4615018937607230214" at="103,108,104,192" />
+      <scope id="4615018937607135822" at="96,94,97,200" />
+      <scope id="4615018937607230203" at="99,94,100,200" />
+      <scope id="4615018937607216899" at="123,108,124,192" />
+      <scope id="4615018937607230214" at="126,108,127,192" />
     </file>
   </root>
   <root nodeRef="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)/5932042262275887951">
     <file name="QueriesGenerated.java">
-      <node id="5932042262276049439" at="70,109,71,197" concept="3" />
-      <scope id="5932042262276049108" at="70,109,71,197" />
+      <node id="5932042262276049439" at="61,109,62,197" concept="4" />
+      <scope id="5932042262276049108" at="61,109,62,197" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps
index 57ccb0c09685..db8c95ba5bb3 100644
--- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps
+++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps
@@ -2,17 +2,23 @@
 <model ref="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)">
   <persistence version="9" />
   <languages>
-    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.console.blCommand" version="-1" />
     <use id="a5e4de53-46a3-44da-aab3-68fdf1c34ed0" name="jetbrains.mps.console.ideCommands" version="-1" />
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="0" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="caxt" ref="r:135a606f-0376-4c5c-9ab8-4030f051a062(jetbrains.mps.console.ideCommands.structure)" />
-    <import index="74y1" ref="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" />
+    <import index="74y1" ref="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.lang.smodel.query.generator.template.main@generator)" />
     <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
@@ -23,10 +29,12 @@
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="3s15" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.workbench(MPS.Platform/)" />
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="4olo" ref="r:b856319b-d8da-48ce-9e51-862a82504ef3(jetbrains.mps.console.ideCommands.runtime.util)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="tp4k" ref="r:00000000-0000-4000-0000-011c89590368(jetbrains.mps.lang.plugin.structure)" />
+    <import index="kxzb" ref="r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -69,6 +77,9 @@
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -85,6 +96,10 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
@@ -94,7 +109,17 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -195,13 +220,6 @@
         <reference id="5582028874769074088" name="declaration" index="23SHS7" />
       </concept>
     </language>
-    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
-      <concept id="1216860049627" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput" flags="nn" index="1iwH70">
-        <reference id="1216860049628" name="label" index="1iwH77" />
-        <child id="1216860049632" name="inputNode" index="1iwH7V" />
-      </concept>
-      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
-    </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">
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
@@ -218,23 +236,21 @@
       <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="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>
+      <concept id="8758390115029295477" name="jetbrains.mps.lang.smodel.structure.SReferenceType" flags="in" index="2z4iKi" />
       <concept id="559557797393017698" name="jetbrains.mps.lang.smodel.structure.ModelReferenceExpression" flags="nn" index="BaHAS" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      <concept id="597763930871270009" name="jetbrains.mps.lang.smodel.structure.ChildNodeRefExpression" flags="nn" index="3fl2lp">
+        <reference id="597763930871272016" name="targetNode" index="3fl3PK" />
+        <child id="597763930871272014" name="parent" index="3fl3PI" />
       </concept>
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
         <reference id="1219352800908" name="referentNode" index="3B5MYn" />
       </concept>
@@ -242,6 +258,9 @@
         <reference id="1140138128738" name="concept" index="1PxNhF" />
         <child id="1140138123956" name="leftExpression" index="1PxMeX" />
       </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -266,13 +285,13 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.console.blCommand">
-      <concept id="752693057587755272" name="jetbrains.mps.console.blCommand.structure.ProjectExpression" flags="ng" index="o6qdh" />
-      <concept id="6864030874027862829" name="jetbrains.mps.console.blCommand.structure.ModelsExpression" flags="ng" index="EZOir" />
-      <concept id="4307205004131544317" name="jetbrains.mps.console.blCommand.structure.QueryExpression" flags="ng" index="1dNuzs">
+    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query">
+      <concept id="6864030874027862829" name="jetbrains.mps.lang.smodel.query.structure.ModelsExpression" flags="ng" index="EZOir" />
+      <concept id="2822369470875160718" name="jetbrains.mps.lang.smodel.query.structure.NodesExpression" flags="ng" index="2Jgcaq" />
+      <concept id="4307205004131544317" name="jetbrains.mps.lang.smodel.query.structure.QueryExpression" flags="ng" index="1dNuzs">
         <child id="4307205004132279624" name="parameter" index="1dOa5D" />
       </concept>
-      <concept id="4307205004132277753" name="jetbrains.mps.console.blCommand.structure.QueryParameterList" flags="ng" index="1dO9Bo" />
+      <concept id="4307205004132277753" name="jetbrains.mps.lang.smodel.query.structure.QueryParameterList" flags="ng" index="1dO9Bo" />
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -291,8 +310,12 @@
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
+    <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base">
+      <concept id="752693057587755272" name="jetbrains.mps.console.base.structure.ProjectExpression" flags="ng" index="o6qdh" />
+    </language>
   </registry>
   <node concept="bUwia" id="6SybgJ86w1o">
     <property role="TrG5h" value="main" />
@@ -326,6 +349,12 @@
         <ref role="v9R2y" node="59iQg8rzLdf" resolve="reduce_OfAspectOperation" />
       </node>
     </node>
+    <node concept="3aamgX" id="YwfKjlWCPM" role="3acgRq">
+      <ref role="30HIoZ" to="caxt:7mV0m3L$tuv" resolve="ShowExpression" />
+      <node concept="j$656" id="YwfKjlWCPN" role="1lVwrX">
+        <ref role="v9R2y" node="YwfKjlWCO7" resolve="reduce_ShowExpression" />
+      </node>
+    </node>
   </node>
   <node concept="13MO4I" id="4PRmqZe_Ryh">
     <property role="TrG5h" value="reduce_CallActionExpression" />
@@ -355,24 +384,29 @@
             <node concept="2YIFZM" id="4PRmqZe_Rys" role="3clFbG">
               <ref role="1Pybhc" to="4olo:4PRmqZeKGRd" resolve="IdeCommandUtil" />
               <ref role="37wK5l" to="4olo:7VSQgz8Ni_J" resolve="callAction" />
-              <node concept="3B5_sB" id="4PRmqZe_Ryt" role="37wK5m">
-                <ref role="3B5MYn" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                <node concept="1ZhdrF" id="4PRmqZe_Ryu" role="lGtFl">
-                  <property role="2qtEX8" value="referentNode" />
-                  <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/1219352745532/1219352800908" />
-                  <node concept="3$xsQk" id="4PRmqZe_Ryv" role="3$ytzL">
-                    <node concept="3clFbS" id="4PRmqZe_Ryw" role="2VODD2">
-                      <node concept="3clFbF" id="4PRmqZe_Ryx" role="3cqZAp">
-                        <node concept="2OqwBi" id="4PRmqZe_Ryy" role="3clFbG">
-                          <node concept="3TrEf2" id="4PRmqZe_Ryz" role="2OqNvi">
-                            <ref role="3Tt5mk" to="caxt:4PRmqZe_ouI" />
+              <node concept="10QFUN" id="3ZgZ1njMHO6" role="37wK5m">
+                <node concept="3B5_sB" id="4PRmqZe_Ryt" role="10QFUP">
+                  <ref role="3B5MYn" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                  <node concept="1ZhdrF" id="4PRmqZe_Ryu" role="lGtFl">
+                    <property role="2qtEX8" value="referentNode" />
+                    <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/1219352745532/1219352800908" />
+                    <node concept="3$xsQk" id="4PRmqZe_Ryv" role="3$ytzL">
+                      <node concept="3clFbS" id="4PRmqZe_Ryw" role="2VODD2">
+                        <node concept="3clFbF" id="4PRmqZe_Ryx" role="3cqZAp">
+                          <node concept="2OqwBi" id="4PRmqZe_Ryy" role="3clFbG">
+                            <node concept="3TrEf2" id="4PRmqZe_Ryz" role="2OqNvi">
+                              <ref role="3Tt5mk" to="caxt:4PRmqZe_ouI" />
+                            </node>
+                            <node concept="30H73N" id="4PRmqZe_Ry$" role="2Oq$k0" />
                           </node>
-                          <node concept="30H73N" id="4PRmqZe_Ry$" role="2Oq$k0" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
+                <node concept="3Tqbb2" id="3ZgZ1njMHO7" role="10QFUM">
+                  <ref role="ehGHo" to="tp4k:hwsE7KS" resolve="ActionDeclaration" />
+                </node>
               </node>
               <node concept="2YIFZM" id="4PRmqZe_Ry_" role="37wK5m">
                 <ref role="1Pybhc" to="4olo:4PRmqZeKGRd" resolve="IdeCommandUtil" />
@@ -436,21 +470,16 @@
                                 <ref role="37wK5l" to="qkt:~DataKey.getName():java.lang.String" resolve="getName" />
                               </node>
                             </node>
-                            <node concept="10QFUN" id="4PRmqZe_Rz3" role="1Lso8e">
-                              <node concept="3uibUv" id="4PRmqZe_Rz4" role="10QFUM">
-                                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                              </node>
-                              <node concept="10Nm6u" id="4PRmqZe_Rz5" role="10QFUP">
-                                <node concept="29HgVG" id="4PRmqZe_Rz6" role="lGtFl">
-                                  <node concept="3NFfHV" id="4PRmqZe_Rz7" role="3NFExx">
-                                    <node concept="3clFbS" id="4PRmqZe_Rz8" role="2VODD2">
-                                      <node concept="3clFbF" id="4PRmqZe_Rz9" role="3cqZAp">
-                                        <node concept="2OqwBi" id="4PRmqZe_Rza" role="3clFbG">
-                                          <node concept="3TrEf2" id="4PRmqZe_Rzb" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="caxt:4PRmqZe_ouG" />
-                                          </node>
-                                          <node concept="30H73N" id="4PRmqZe_Rzc" role="2Oq$k0" />
+                            <node concept="10Nm6u" id="4PRmqZe_Rz5" role="1Lso8e">
+                              <node concept="29HgVG" id="4PRmqZe_Rz6" role="lGtFl">
+                                <node concept="3NFfHV" id="4PRmqZe_Rz7" role="3NFExx">
+                                  <node concept="3clFbS" id="4PRmqZe_Rz8" role="2VODD2">
+                                    <node concept="3clFbF" id="4PRmqZe_Rz9" role="3cqZAp">
+                                      <node concept="2OqwBi" id="4PRmqZe_Rza" role="3clFbG">
+                                        <node concept="3TrEf2" id="4PRmqZe_Rzb" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="caxt:4PRmqZe_ouG" />
                                         </node>
+                                        <node concept="30H73N" id="4PRmqZe_Rzc" role="2Oq$k0" />
                                       </node>
                                     </node>
                                   </node>
@@ -494,8 +523,15 @@
       <ref role="23SHS1" to="tprs:hGANgqU" resolve="ModuleProperties" />
       <node concept="23SHS8" id="4PRmqZe_SbK" role="23SHS0">
         <ref role="23SHS7" to="tprs:1ChIhDtQp1Q" resolve="mpsProject" />
-        <node concept="o6qdh" id="5uFqCDKorr8" role="23SHS3">
-          <node concept="1dO9Bo" id="5uFqCDKorra" role="1dOa5D" />
+        <node concept="1eOMI4" id="3ZgZ1njPLFz" role="23SHS3">
+          <node concept="10QFUN" id="3ZgZ1njPLF$" role="1eOMHV">
+            <node concept="o6qdh" id="3ZgZ1njPLFx" role="10QFUP">
+              <node concept="1dO9Bo" id="3ZgZ1njPLFy" role="1dOa5D" />
+            </node>
+            <node concept="3uibUv" id="3ZgZ1njPLFZ" role="10QFUM">
+              <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="23SHS8" id="5uFqCDKou0T" role="23SHS0">
@@ -647,32 +683,6 @@
               <node concept="2OqwBi" id="4PRmqZeK050" role="37wK5m">
                 <node concept="37vLTw" id="4PRmqZeK051" role="2Oq$k0">
                   <ref role="3cqZAo" node="4PRmqZeK04S" resolve="context" />
-                  <node concept="1ZhdrF" id="4PRmqZeK052" role="lGtFl">
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <node concept="3$xsQk" id="4PRmqZeK053" role="3$ytzL">
-                      <node concept="3clFbS" id="4PRmqZeK054" role="2VODD2">
-                        <node concept="3clFbF" id="4PRmqZeK055" role="3cqZAp">
-                          <node concept="2OqwBi" id="4PRmqZeK056" role="3clFbG">
-                            <node concept="1iwH7S" id="4PRmqZeK057" role="2Oq$k0" />
-                            <node concept="1iwH70" id="4PRmqZeK058" role="2OqNvi">
-                              <ref role="1iwH77" to="74y1:1El5OLsAWHX" resolve="contextParameter" />
-                              <node concept="2OqwBi" id="4PRmqZeK059" role="1iwH7V">
-                                <node concept="30H73N" id="4PRmqZeK05a" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="4PRmqZeK05b" role="2OqNvi">
-                                  <node concept="1xMEDy" id="4PRmqZeK05c" role="1xVPHs">
-                                    <node concept="chp4Y" id="4PRmqZeK05d" role="ri$Ld">
-                                      <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                 </node>
                 <node concept="liA8E" id="4PRmqZeK05e" role="2OqNvi">
                   <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
@@ -827,32 +837,6 @@
               <node concept="2OqwBi" id="4AHaCIocV_I" role="37wK5m">
                 <node concept="37vLTw" id="4AHaCIocV_J" role="2Oq$k0">
                   <ref role="3cqZAo" node="2tFdLTOYl5m" resolve="context" />
-                  <node concept="1ZhdrF" id="4AHaCIocV_K" role="lGtFl">
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <node concept="3$xsQk" id="4AHaCIocV_L" role="3$ytzL">
-                      <node concept="3clFbS" id="4AHaCIocV_M" role="2VODD2">
-                        <node concept="3clFbF" id="4AHaCIocV_N" role="3cqZAp">
-                          <node concept="2OqwBi" id="4AHaCIocV_O" role="3clFbG">
-                            <node concept="1iwH7S" id="4AHaCIocV_P" role="2Oq$k0" />
-                            <node concept="1iwH70" id="4AHaCIocV_Q" role="2OqNvi">
-                              <ref role="1iwH77" to="74y1:1El5OLsAWHX" resolve="contextParameter" />
-                              <node concept="2OqwBi" id="4AHaCIocV_R" role="1iwH7V">
-                                <node concept="30H73N" id="4AHaCIocV_S" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="4AHaCIocV_T" role="2OqNvi">
-                                  <node concept="1xMEDy" id="4AHaCIocV_U" role="1xVPHs">
-                                    <node concept="chp4Y" id="4AHaCIocV_V" role="ri$Ld">
-                                      <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                 </node>
                 <node concept="liA8E" id="4AHaCIocV_W" role="2OqNvi">
                   <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
@@ -971,32 +955,6 @@
               <node concept="2OqwBi" id="4AHaCIocX7t" role="37wK5m">
                 <node concept="37vLTw" id="4AHaCIocX7u" role="2Oq$k0">
                   <ref role="3cqZAo" node="2tFdLTRKhj1" resolve="context" />
-                  <node concept="1ZhdrF" id="4AHaCIocX7v" role="lGtFl">
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <node concept="3$xsQk" id="4AHaCIocX7w" role="3$ytzL">
-                      <node concept="3clFbS" id="4AHaCIocX7x" role="2VODD2">
-                        <node concept="3clFbF" id="4AHaCIocX7y" role="3cqZAp">
-                          <node concept="2OqwBi" id="4AHaCIocX7z" role="3clFbG">
-                            <node concept="1iwH7S" id="4AHaCIocX7$" role="2Oq$k0" />
-                            <node concept="1iwH70" id="4AHaCIocX7_" role="2OqNvi">
-                              <ref role="1iwH77" to="74y1:1El5OLsAWHX" resolve="contextParameter" />
-                              <node concept="2OqwBi" id="4AHaCIocX7A" role="1iwH7V">
-                                <node concept="30H73N" id="4AHaCIocX7B" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="4AHaCIocX7C" role="2OqNvi">
-                                  <node concept="1xMEDy" id="4AHaCIocX7D" role="1xVPHs">
-                                    <node concept="chp4Y" id="4AHaCIocX7E" role="ri$Ld">
-                                      <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                 </node>
                 <node concept="liA8E" id="4AHaCIocX7F" role="2OqNvi">
                   <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
@@ -1388,5 +1346,336 @@
       <node concept="3Tm1VV" id="23X86fnVain" role="1B3o_S" />
     </node>
   </node>
+  <node concept="13MO4I" id="YwfKjlWCO7">
+    <property role="TrG5h" value="reduce_ShowExpression" />
+    <property role="3GE5qa" value="" />
+    <ref role="3gUMe" to="caxt:7mV0m3L$tuv" resolve="ShowExpression" />
+    <node concept="312cEu" id="YwfKjlWDwj" role="13RCb5">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Main" />
+      <node concept="2YIFZL" id="YwfKjlWDwk" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="YwfKjlWDwl" role="3clF45" />
+        <node concept="37vLTG" id="YwfKjlWDwm" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="YwfKjlWDwn" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="YwfKjlWDwo" role="3clF46">
+          <property role="TrG5h" value="console" />
+          <node concept="3uibUv" id="YwfKjlWDwp" role="1tU5fm">
+            <ref role="3uigEE" to="qgo0:5WpmwkrQPPk" resolve="ConsoleStream" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="YwfKjlWDwq" role="1B3o_S" />
+        <node concept="3clFbS" id="YwfKjlWDws" role="3clF47">
+          <node concept="3clFbF" id="YwfKjlWG8F" role="3cqZAp">
+            <node concept="2YIFZM" id="WMsS6mDK3q" role="3clFbG">
+              <ref role="37wK5l" to="qgo0:YwfKjlX8gC" resolve="show" />
+              <ref role="1Pybhc" to="qgo0:7zdHeh8agf_" resolve="ConsoleUtil" />
+              <node concept="2OqwBi" id="WMsS6mDK3r" role="37wK5m">
+                <node concept="37vLTw" id="WMsS6mDK3s" role="2Oq$k0">
+                  <ref role="3cqZAo" node="YwfKjlWDwm" resolve="context" />
+                </node>
+                <node concept="liA8E" id="WMsS6mDK3t" role="2OqNvi">
+                  <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="WMsS6mDK3u" role="37wK5m">
+                <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                <ref role="37wK5l" to="kxzb:YwfKjlXcuc" resolve="nodesToResults" />
+                <node concept="2OqwBi" id="WMsS6mDK3v" role="37wK5m">
+                  <node concept="2Jgcaq" id="WMsS6mDK3w" role="2Oq$k0">
+                    <node concept="1dO9Bo" id="WMsS6mDK3x" role="1dOa5D" />
+                    <node concept="29HgVG" id="WMsS6mDK3y" role="lGtFl">
+                      <node concept="3NFfHV" id="WMsS6mDK3z" role="3NFExx">
+                        <node concept="3clFbS" id="WMsS6mDK3$" role="2VODD2">
+                          <node concept="3clFbF" id="WMsS6mDK3_" role="3cqZAp">
+                            <node concept="2OqwBi" id="WMsS6mDK3A" role="3clFbG">
+                              <node concept="3TrEf2" id="WMsS6mDK3B" role="2OqNvi">
+                                <ref role="3Tt5mk" to="caxt:6_TW7xVwuxP" />
+                              </node>
+                              <node concept="30H73N" id="WMsS6mDK3C" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3$u5V9" id="WMsS6mDK3D" role="2OqNvi">
+                    <node concept="1bVj0M" id="WMsS6mDK3E" role="23t8la">
+                      <node concept="3clFbS" id="WMsS6mDK3F" role="1bW5cS">
+                        <node concept="3clFbF" id="WMsS6mDK3G" role="3cqZAp">
+                          <node concept="2YIFZM" id="WMsS6mDK3H" role="3clFbG">
+                            <ref role="37wK5l" to="kxzb:32notsQsTE3" resolve="getNodeReference" />
+                            <ref role="1Pybhc" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                            <node concept="37vLTw" id="WMsS6mDK3I" role="37wK5m">
+                              <ref role="3cqZAo" node="WMsS6mDK4$" resolve="it" />
+                            </node>
+                            <node concept="1ZhdrF" id="WMsS6mDK3J" role="lGtFl">
+                              <property role="2qtEX8" value="baseMethodDeclaration" />
+                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                              <node concept="3$xsQk" id="WMsS6mDK3K" role="3$ytzL">
+                                <node concept="3clFbS" id="WMsS6mDK3L" role="2VODD2">
+                                  <node concept="3cpWs8" id="WMsS6mDK3M" role="3cqZAp">
+                                    <node concept="3cpWsn" id="WMsS6mDK3N" role="3cpWs9">
+                                      <property role="TrG5h" value="type" />
+                                      <node concept="3Tqbb2" id="WMsS6mDK3O" role="1tU5fm" />
+                                      <node concept="2OqwBi" id="WMsS6mDK3P" role="33vP2m">
+                                        <node concept="2OqwBi" id="WMsS6mDK3Q" role="2Oq$k0">
+                                          <node concept="30H73N" id="WMsS6mDK3R" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="WMsS6mDK3S" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="caxt:6_TW7xVwuxP" />
+                                          </node>
+                                        </node>
+                                        <node concept="3JvlWi" id="WMsS6mDK3T" role="2OqNvi" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbJ" id="WMsS6mDK3U" role="3cqZAp">
+                                    <node concept="3clFbS" id="WMsS6mDK3V" role="3clFbx">
+                                      <node concept="3cpWs6" id="WMsS6mDK3W" role="3cqZAp">
+                                        <node concept="3fl2lp" id="WMsS6mDK3X" role="3cqZAk">
+                                          <ref role="3fl3PK" to="kxzb:32notsQsTE3" resolve="getNodeReference" />
+                                          <node concept="3B5_sB" id="WMsS6mDK3Y" role="3fl3PI">
+                                            <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3JuTUA" id="WMsS6mDK3Z" role="3clFbw">
+                                      <node concept="37vLTw" id="WMsS6mDK40" role="3JuY14">
+                                        <ref role="3cqZAo" node="WMsS6mDK3N" resolve="type" />
+                                      </node>
+                                      <node concept="2c44tf" id="WMsS6mDK41" role="3JuZjQ">
+                                        <node concept="A3Dl8" id="WMsS6mDK42" role="2c44tc">
+                                          <node concept="3Tqbb2" id="WMsS6mDK43" role="A3Ik2" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbJ" id="WMsS6mDK44" role="3cqZAp">
+                                    <node concept="3clFbS" id="WMsS6mDK45" role="3clFbx">
+                                      <node concept="3cpWs6" id="WMsS6mDK46" role="3cqZAp">
+                                        <node concept="3fl2lp" id="WMsS6mDK47" role="3cqZAk">
+                                          <ref role="3fl3PK" to="kxzb:32notsQsUA1" resolve="getReferenceReference" />
+                                          <node concept="3B5_sB" id="WMsS6mDK48" role="3fl3PI">
+                                            <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3JuTUA" id="WMsS6mDK49" role="3clFbw">
+                                      <node concept="37vLTw" id="WMsS6mDK4a" role="3JuY14">
+                                        <ref role="3cqZAo" node="WMsS6mDK3N" resolve="type" />
+                                      </node>
+                                      <node concept="2c44tf" id="WMsS6mDK4b" role="3JuZjQ">
+                                        <node concept="A3Dl8" id="WMsS6mDK4c" role="2c44tc">
+                                          <node concept="2z4iKi" id="WMsS6mDK4d" role="A3Ik2" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbJ" id="WMsS6mDK4e" role="3cqZAp">
+                                    <node concept="3clFbS" id="WMsS6mDK4f" role="3clFbx">
+                                      <node concept="3cpWs6" id="WMsS6mDK4g" role="3cqZAp">
+                                        <node concept="3fl2lp" id="WMsS6mDK4h" role="3cqZAk">
+                                          <ref role="3fl3PK" to="kxzb:32notsQsVkE" resolve="getModelReference" />
+                                          <node concept="3B5_sB" id="WMsS6mDK4i" role="3fl3PI">
+                                            <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3JuTUA" id="WMsS6mDK4j" role="3clFbw">
+                                      <node concept="37vLTw" id="WMsS6mDK4k" role="3JuY14">
+                                        <ref role="3cqZAo" node="WMsS6mDK3N" resolve="type" />
+                                      </node>
+                                      <node concept="2c44tf" id="WMsS6mDK4l" role="3JuZjQ">
+                                        <node concept="A3Dl8" id="WMsS6mDK4m" role="2c44tc">
+                                          <node concept="H_c77" id="WMsS6mDK4n" role="A3Ik2" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbJ" id="WMsS6mDK4o" role="3cqZAp">
+                                    <node concept="3clFbS" id="WMsS6mDK4p" role="3clFbx">
+                                      <node concept="3cpWs6" id="WMsS6mDK4q" role="3cqZAp">
+                                        <node concept="3fl2lp" id="WMsS6mDK4r" role="3cqZAk">
+                                          <ref role="3fl3PK" to="kxzb:32notsQsW4c" resolve="getModuleReference" />
+                                          <node concept="3B5_sB" id="WMsS6mDK4s" role="3fl3PI">
+                                            <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3JuTUA" id="WMsS6mDK4t" role="3clFbw">
+                                      <node concept="37vLTw" id="WMsS6mDK4u" role="3JuY14">
+                                        <ref role="3cqZAo" node="WMsS6mDK3N" resolve="type" />
+                                      </node>
+                                      <node concept="2c44tf" id="WMsS6mDK4v" role="3JuZjQ">
+                                        <node concept="A3Dl8" id="WMsS6mDK4w" role="2c44tc">
+                                          <node concept="3uibUv" id="WMsS6mDK4x" role="A3Ik2">
+                                            <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3cpWs6" id="WMsS6mDK4y" role="3cqZAp">
+                                    <node concept="10Nm6u" id="WMsS6mDK4z" role="3cqZAk" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="WMsS6mDK4$" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="WMsS6mDK4_" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="WMsS6mDK4A" role="37wK5m">
+                  <node concept="2OqwBi" id="WMsS6mDK4B" role="2Oq$k0">
+                    <node concept="37vLTw" id="WMsS6mDK4C" role="2Oq$k0">
+                      <ref role="3cqZAo" node="YwfKjlWDwm" resolve="context" />
+                    </node>
+                    <node concept="liA8E" id="WMsS6mDK4D" role="2OqNvi">
+                      <ref role="37wK5l" to="qgo0:3MPHfSuPT3Y" resolve="getProject" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="WMsS6mDK4E" role="2OqNvi">
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  </node>
+                </node>
+                <node concept="1ZhdrF" id="WMsS6mDK4F" role="lGtFl">
+                  <property role="2qtEX8" value="baseMethodDeclaration" />
+                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                  <node concept="3$xsQk" id="WMsS6mDK4G" role="3$ytzL">
+                    <node concept="3clFbS" id="WMsS6mDK4H" role="2VODD2">
+                      <node concept="3cpWs8" id="WMsS6mDK4I" role="3cqZAp">
+                        <node concept="3cpWsn" id="WMsS6mDK4J" role="3cpWs9">
+                          <property role="TrG5h" value="type" />
+                          <node concept="3Tqbb2" id="WMsS6mDK4K" role="1tU5fm" />
+                          <node concept="2OqwBi" id="WMsS6mDK4L" role="33vP2m">
+                            <node concept="2OqwBi" id="WMsS6mDK4M" role="2Oq$k0">
+                              <node concept="30H73N" id="WMsS6mDK4N" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="WMsS6mDK4O" role="2OqNvi">
+                                <ref role="3Tt5mk" to="caxt:6_TW7xVwuxP" />
+                              </node>
+                            </node>
+                            <node concept="3JvlWi" id="WMsS6mDK4P" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbJ" id="WMsS6mDK4Q" role="3cqZAp">
+                        <node concept="3clFbS" id="WMsS6mDK4R" role="3clFbx">
+                          <node concept="3cpWs6" id="WMsS6mDK4S" role="3cqZAp">
+                            <node concept="3fl2lp" id="WMsS6mDK4T" role="3cqZAk">
+                              <ref role="3fl3PK" to="kxzb:YwfKjlXcuc" resolve="nodesToResults" />
+                              <node concept="3B5_sB" id="WMsS6mDK4U" role="3fl3PI">
+                                <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3JuTUA" id="WMsS6mDK4V" role="3clFbw">
+                          <node concept="37vLTw" id="WMsS6mDK4W" role="3JuY14">
+                            <ref role="3cqZAo" node="WMsS6mDK4J" resolve="type" />
+                          </node>
+                          <node concept="2c44tf" id="WMsS6mDK4X" role="3JuZjQ">
+                            <node concept="A3Dl8" id="WMsS6mDK4Y" role="2c44tc">
+                              <node concept="3Tqbb2" id="WMsS6mDK4Z" role="A3Ik2" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbJ" id="WMsS6mDK50" role="3cqZAp">
+                        <node concept="3clFbS" id="WMsS6mDK51" role="3clFbx">
+                          <node concept="3cpWs6" id="WMsS6mDK52" role="3cqZAp">
+                            <node concept="3fl2lp" id="WMsS6mDK53" role="3cqZAk">
+                              <ref role="3fl3PK" to="kxzb:YwfKjlXcuc" resolve="nodesToResults" />
+                              <node concept="3B5_sB" id="WMsS6mDK54" role="3fl3PI">
+                                <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3JuTUA" id="WMsS6mDK55" role="3clFbw">
+                          <node concept="37vLTw" id="WMsS6mDK56" role="3JuY14">
+                            <ref role="3cqZAo" node="WMsS6mDK4J" resolve="type" />
+                          </node>
+                          <node concept="2c44tf" id="WMsS6mDK57" role="3JuZjQ">
+                            <node concept="A3Dl8" id="WMsS6mDK58" role="2c44tc">
+                              <node concept="2z4iKi" id="WMsS6mDK59" role="A3Ik2" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbJ" id="WMsS6mDK5a" role="3cqZAp">
+                        <node concept="3clFbS" id="WMsS6mDK5b" role="3clFbx">
+                          <node concept="3cpWs6" id="WMsS6mDK5c" role="3cqZAp">
+                            <node concept="3fl2lp" id="WMsS6mDK5d" role="3cqZAk">
+                              <ref role="3fl3PK" to="kxzb:YwfKjlXcx9" resolve="modelsToResults" />
+                              <node concept="3B5_sB" id="WMsS6mDK5e" role="3fl3PI">
+                                <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3JuTUA" id="WMsS6mDK5f" role="3clFbw">
+                          <node concept="37vLTw" id="WMsS6mDK5g" role="3JuY14">
+                            <ref role="3cqZAo" node="WMsS6mDK4J" resolve="type" />
+                          </node>
+                          <node concept="2c44tf" id="WMsS6mDK5h" role="3JuZjQ">
+                            <node concept="A3Dl8" id="WMsS6mDK5i" role="2c44tc">
+                              <node concept="H_c77" id="WMsS6mDK5j" role="A3Ik2" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbJ" id="WMsS6mDK5k" role="3cqZAp">
+                        <node concept="3clFbS" id="WMsS6mDK5l" role="3clFbx">
+                          <node concept="3cpWs6" id="WMsS6mDK5m" role="3cqZAp">
+                            <node concept="3fl2lp" id="WMsS6mDK5n" role="3cqZAk">
+                              <ref role="3fl3PK" to="kxzb:YwfKjlXcyY" resolve="modulesToResults" />
+                              <node concept="3B5_sB" id="WMsS6mDK5o" role="3fl3PI">
+                                <ref role="3B5MYn" to="kxzb:hpHLh7Fj1$" resolve="CommandUtil" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3JuTUA" id="WMsS6mDK5p" role="3clFbw">
+                          <node concept="37vLTw" id="WMsS6mDK5q" role="3JuY14">
+                            <ref role="3cqZAo" node="WMsS6mDK4J" resolve="type" />
+                          </node>
+                          <node concept="2c44tf" id="WMsS6mDK5r" role="3JuZjQ">
+                            <node concept="A3Dl8" id="WMsS6mDK5s" role="2c44tc">
+                              <node concept="3uibUv" id="WMsS6mDK5t" role="A3Ik2">
+                                <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs6" id="WMsS6mDK5u" role="3cqZAp">
+                        <node concept="10Nm6u" id="WMsS6mDK5v" role="3cqZAk" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="WMsS6mDK5w" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="YwfKjlWDwB" role="1B3o_S" />
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl
index 553d1e9893ac..9e8ef42833a3 100644
--- a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl
+++ b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl
@@ -18,7 +18,7 @@
         <facet type="java" />
       </facets>
       <external-templates>
-        <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
+        <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.lang.smodel.query#5336086527852811409)" />
       </external-templates>
       <dependencies>
         <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
@@ -26,6 +26,9 @@
         <dependency reexport="false">a5e4de53-46a3-44da-aab3-68fdf1c34ed0(jetbrains.mps.console.ideCommands)</dependency>
         <dependency reexport="false">c7567052-205c-4a15-80b0-7a32b32a9656(jetbrains.mps.console.ideCommands.runtime)</dependency>
         <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
+        <dependency reexport="false">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
+        <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+        <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
       </dependencies>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -39,47 +42,18 @@
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
         <language id="de1ad86d-6e50-4a02-b306-d4d17f64c375" fqName="jetbrains.mps.console.base" version="0" />
-        <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" fqName="jetbrains.mps.console.blCommand" version="0" />
         <language id="a5e4de53-46a3-44da-aab3-68fdf1c34ed0" fqName="jetbrains.mps.console.ideCommands" version="0" />
         <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
         <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
         <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
+        <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" fqName="jetbrains.mps.lang.smodel.query" version="0" />
         <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="0" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
         <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" fqName="jetbrains.mps.lang.typesystem" version="0" />
       </languageVersions>
-      <mapping-priorities>
-        <mapping-priority-rule kind="strictly_together">
-          <greater-priority-mapping>
-            <generator generatorUID="cb761471-7219-4984-9a63-b9c8b4d27e89(jetbrains.mps.console.ideCommands#7935955022005272663)" />
-            <external-mapping>
-              <mapping-node modelUID="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)" nodeID="7935955022005272664" />
-            </external-mapping>
-          </greater-priority-mapping>
-          <lesser-priority-mapping>
-            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
-            <external-mapping>
-              <mapping-node modelUID="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" nodeID="5336086527852811410" />
-            </external-mapping>
-          </lesser-priority-mapping>
-        </mapping-priority-rule>
-        <mapping-priority-rule kind="strictly_together">
-          <greater-priority-mapping>
-            <generator generatorUID="cb761471-7219-4984-9a63-b9c8b4d27e89(jetbrains.mps.console.ideCommands#7935955022005272663)" />
-            <external-mapping>
-              <mapping-node modelUID="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)" nodeID="5582028874769273923" />
-            </external-mapping>
-          </greater-priority-mapping>
-          <lesser-priority-mapping>
-            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
-            <external-mapping>
-              <mapping-node modelUID="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" nodeID="7600370246415688284" />
-            </external-mapping>
-          </lesser-priority-mapping>
-        </mapping-priority-rule>
-      </mapping-priorities>
+      <mapping-priorities />
     </generator>
   </generators>
   <sourcePath />
@@ -135,7 +109,7 @@
     <extendedLanguage>ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</extendedLanguage>
     <extendedLanguage>de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)</extendedLanguage>
     <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
-    <extendedLanguage>1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)</extendedLanguage>
+    <extendedLanguage>1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps
index 1d8efbf26efc..22d45c5ed573 100644
--- a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps
+++ b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps
@@ -840,7 +840,7 @@
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3uibUv" id="3ob4OZ0hw3p" role="11_B2D">
                     <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                    <node concept="3uibUv" id="3ob4OZ0hxKj" role="11_B2D">
+                    <node concept="3uibUv" id="3ZgZ1njWI$G" role="11_B2D">
                       <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                     </node>
                     <node concept="3uibUv" id="3ob4OZ0hxsL" role="11_B2D">
@@ -866,7 +866,7 @@
                 <property role="TrG5h" value="string" />
                 <node concept="3uibUv" id="3ob4OZ0hz_R" role="1tU5fm">
                   <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                  <node concept="3uibUv" id="3ob4OZ0nb9y" role="11_B2D">
+                  <node concept="3uibUv" id="3ZgZ1njWIJG" role="11_B2D">
                     <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                   </node>
                   <node concept="3uibUv" id="3ob4OZ0ncst" role="11_B2D">
diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps
index 6ff67a334dba..6b705445432e 100644
--- a/plugins/console/lang/ideCommands/languageModels/behavior.mps
+++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps
@@ -35,8 +35,8 @@
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -251,7 +251,7 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
-      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3THzug">
+      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug">
         <reference id="1180481110358" name="conceptDeclaraton" index="3qa414" />
       </concept>
       <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
@@ -641,7 +641,7 @@
       </node>
       <node concept="37vLTG" id="1El5OLrKnuV" role="3clF46">
         <property role="TrG5h" value="c" />
-        <node concept="3uibUv" id="1El5OLrKnuU" role="1tU5fm">
+        <node concept="3uibUv" id="74Mzs6yeopC" role="1tU5fm">
           <ref role="3uigEE" to="qgo0:jysm2GDsTL" resolve="ConsoleContext" />
         </node>
       </node>
@@ -2453,7 +2453,7 @@
     <node concept="13i0hz" id="yhQm9_Wh7o" role="13h7CS">
       <property role="TrG5h" value="getHelpPage" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:64VftqEen2L" resolve="getHelpPage" />
+      <ref role="13i0hy" to="fq2o:64VftqEen2L" resolve="getHelpPage" />
       <node concept="3clFbS" id="yhQm9_WjKE" role="3clF47">
         <node concept="3clFbF" id="yhQm9_WzpE" role="3cqZAp">
           <node concept="Xl_RD" id="yhQm9_WzpD" role="3clFbG">
@@ -2498,14 +2498,14 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getDisplayString" />
-      <ref role="13i0hy" to="zyb2:5YxQmqOFZEf" resolve="getDisplayString" />
+      <ref role="13i0hy" to="fq2o:5YxQmqOFZEf" resolve="getDisplayString" />
       <node concept="3Tm1VV" id="25MaZwhhNmp" role="1B3o_S" />
       <node concept="3clFbS" id="25MaZwhhNmL" role="3clF47">
         <node concept="3clFbF" id="25MaZwhi1kV" role="3cqZAp">
           <node concept="2OqwBi" id="25MaZwhi1pN" role="3clFbG">
             <node concept="13iPFW" id="25MaZwhi1kS" role="2Oq$k0" />
             <node concept="2qgKlT" id="25MaZwhi1I2" role="2OqNvi">
-              <ref role="37wK5l" to="zyb2:64VftqEenfn" resolve="getShortDisplayString" />
+              <ref role="37wK5l" to="fq2o:64VftqEenfn" resolve="getShortDisplayString" />
             </node>
           </node>
         </node>
@@ -2527,7 +2527,7 @@
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getShortHelp" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
       <node concept="3Tm1VV" id="2tFdLTRKcTN" role="1B3o_S" />
       <node concept="3clFbS" id="2tFdLTRKcTQ" role="3clF47">
         <node concept="3clFbF" id="2tFdLTRKcWU" role="3cqZAp">
@@ -2545,5 +2545,42 @@
       <node concept="3clFbS" id="59iQg8rz24z" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="3E_u19H2QLn">
+    <property role="3GE5qa" value="" />
+    <ref role="13h7C2" to="caxt:7mV0m3L$tuv" resolve="ShowExpression" />
+    <node concept="13i0hz" id="3E_u19H2QLq" role="13h7CS">
+      <property role="2Ki8OM" value="true" />
+      <property role="TrG5h" value="legalAsStatement" />
+      <ref role="13i0hy" to="tpek:1653mnvAgqK" resolve="legalAsStatement" />
+      <node concept="3clFbS" id="3E_u19H2QLt" role="3clF47">
+        <node concept="3clFbF" id="3E_u19H2QLB" role="3cqZAp">
+          <node concept="3clFbT" id="3E_u19H2QLA" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="3E_u19H2QLy" role="3clF45" />
+      <node concept="3Tm1VV" id="3E_u19H2QLz" role="1B3o_S" />
+    </node>
+    <node concept="13i0hz" id="64VftqErvLH" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getShortHelp" />
+      <property role="2Ki8OM" value="true" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
+      <node concept="3Tm1VV" id="64VftqErvLI" role="1B3o_S" />
+      <node concept="3clFbS" id="64VftqErvLL" role="3clF47">
+        <node concept="3clFbF" id="64VftqErxUy" role="3cqZAp">
+          <node concept="Xl_RD" id="64VftqErxUx" role="3clFbG">
+            <property role="Xl_RC" value="show sequence of nodes/references/models/modules in the Usages View panel" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="64VftqErvLM" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="3E_u19H2QLo" role="13h7CW">
+      <node concept="3clFbS" id="3E_u19H2QLp" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/console/lang/ideCommands/languageModels/editor.mps b/plugins/console/lang/ideCommands/languageModels/editor.mps
index 432a2f2bae6b..374f8f172bda 100644
--- a/plugins/console/lang/ideCommands/languageModels/editor.mps
+++ b/plugins/console/lang/ideCommands/languageModels/editor.mps
@@ -13,7 +13,7 @@
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="unno" ref="r:61e3d524-8c49-4491-b5e3-f6d6e9364527(jetbrains.mps.util)" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
-    <import index="n8mm" ref="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)" />
+    <import index="n8mm" ref="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)" />
     <import index="tpep" ref="r:00000000-0000-4000-0000-011c895902fd(jetbrains.mps.lang.smodel.editor)" />
     <import index="tpeu" ref="r:00000000-0000-4000-0000-011c895902fa(jetbrains.mps.lang.smodel.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -445,5 +445,18 @@
       <node concept="2iRfu4" id="3ZZC$G5C4ux" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="YwfKjlWn7V">
+    <property role="3GE5qa" value="" />
+    <ref role="1XX52x" to="caxt:7mV0m3L$tuv" resolve="ShowExpression" />
+    <node concept="3EZMnI" id="YwfKjlWo_n" role="2wV5jI">
+      <node concept="PMmxH" id="YwfKjlWo_l" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3F1sOY" id="YwfKjlWo_w" role="3EZMnx">
+        <ref role="1NtTu8" to="caxt:6_TW7xVwuxP" />
+      </node>
+      <node concept="l2Vlx" id="3J6h25QyTg8" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/console/lang/ideCommands/languageModels/structure.mps b/plugins/console/lang/ideCommands/languageModels/structure.mps
index c8a07b1e06d1..4424140ca28d 100644
--- a/plugins/console/lang/ideCommands/languageModels/structure.mps
+++ b/plugins/console/lang/ideCommands/languageModels/structure.mps
@@ -10,7 +10,7 @@
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tp4k" ref="r:00000000-0000-4000-0000-011c89590368(jetbrains.mps.lang.plugin.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -262,7 +262,7 @@
       <ref role="20lvS9" node="4PRmqZe_ouF" resolve="ActionCallParameter" />
     </node>
     <node concept="PrWs8" id="DySRn8YGSD" role="PzmwI">
-      <ref role="PrY4T" to="3xdn:64VftqErqMg" resolve="ConsoleExpression" />
+      <ref role="PrY4T" to="3xdn:64VftqErqMg" resolve="ExpressionHelpProvider" />
     </node>
   </node>
   <node concept="1TIwiD" id="4PRmqZe_ouK">
@@ -348,7 +348,23 @@
       <ref role="20lvS9" to="tpee:fKQsSyN" resolve="EnumConstantDeclaration" />
     </node>
     <node concept="PrWs8" id="59iQg8ryZAl" role="PzmwI">
-      <ref role="PrY4T" to="3xdn:59iQg8ryQK3" resolve="ConsoleOperation" />
+      <ref role="PrY4T" to="3xdn:59iQg8ryQK3" resolve="OperationHelpProvider" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7mV0m3L$tuv">
+    <property role="3GE5qa" value="" />
+    <property role="TrG5h" value="ShowExpression" />
+    <property role="34LRSv" value="#show" />
+    <property role="R4oN_" value="show in usage view" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="PrWs8" id="64VftqErvIP" role="PzmwI">
+      <ref role="PrY4T" to="3xdn:64VftqErqMg" resolve="ExpressionHelpProvider" />
+    </node>
+    <node concept="1TJgyj" id="6_TW7xVwuxP" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="object" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
 </model>
diff --git a/plugins/console/lang/ideCommands/languageModels/typesystem.mps b/plugins/console/lang/ideCommands/languageModels/typesystem.mps
index 042d275da43b..5cbe2be2daab 100644
--- a/plugins/console/lang/ideCommands/languageModels/typesystem.mps
+++ b/plugins/console/lang/ideCommands/languageModels/typesystem.mps
@@ -154,6 +154,7 @@
         <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="8758390115029295477" name="jetbrains.mps.lang.smodel.structure.SReferenceType" flags="in" index="2z4iKi" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
@@ -1085,5 +1086,64 @@
       <ref role="1YaFvo" to="caxt:59iQg8ryOmC" resolve="OfAspectOperation" />
     </node>
   </node>
+  <node concept="1YbPZF" id="6_TW7xV9dnY">
+    <property role="TrG5h" value="typeof_ShowExpression" />
+    <property role="3GE5qa" value="" />
+    <node concept="3clFbS" id="6_TW7xV9dnZ" role="18ibNy">
+      <node concept="1Z5TYs" id="6_TW7xV9dwz" role="3cqZAp">
+        <node concept="mw_s8" id="6_TW7xV9dxK" role="1ZfhKB">
+          <node concept="2c44tf" id="6_TW7xV9dxG" role="mwGJk">
+            <node concept="3cqZAl" id="6_TW7xV9dyt" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="6_TW7xV9dwA" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6_TW7xV9dpk" role="mwGJk">
+            <node concept="1YBJjd" id="6_TW7xV9dpZ" role="1Z2MuG">
+              <ref role="1YBMHb" node="6_TW7xV9do1" resolve="showExpression" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1ZobV4" id="6_TW7xVwwFu" role="3cqZAp">
+        <property role="3wDh2S" value="true" />
+        <node concept="mw_s8" id="6_TW7xVwwFx" role="1ZfhK$">
+          <node concept="1Z2H0r" id="6_TW7xVwuDy" role="mwGJk">
+            <node concept="2OqwBi" id="6_TW7xVwvF7" role="1Z2MuG">
+              <node concept="1YBJjd" id="6_TW7xVwuEm" role="2Oq$k0">
+                <ref role="1YBMHb" node="6_TW7xV9do1" resolve="showExpression" />
+              </node>
+              <node concept="3TrEf2" id="6_TW7xVwwtZ" role="2OqNvi">
+                <ref role="3Tt5mk" to="caxt:6_TW7xVwuxP" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="6_TW7xVwwOK" role="1ZfhKB">
+          <node concept="2c44tf" id="6_TW7xVwwOL" role="mwGJk">
+            <node concept="2usRSg" id="6_TW7xVwwOM" role="2c44tc">
+              <node concept="A3Dl8" id="6_TW7xVwwON" role="2usUpS">
+                <node concept="3Tqbb2" id="6_TW7xVwwOO" role="A3Ik2" />
+              </node>
+              <node concept="A3Dl8" id="6_TW7xVwwOP" role="2usUpS">
+                <node concept="2z4iKi" id="6_TW7xVwwOQ" role="A3Ik2" />
+              </node>
+              <node concept="A3Dl8" id="6_TW7xVwwOR" role="2usUpS">
+                <node concept="H_c77" id="6_TW7xVwwOS" role="A3Ik2" />
+              </node>
+              <node concept="A3Dl8" id="6_TW7xVwwOT" role="2usUpS">
+                <node concept="3uibUv" id="6_TW7xVwwOU" role="A3Ik2">
+                  <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6_TW7xV9do1" role="1YuTPh">
+      <property role="TrG5h" value="showExpression" />
+      <ref role="1YaFvo" to="caxt:7mV0m3L$tuv" resolve="ShowExpression" />
+    </node>
+  </node>
 </model>
 
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies
index cc379b17528f..5688e3ccdfc8 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies
@@ -14,8 +14,8 @@
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.AbsractMake_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
@@ -78,6 +78,7 @@
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.ProjectStatisticsTarget_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.RemoveGenSources_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.ShowBrokenReferences_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.ShowExpression_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.ShowGenPlan_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.StatCommand_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.SubtreeStatisticsTarget_BehaviorDescriptor" />
@@ -94,10 +95,10 @@
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.CallActionExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode extendsClassName="java.lang.Cloneable" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
@@ -318,9 +319,9 @@
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.collections.behavior.SequenceOperation_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_BehaviorDescriptor" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode extendsClassName="java.lang.Cloneable" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
@@ -417,6 +418,23 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
   </dependency>
+  <dependency className="jetbrains.mps.console.ideCommands.behavior.ShowExpression_Behavior" file="ShowExpression_Behavior.java">
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+  </dependency>
+  <dependency className="jetbrains.mps.console.ideCommands.behavior.ShowExpression_BehaviorDescriptor" file="ShowExpression_BehaviorDescriptor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.ShowExpression_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
+    <classNode extendsClassName="java.lang.Cloneable" />
+    <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
+  </dependency>
   <dependency className="jetbrains.mps.console.ideCommands.behavior.ShowGenPlan_Behavior" file="ShowGenPlan_Behavior.java">
     <classNode dependClassName="jetbrains.mps.console.ideCommands.behavior.ModelReference_Behavior" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.util.PartitioningHelper" />
@@ -520,7 +538,7 @@
   <dependency className="jetbrains.mps.console.ideCommands.behavior.WithDependencies_BehaviorDescriptor" file="WithDependencies_BehaviorDescriptor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryParameter_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryParameter_BehaviorDescriptor" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
   </dependency>
 </dependenciesRoot>
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated
index ff4bdb5e8a05..7113f2247b4e 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="eh1trkxfpyvo527l8l8qho3d8u7z0vv" />
+<dependencies version="2" modelHash="4zkgxxzg3p4xmwnwqnjacwz6wqd8gds" />
 
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/dependencies
index 8f0367509a4f..3ef36b9ee637 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/dependencies
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/dependencies
@@ -116,6 +116,7 @@
     <classNode dependClassName="jetbrains.mps.console.ideCommands.editor.OfAspectOperation_Editor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.editor.ProjectStatisticsTarget_Editor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.editor.ShowBrokenReferences_Editor" />
+    <classNode dependClassName="jetbrains.mps.console.ideCommands.editor.ShowExpression_Editor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.editor.ShowGenPlan_Editor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.editor.StatCommand_Editor" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.editor.SubtreeStatisticsTarget_Editor" />
@@ -274,6 +275,21 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
   </dependency>
+  <dependency className="jetbrains.mps.console.ideCommands.editor.ShowExpression_Editor" file="ShowExpression_Editor.java">
+    <classNode dependClassName="java.lang.Override" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment" />
+    <classNode dependClassName="jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo" />
+    <classNode dependClassName="jetbrains.mps.nodeEditor.cells.EditorCell_Collection" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.EditorContext" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.CellActionType" />
+    <classNode dependClassName="jetbrains.mps.openapi.editor.cells.EditorCell" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SContainmentLink" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode extendsClassName="jetbrains.mps.nodeEditor.DefaultNodeEditor" />
+  </dependency>
   <dependency className="jetbrains.mps.console.ideCommands.editor.ShowGenPlan_Editor" file="ShowGenPlan_Editor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated
index 39857df36a52..eff4de860544 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="cccouqorgsnkvjvdtxem9j11kmicf6w" />
+<dependencies version="2" modelHash="-yazldu7vs74xvghv100uea1lrp4o9" />
 
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated
index 4269ebbd8947..82d9f3e3e856 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-6bg5h5vmdaqfxwnx6p55u1xzibtd5mh" />
+<dependencies version="2" modelHash="b1gggdw8x2la6ijriwph7yaaoa62qvo" />
 
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated
index 667f49f02ed2..0895b1f947eb 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-2vj0w04ir5hn6fpgbh07qdwgf238lz9" />
+<dependencies version="2" modelHash="ak8ng2lk0gt8loemdqvmabl1l4usbzo" />
 
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/dependencies
index 4236e3b6ff70..57a9b4f28f3d 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/dependencies
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/dependencies
@@ -10,6 +10,7 @@
     <classNode dependClassName="jetbrains.mps.console.ideCommands.typesystem.typeof_ModelProperties_InferenceRule" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.typesystem.typeof_ModuleProperties_InferenceRule" />
     <classNode dependClassName="jetbrains.mps.console.ideCommands.typesystem.typeof_OfAspectOperation_InferenceRule" />
+    <classNode dependClassName="jetbrains.mps.console.ideCommands.typesystem.typeof_ShowExpression_InferenceRule" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
     <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.NonTypesystemRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor" />
@@ -166,5 +167,19 @@
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
     <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
   </dependency>
+  <dependency className="jetbrains.mps.console.ideCommands.typesystem.typeof_ShowExpression_InferenceRule" file="typeof_ShowExpression_InferenceRule.java">
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus" />
+    <classNode dependClassName="jetbrains.mps.smodel.SModelUtil_new" />
+    <classNode dependClassName="jetbrains.mps.smodel.SReference" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.EquationInfo" />
+    <classNode dependClassName="jetbrains.mps.typesystem.inference.TypeCheckingContext" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
+    <classNode dependClassName="org.jetbrains.mps.openapi.persistence.PersistenceFacade" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime" />
+    <classNode extendsClassName="jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime" />
+  </dependency>
 </dependenciesRoot>
 
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/generated
index c91ce89fd7bf..fb8f8b00d060 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/generated
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="1wvdv2vm2s89dz05kfvlks2gl1z9wx7" />
+<dependencies version="2" modelHash="-c51rowwphh2cse72q5jx6bn9ey8p4hs" />
 
diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated
index e484b9a71262..4aa01f434e28 100644
--- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated
+++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="4s0gxfmypd9inx0vi5bahlnmv4v6s6a" />
+<dependencies version="2" modelHash="44dywu9rg5ypg7dbz6zvd1kk41ja2wl" />
 
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/Language.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/Language.java
index 1d8e9e66d8c8..b0185bcc43c9 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/Language.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/Language.java
@@ -38,7 +38,7 @@ public SLanguageId getId() {
   }
   @Override
   protected String[] getExtendedLanguageIDs() {
-    return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.console.base", "jetbrains.mps.baseLanguage", "jetbrains.mps.console.blCommand"};
+    return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.console.base", "jetbrains.mps.baseLanguage", "jetbrains.mps.lang.smodel.query"};
   }
   @Override
   public Collection<TemplateModule> getGenerators() {
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/AbsractMake_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/AbsractMake_BehaviorDescriptor.java
index 575bda6bfdcb..297a65e4b526 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/AbsractMake_BehaviorDescriptor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/AbsractMake_BehaviorDescriptor.java
@@ -2,7 +2,7 @@
 
 /*Generated by MPS */
 
-import jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
 import org.jetbrains.mps.openapi.model.SNode;
 
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/BehaviorAspectDescriptor.java
index 1de03dea60c2..5c41574a97a1 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/BehaviorAspectDescriptor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/BehaviorAspectDescriptor.java
@@ -11,7 +11,7 @@ public BehaviorAspectDescriptor() {
   }
   public BehaviorDescriptor getDescriptor(String fqName) {
     switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) {
-      case 17:
+      case 18:
         return new StatCommand_BehaviorDescriptor();
       case 5:
         return new GlobalStatisticTarget_BehaviorDescriptor();
@@ -21,13 +21,13 @@ public BehaviorDescriptor getDescriptor(String fqName) {
         return new ModelStatisticsTarget_BehaviorDescriptor();
       case 15:
         return new ShowBrokenReferences_BehaviorDescriptor();
-      case 18:
+      case 19:
         return new SubtreeStatisticsTarget_BehaviorDescriptor();
       case 8:
         return new ModelReference_BehaviorDescriptor();
       case 11:
         return new NodeReference_BehaviorDescriptor();
-      case 16:
+      case 17:
         return new ShowGenPlan_BehaviorDescriptor();
       case 4:
         return new ClickableGenerator_BehaviorDescriptor();
@@ -43,7 +43,7 @@ public BehaviorDescriptor getDescriptor(String fqName) {
         return new ModuleProperties_BehaviorDescriptor();
       case 6:
         return new Make_BehaviorDescriptor();
-      case 19:
+      case 20:
         return new WithDependencies_BehaviorDescriptor();
       case 3:
         return new Clean_BehaviorDescriptor();
@@ -51,9 +51,11 @@ public BehaviorDescriptor getDescriptor(String fqName) {
         return new RemoveGenSources_BehaviorDescriptor();
       case 12:
         return new OfAspectOperation_BehaviorDescriptor();
+      case 16:
+        return new ShowExpression_BehaviorDescriptor();
       default:
         return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName);
     }
   }
-  private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.Clean", "jetbrains.mps.console.ideCommands.structure.ClickableGenerator", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.Make", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.RemoveGenSources", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.WithDependencies"};
+  private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.Clean", "jetbrains.mps.console.ideCommands.structure.ClickableGenerator", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.Make", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.RemoveGenSources", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowExpression", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.WithDependencies"};
 }
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java
index df0782be977d..684c4c46ae4e 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java
@@ -3,31 +3,31 @@
 /*Generated by MPS */
 
 import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor;
-import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior;
-import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior;
 
-public class CallActionExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor {
+public class CallActionExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor {
   public CallActionExpression_BehaviorDescriptor() {
   }
   public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
+    return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
   }
   public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
   }
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
+    return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
   }
   public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
-    return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept);
+    return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept);
   }
   public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
   }
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
   }
   public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) {
     return CallActionExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept);
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java
index edf8613290df..d58f550217dd 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java
@@ -3,31 +3,31 @@
 /*Generated by MPS */
 
 import jetbrains.mps.baseLanguage.collections.behavior.SequenceOperation_BehaviorDescriptor;
-import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior;
-import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_Behavior;
 
-public class OfAspectOperation_BehaviorDescriptor extends SequenceOperation_BehaviorDescriptor implements ConsoleOperation_BehaviorDescriptor {
+public class OfAspectOperation_BehaviorDescriptor extends SequenceOperation_BehaviorDescriptor implements OperationHelpProvider_BehaviorDescriptor {
   public OfAspectOperation_BehaviorDescriptor() {
   }
   public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
+    return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
   }
   public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
   }
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
+    return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
   }
   public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
-    return ConsoleOperation_Behavior.virtual_getKind_7006261637493126084(thisConcept);
+    return OperationHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept);
   }
   public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
   }
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
   }
   @Override
   public String getConceptFqName() {
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_Behavior.java
similarity index 91%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java
rename to plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_Behavior.java
index f95588b10e1f..729ea9e5d9db 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_Behavior.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.ideCommands.behavior;
 
 /*Generated by MPS */
 
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_BehaviorDescriptor.java
similarity index 55%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java
rename to plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_BehaviorDescriptor.java
index 0386f7eac558..c410a8632b28 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_BehaviorDescriptor.java
@@ -1,28 +1,30 @@
-package jetbrains.mps.console.blCommand.behavior;
+package jetbrains.mps.console.ideCommands.behavior;
 
 /*Generated by MPS */
 
 import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior;
 
-public class ShowExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor {
+public class ShowExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor {
   public ShowExpression_BehaviorDescriptor() {
   }
   public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
+    return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
   }
   public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
   }
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
+    return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
   }
   public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
-    return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept);
+    return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept);
   }
   public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
   }
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
     return ShowExpression_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
@@ -32,6 +34,6 @@ public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept
   }
   @Override
   public String getConceptFqName() {
-    return "jetbrains.mps.console.blCommand.structure.ShowExpression";
+    return "jetbrains.mps.console.ideCommands.structure.ShowExpression";
   }
 }
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/WithDependencies_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/WithDependencies_BehaviorDescriptor.java
index 474804dd5257..bb51bcf3d3dc 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/WithDependencies_BehaviorDescriptor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/WithDependencies_BehaviorDescriptor.java
@@ -2,7 +2,7 @@
 
 /*Generated by MPS */
 
-import jetbrains.mps.console.blCommand.behavior.QueryParameter_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.QueryParameter_BehaviorDescriptor;
 
 public class WithDependencies_BehaviorDescriptor extends QueryParameter_BehaviorDescriptor {
   public WithDependencies_BehaviorDescriptor() {
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info
index c0a3bba89189..a71b4b140176 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info
@@ -28,7 +28,7 @@
       <unit at="8,0,17,0" name="jetbrains.mps.console.ideCommands.behavior.ActionCallParameter_BehaviorDescriptor" />
     </file>
     <file name="BehaviorAspectDescriptor.java">
-      <unit at="9,0,60,0" name="jetbrains.mps.console.ideCommands.behavior.BehaviorAspectDescriptor" />
+      <unit at="9,0,62,0" name="jetbrains.mps.console.ideCommands.behavior.BehaviorAspectDescriptor" />
     </file>
     <file name="CallActionExpression_BehaviorDescriptor.java">
       <unit at="11,0,40,0" name="jetbrains.mps.console.ideCommands.behavior.CallActionExpression_BehaviorDescriptor" />
@@ -81,6 +81,9 @@
     <file name="ShowBrokenReferences_BehaviorDescriptor.java">
       <unit at="10,0,21,0" name="jetbrains.mps.console.ideCommands.behavior.ShowBrokenReferences_BehaviorDescriptor" />
     </file>
+    <file name="ShowExpression_BehaviorDescriptor.java">
+      <unit at="11,0,40,0" name="jetbrains.mps.console.ideCommands.behavior.ShowExpression_BehaviorDescriptor" />
+    </file>
     <file name="ShowGenPlan_BehaviorDescriptor.java">
       <unit at="10,0,21,0" name="jetbrains.mps.console.ideCommands.behavior.ShowGenPlan_BehaviorDescriptor" />
     </file>
@@ -365,6 +368,28 @@
       <unit id="3894227536041893272" at="25,0,112,0" name="jetbrains.mps.console.ideCommands.behavior.ClickableGenerator_Behavior" />
     </file>
   </root>
+  <root nodeRef="r:18b0a31c-6c8b-45fd-b098-332c1656d60c(jetbrains.mps.console.ideCommands.behavior)/4225915845891288151">
+    <file name="ShowExpression_Behavior.java">
+      <node id="4225915845891288167" at="11,100,12,16" concept="10" />
+      <node id="7006261637496577698" at="14,94,15,87" concept="10" />
+      <node id="4225915845891288151" at="9,0,11,0" concept="12" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4225915845891288151" at="11,0,14,0" concept="12" trace="virtual_legalAsStatement_1262430001741498032#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Z" />
+      <node id="4225915845891288151" at="14,0,17,0" concept="12" trace="virtual_getShortHelp_473081947982699339#(Lorg/jetbrains/mps/openapi/language/SAbstractConcept;)Ljava/lang/String;" />
+      <scope id="4225915845891288153" at="9,43,9,43" />
+      <scope id="4225915845891288157" at="11,100,12,16" />
+      <scope id="7006261637496568945" at="14,94,15,87" />
+      <scope id="4225915845891288151" at="9,0,11,0">
+        <var name="thisNode" id="4225915845891288151" />
+      </scope>
+      <scope id="4225915845891288151" at="11,0,14,0">
+        <var name="thisConcept" id="4225915845891288151" />
+      </scope>
+      <scope id="4225915845891288151" at="14,0,17,0">
+        <var name="thisConcept" id="4225915845891288151" />
+      </scope>
+      <unit id="4225915845891288151" at="8,0,18,0" name="jetbrains.mps.console.ideCommands.behavior.ShowExpression_Behavior" />
+    </file>
+  </root>
   <root nodeRef="r:18b0a31c-6c8b-45fd-b098-332c1656d60c(jetbrains.mps.console.ideCommands.behavior)/5207260697411458160">
     <file name="INodeSetReference_Behavior.java">
       <node id="9053534423437703278" at="11,110,12,16" concept="10" />
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/AbsractMake_Editor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/AbsractMake_Editor.java
index 777f06ea834a..67ba6884cc3a 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/AbsractMake_Editor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/AbsractMake_Editor.java
@@ -33,7 +33,7 @@ private EditorCell createCollection_uaz3qu_a(EditorContext editorContext, SNode
     return editorCell;
   }
   private EditorCell createComponent_uaz3qu_a0(EditorContext editorContext, SNode node) {
-    EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent");
+    EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent");
     return editorCell;
   }
   private EditorCell createCollection_uaz3qu_b0(EditorContext editorContext, SNode node) {
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/EditorAspectDescriptorImpl.java
index dc2d476c9f48..b9ad1ae4272e 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/EditorAspectDescriptorImpl.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/EditorAspectDescriptorImpl.java
@@ -41,10 +41,12 @@ public Collection<ConceptEditor> getEditors(ConceptDescriptor descriptor) {
       case 12:
         return Collections.<ConceptEditor>singletonList(new ShowBrokenReferences_Editor());
       case 13:
-        return Collections.<ConceptEditor>singletonList(new ShowGenPlan_Editor());
+        return Collections.<ConceptEditor>singletonList(new ShowExpression_Editor());
       case 14:
-        return Collections.<ConceptEditor>singletonList(new StatCommand_Editor());
+        return Collections.<ConceptEditor>singletonList(new ShowGenPlan_Editor());
       case 15:
+        return Collections.<ConceptEditor>singletonList(new StatCommand_Editor());
+      case 16:
         return Collections.<ConceptEditor>singletonList(new SubtreeStatisticsTarget_Editor());
       default:
     }
@@ -55,5 +57,5 @@ public Collection<ConceptEditorComponent> getEditorComponents(ConceptDescriptor
   }
 
 
-  private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.ideCommands.structure.AbsractMake", "jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget"};
+  private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.ideCommands.structure.AbsractMake", "jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowExpression", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget"};
 }
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/ShowExpression_Editor.java
similarity index 96%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java
rename to plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/ShowExpression_Editor.java
index b2de463c6828..e85cd7369bba 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/ShowExpression_Editor.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.editor;
+package jetbrains.mps.console.ideCommands.editor;
 
 /*Generated by MPS */
 
@@ -32,7 +32,7 @@ private EditorCell createComponent_rowo1n_a0(EditorContext editorContext, SNode
     return editorCell;
   }
   private EditorCell createRefNode_rowo1n_b0(EditorContext editorContext, SNode node) {
-    SingleRoleCellProvider provider = new ShowExpression_Editor.objectSingleRoleHandler_rowo1n_b0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), editorContext);
+    SingleRoleCellProvider provider = new ShowExpression_Editor.objectSingleRoleHandler_rowo1n_b0(node, MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), editorContext);
     return provider.createCell();
   }
   private class objectSingleRoleHandler_rowo1n_b0 extends SingleRoleCellProvider {
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/trace.info
index 9531d69418aa..1e44e341e29d 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/trace.info
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/trace.info
@@ -12,7 +12,101 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" />
   <root>
     <file name="EditorAspectDescriptorImpl.java">
-      <unit at="13,0,60,0" name="jetbrains.mps.console.ideCommands.editor.EditorAspectDescriptorImpl" />
+      <unit at="13,0,62,0" name="jetbrains.mps.console.ideCommands.editor.EditorAspectDescriptorImpl" />
+    </file>
+  </root>
+  <root nodeRef="r:5d9868cc-091b-49b3-85eb-87af773e0884(jetbrains.mps.console.ideCommands.editor)/1125969196844413435">
+    <file name="ShowExpression_Editor.java">
+      <node id="1125969196844413435" at="18,79,19,63" concept="7" />
+      <node id="1125969196844413435" at="21,89,22,96" concept="6" />
+      <node id="1125969196844413435" at="22,96,23,48" concept="2" />
+      <node id="1125969196844413435" at="23,48,24,28" concept="2" />
+      <node id="1125969196844413435" at="24,28,25,79" concept="2" />
+      <node id="1125969196844413435" at="25,79,26,82" concept="0" />
+      <node id="1125969196844413435" at="25,79,26,82" concept="2" />
+      <node id="1125969196844413435" at="26,82,27,80" concept="0" />
+      <node id="1125969196844413435" at="26,82,27,80" concept="2" />
+      <node id="1125969196844413435" at="27,80,28,22" concept="7" />
+      <node id="1125969196844419413" at="30,89,31,131" concept="6" />
+      <node id="1125969196844419413" at="31,131,32,22" concept="7" />
+      <node id="1125969196844413435" at="34,87,35,252" concept="6" />
+      <node id="1125969196844413435" at="35,252,36,33" concept="7" />
+      <node id="1125969196844413435" at="39,120,40,49" concept="9" />
+      <node id="1125969196844413435" at="42,81,43,74" concept="6" />
+      <node id="1125969196844413435" at="43,74,44,41" concept="2" />
+      <node id="1125969196844413435" at="44,41,45,24" concept="7" />
+      <node id="1125969196844413435" at="47,69,48,137" concept="2" />
+      <node id="1125969196844413435" at="49,41,50,37" concept="2" />
+      <node id="1125969196844413435" at="56,44,57,54" concept="6" />
+      <node id="1125969196844413435" at="57,54,58,43" concept="2" />
+      <node id="1125969196844413435" at="58,43,59,40" concept="2" />
+      <node id="1125969196844413435" at="59,40,60,24" concept="7" />
+      <node id="1125969196844413435" at="63,40,64,27" concept="7" />
+      <node id="1125969196844413435" at="18,0,21,0" concept="5" trace="createEditorCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1125969196844413435" at="39,0,42,0" concept="1" trace="objectSingleRoleHandler_rowo1n_b0#(Lorg/jetbrains/mps/openapi/model/SNode;Lorg/jetbrains/mps/openapi/language/SContainmentLink;Ljetbrains/mps/openapi/editor/EditorContext;)V" />
+      <node id="1125969196844413435" at="48,137,51,7" concept="4" />
+      <node id="1125969196844413435" at="63,0,66,0" concept="5" trace="getNoTargetText#()Ljava/lang/String;" />
+      <node id="1125969196844419413" at="30,0,34,0" concept="5" trace="createComponent_rowo1n_a0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1125969196844413435" at="34,0,38,0" concept="5" trace="createRefNode_rowo1n_b0#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1125969196844413435" at="42,0,47,0" concept="5" trace="createChildCell#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1125969196844413435" at="47,0,53,0" concept="5" trace="installCellInfo#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/openapi/editor/cells/EditorCell;)V" />
+      <node id="1125969196844413435" at="55,0,62,0" concept="5" trace="createEmptyCell#()Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <node id="1125969196844413435" at="21,0,30,0" concept="5" trace="createCollection_rowo1n_a#(Ljetbrains/mps/openapi/editor/EditorContext;Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/openapi/editor/cells/EditorCell;" />
+      <scope id="1125969196844413435" at="18,79,19,63" />
+      <scope id="1125969196844413435" at="25,79,26,82" />
+      <scope id="1125969196844413435" at="26,82,27,80" />
+      <scope id="1125969196844413435" at="39,120,40,49" />
+      <scope id="1125969196844413435" at="49,41,50,37" />
+      <scope id="1125969196844413435" at="63,40,64,27" />
+      <scope id="1125969196844419413" at="30,89,32,22">
+        <var name="editorCell" id="1125969196844419413" />
+      </scope>
+      <scope id="1125969196844413435" at="34,87,36,33">
+        <var name="provider" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="18,0,21,0">
+        <var name="editorContext" id="1125969196844413435" />
+        <var name="node" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="39,0,42,0">
+        <var name="containmentLink" id="1125969196844413435" />
+        <var name="context" id="1125969196844413435" />
+        <var name="ownerNode" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="42,81,45,24">
+        <var name="editorCell" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="63,0,66,0" />
+      <scope id="1125969196844419413" at="30,0,34,0">
+        <var name="editorContext" id="1125969196844419413" />
+        <var name="node" id="1125969196844419413" />
+      </scope>
+      <scope id="1125969196844413435" at="34,0,38,0">
+        <var name="editorContext" id="1125969196844413435" />
+        <var name="node" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="47,69,51,7" />
+      <scope id="1125969196844413435" at="56,44,60,24">
+        <var name="editorCell" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="42,0,47,0">
+        <var name="child" id="1125969196844413435" />
+        <var name="editorContext" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="47,0,53,0">
+        <var name="child" id="1125969196844413435" />
+        <var name="editorCell" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="21,89,28,22">
+        <var name="editorCell" id="1125969196844413435" />
+      </scope>
+      <scope id="1125969196844413435" at="55,0,62,0" />
+      <scope id="1125969196844413435" at="21,0,30,0">
+        <var name="editorContext" id="1125969196844413435" />
+        <var name="node" id="1125969196844413435" />
+      </scope>
+      <unit id="1125969196844413435" at="38,0,68,0" name="jetbrains.mps.console.ideCommands.editor.ShowExpression_Editor$objectSingleRoleHandler_rowo1n_b0" />
+      <unit id="1125969196844413435" at="17,0,69,0" name="jetbrains.mps.console.ideCommands.editor.ShowExpression_Editor" />
     </file>
   </root>
   <root nodeRef="r:5d9868cc-091b-49b3-85eb-87af773e0884(jetbrains.mps.console.ideCommands.editor)/2087237500458012113">
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java
index 076c1586a248..76c16f3be51a 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java
@@ -12,11 +12,11 @@
 
 public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
 
-  /*package*/ final ConceptDescriptor myConceptAbsractMake = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.AbsractMake", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(2840424593984889584L, "argument", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), true, false, false)).children(new String[]{"argument"}, new boolean[]{false}).abstract_().create();
+  /*package*/ final ConceptDescriptor myConceptAbsractMake = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.AbsractMake", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(2840424593984889584L, "argument", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), true, false, false)).children(new String[]{"argument"}, new boolean[]{false}).abstract_().create();
   /*package*/ final ConceptDescriptor myConceptActionCallDeclaredParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587a7L)).super_("jetbrains.mps.console.ideCommands.structure.ActionCallParameter").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).parents("jetbrains.mps.console.ideCommands.structure.ActionCallParameter").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5582028874769074088L, "declaration", MetaIdFactory.conceptId(0x28f9e4973b424291L, 0xaeba0a1039153ab1L, 0x11b737a6b7cL), false)).references("declaration").create();
   /*package*/ final ConceptDescriptor myConceptActionCallGlobalParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587a9L)).super_("jetbrains.mps.console.ideCommands.structure.ActionCallParameter").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).parents("jetbrains.mps.console.ideCommands.structure.ActionCallParameter").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5582028874769074090L, "declaration", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf93c84351fL), false)).references("declaration").create();
   /*package*/ final ConceptDescriptor myConceptActionCallParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ActionCallParameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(5582028874769074092L, "value", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"value"}, new boolean[]{false}).abstract_().create();
-  /*package*/ final ConceptDescriptor myConceptCallActionExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.CallActionExpression", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587adL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5582028874769074094L, "action", MetaIdFactory.conceptId(0x28f9e4973b424291L, 0xaeba0a1039153ab1L, 0x1181ca87c38L), false)).references("action").childDescriptors(new ConceptDescriptorBuilder.Link(5582028874769074095L, "parameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL), true, true, false)).children(new String[]{"parameter"}, new boolean[]{true}).alias("#callAction", "call an IDE action with custom parameters").create();
+  /*package*/ final ConceptDescriptor myConceptCallActionExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.CallActionExpression", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587adL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5582028874769074094L, "action", MetaIdFactory.conceptId(0x28f9e4973b424291L, 0xaeba0a1039153ab1L, 0x1181ca87c38L), false)).references("action").childDescriptors(new ConceptDescriptorBuilder.Link(5582028874769074095L, "parameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL), true, true, false)).children(new String[]{"parameter"}, new boolean[]{true}).alias("#callAction", "call an IDE action with custom parameters").create();
   /*package*/ final ConceptDescriptor myConceptClean = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.Clean", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e74f88509L)).super_("jetbrains.mps.console.ideCommands.structure.AbsractMake").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).parents("jetbrains.mps.console.ideCommands.structure.AbsractMake").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).alias("#clean", "clean files *.generated").create();
   /*package*/ final ConceptDescriptor myConceptClickableGenerator = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ClickableGenerator", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x360b134fc0467d73L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(3894227536041893247L, "moduleId")).properties("moduleId").create();
   /*package*/ final ConceptDescriptor myConceptGlobalStatisticTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb8L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).alias("global", "").create();
@@ -28,26 +28,27 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
   /*package*/ final ConceptDescriptor myConceptModelStatisticsTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a5cad96L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).childDescriptors(new ConceptDescriptorBuilder.Link(7490254719523007897L, "target", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x6c8954f469900928L), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("model", "").create();
   /*package*/ final ConceptDescriptor myConceptModuleProperties = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ModuleProperties", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587b3L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).childDescriptors(new ConceptDescriptorBuilder.Link(5582028874769074100L, "targetModule", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"targetModule"}, new boolean[]{false}).alias("#moduleProperties", "").create();
   /*package*/ final ConceptDescriptor myConceptNodeReference = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.NodeReference", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x6c8954f4699443afL)).super_("jetbrains.mps.lang.smodel.structure.NodeRefExpression").super_(MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x11be716563cL)).parents("jetbrains.mps.lang.smodel.structure.NodeRefExpression").parentIds(MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x11be716563cL)).alias("node", "").create();
-  /*package*/ final ConceptDescriptor myConceptOfAspectOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.OfAspectOperation", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x5252d9021b8b45a8L)).super_("jetbrains.mps.baseLanguage.collections.structure.SequenceOperation").super_(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c26c9a2d9L)).parents("jetbrains.mps.baseLanguage.collections.structure.SequenceOperation", "jetbrains.mps.console.blCommand.structure.ConsoleOperation").parentIds(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c26c9a2d9L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5932042262275696048L, "requestedAspect", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfc367388b3L), false)).references("requestedAspect").alias("ofAspect", "filter models by their aspect").create();
+  /*package*/ final ConceptDescriptor myConceptOfAspectOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.OfAspectOperation", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x5252d9021b8b45a8L)).super_("jetbrains.mps.baseLanguage.collections.structure.SequenceOperation").super_(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c26c9a2d9L)).parents("jetbrains.mps.baseLanguage.collections.structure.SequenceOperation", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider").parentIds(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c26c9a2d9L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5932042262275696048L, "requestedAspect", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfc367388b3L), false)).references("requestedAspect").alias("ofAspect", "filter models by their aspect").create();
   /*package*/ final ConceptDescriptor myConceptProjectStatisticsTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579e36L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).alias("project", "").create();
   /*package*/ final ConceptDescriptor myConceptRebuildProjectCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.RebuildProjectCommand", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191df02L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963818243L, "model", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x7c3f2da20e92b62L), false, false, false)).children(new String[]{"model"}, new boolean[]{false}).abstract_().alias("#rebuild project", "clean and make").create();
   /*package*/ final ConceptDescriptor myConceptRemoveGenSources = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.RemoveGenSources", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a11bL)).super_("jetbrains.mps.console.ideCommands.structure.AbsractMake").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).parents("jetbrains.mps.console.ideCommands.structure.AbsractMake").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).alias("#removeGenSources", "remove source_gen").create();
   /*package*/ final ConceptDescriptor myConceptShowBrokenReferences = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x1cf75b72b0ac828cL)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).childDescriptors(new ConceptDescriptorBuilder.Link(2087237500458009229L, "target", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("#showBrokenRefs", "show broken references").create();
+  /*package*/ final ConceptDescriptor myConceptShowExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ShowExpression", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(7600370246423275637L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).alias("#show", "show in usage view").create();
   /*package*/ final ConceptDescriptor myConceptShowGenPlan = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ShowGenPlan", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x61f2dd6de47f85e4L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).childDescriptors(new ConceptDescriptorBuilder.Link(7057947030097725050L, "targetModel", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x6c8954f469900928L), false, false, false)).children(new String[]{"targetModel"}, new boolean[]{false}).alias("#showGenPlan", "show the generation plan").create();
   /*package*/ final ConceptDescriptor myConceptStatCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.StatCommand", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a558c98L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).childDescriptors(new ConceptDescriptorBuilder.Link(7490254719522675891L, "target", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("#stat", "display useful statistics").create();
   /*package*/ final ConceptDescriptor myConceptSubtreeStatisticsTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x1cf75b72b0b3962bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).childDescriptors(new ConceptDescriptorBuilder.Link(2087237500458473158L, "target", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x319fd776da5d8e3cL), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("node", "").create();
   /*package*/ final ConceptDescriptor myConceptUnloadModelsCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.UnloadModelsCommand", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191ddffL)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).abstract_().alias("#unload models", "").create();
-  /*package*/ final ConceptDescriptor myConceptWithDependencies = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.WithDependencies", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x826e97ca237a1b1L)).super_("jetbrains.mps.console.blCommand.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.console.blCommand.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("withDependencies", "").create();
+  /*package*/ final ConceptDescriptor myConceptWithDependencies = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.WithDependencies", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x826e97ca237a1b1L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.lang.smodel.query.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("withDependencies", "").create();
 
   @Override
   public Collection<ConceptDescriptor> getDescriptors() {
-    return Arrays.asList(myConceptAbsractMake, myConceptActionCallDeclaredParameter, myConceptActionCallGlobalParameter, myConceptActionCallParameter, myConceptCallActionExpression, myConceptClean, myConceptClickableGenerator, myConceptGlobalStatisticTarget, myConceptINodeSetReference, myConceptIStatisticsTarget, myConceptMake, myConceptModelProperties, myConceptModelReference, myConceptModelStatisticsTarget, myConceptModuleProperties, myConceptNodeReference, myConceptOfAspectOperation, myConceptProjectStatisticsTarget, myConceptRebuildProjectCommand, myConceptRemoveGenSources, myConceptShowBrokenReferences, myConceptShowGenPlan, myConceptStatCommand, myConceptSubtreeStatisticsTarget, myConceptUnloadModelsCommand, myConceptWithDependencies);
+    return Arrays.asList(myConceptAbsractMake, myConceptActionCallDeclaredParameter, myConceptActionCallGlobalParameter, myConceptActionCallParameter, myConceptCallActionExpression, myConceptClean, myConceptClickableGenerator, myConceptGlobalStatisticTarget, myConceptINodeSetReference, myConceptIStatisticsTarget, myConceptMake, myConceptModelProperties, myConceptModelReference, myConceptModelStatisticsTarget, myConceptModuleProperties, myConceptNodeReference, myConceptOfAspectOperation, myConceptProjectStatisticsTarget, myConceptRebuildProjectCommand, myConceptRemoveGenSources, myConceptShowBrokenReferences, myConceptShowExpression, myConceptShowGenPlan, myConceptStatCommand, myConceptSubtreeStatisticsTarget, myConceptUnloadModelsCommand, myConceptWithDependencies);
   }
 
   @Override
   @Nullable
   public ConceptDescriptor getDescriptor(String conceptFqName) {
-    switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0eb, conceptFqName)) {
+    switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0fb, conceptFqName)) {
       case 0:
         return myConceptAbsractMake;
       case 1:
@@ -91,18 +92,20 @@ public ConceptDescriptor getDescriptor(String conceptFqName) {
       case 20:
         return myConceptShowBrokenReferences;
       case 21:
-        return myConceptShowGenPlan;
+        return myConceptShowExpression;
       case 22:
-        return myConceptStatCommand;
+        return myConceptShowGenPlan;
       case 23:
-        return myConceptSubtreeStatisticsTarget;
+        return myConceptStatCommand;
       case 24:
-        return myConceptUnloadModelsCommand;
+        return myConceptSubtreeStatisticsTarget;
       case 25:
+        return myConceptUnloadModelsCommand;
+      case 26:
         return myConceptWithDependencies;
       default:
         return null;
     }
   }
-  private static String[] stringSwitchCases_1htk8d_a0a0eb = new String[]{"jetbrains.mps.console.ideCommands.structure.AbsractMake", "jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.Clean", "jetbrains.mps.console.ideCommands.structure.ClickableGenerator", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.Make", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.RebuildProjectCommand", "jetbrains.mps.console.ideCommands.structure.RemoveGenSources", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.UnloadModelsCommand", "jetbrains.mps.console.ideCommands.structure.WithDependencies"};
+  private static String[] stringSwitchCases_1htk8d_a0a0fb = new String[]{"jetbrains.mps.console.ideCommands.structure.AbsractMake", "jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.Clean", "jetbrains.mps.console.ideCommands.structure.ClickableGenerator", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.Make", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.RebuildProjectCommand", "jetbrains.mps.console.ideCommands.structure.RemoveGenSources", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowExpression", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.UnloadModelsCommand", "jetbrains.mps.console.ideCommands.structure.WithDependencies"};
 }
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/trace.info
index 959230a05570..a5cafde6c9b8 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/trace.info
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/trace.info
@@ -2,7 +2,7 @@
 <debug-info>
   <root>
     <file name="StructureAspectDescriptor.java">
-      <unit at="13,0,109,0" name="jetbrains.mps.console.ideCommands.structure.StructureAspectDescriptor" />
+      <unit at="13,0,112,0" name="jetbrains.mps.console.ideCommands.structure.StructureAspectDescriptor" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/TypesystemDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/TypesystemDescriptor.java
index 58f45d2c0030..b77507e6b4b1 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/TypesystemDescriptor.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/TypesystemDescriptor.java
@@ -32,6 +32,10 @@ public TypesystemDescriptor() {
       InferenceRule_Runtime inferenceRule = new typeof_OfAspectOperation_InferenceRule();
       this.myInferenceRules.add(inferenceRule);
     }
+    {
+      InferenceRule_Runtime inferenceRule = new typeof_ShowExpression_InferenceRule();
+      this.myInferenceRules.add(inferenceRule);
+    }
     {
       NonTypesystemRule_Runtime nonTypesystemRule = new check_CallActionDuplicatedParameters_NonTypesystemRule();
       this.myNonTypesystemRules.add(nonTypesystemRule);
diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/trace.info
index 6efdf3cbee49..aaabc88ec2c0 100644
--- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/trace.info
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/trace.info
@@ -12,7 +12,7 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
   <root>
     <file name="TypesystemDescriptor.java">
-      <unit at="9,0,49,0" name="jetbrains.mps.console.ideCommands.typesystem.TypesystemDescriptor" />
+      <unit at="9,0,53,0" name="jetbrains.mps.console.ideCommands.typesystem.TypesystemDescriptor" />
     </file>
   </root>
   <root nodeRef="r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)/2840424593984891396">
@@ -685,6 +685,137 @@
       <unit id="5932042262275872849" at="17,0,60,0" name="jetbrains.mps.console.ideCommands.typesystem.typeof_OfAspectOperation_InferenceRule" />
     </file>
   </root>
+  <root nodeRef="r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)/7600370246417176062">
+    <file name="typeof_ShowExpression_InferenceRule.java">
+      <node id="7600370246417176611" at="22,5,23,56" concept="6" />
+      <node id="7600370246417176611" at="23,56,24,210" concept="6" />
+      <node id="7600370246417176611" at="24,210,25,287" concept="2" />
+      <node id="7600370246423284446" at="28,7,29,218" concept="6" />
+      <node id="7600370246423284446" at="29,218,30,212" concept="6" />
+      <node id="7600370246423284446" at="30,212,31,311" concept="2" />
+      <node id="7600370246417176062" at="35,50,36,166" concept="7" />
+      <node id="7600370246417176062" at="38,68,39,102" concept="0" />
+      <node id="7600370246417176062" at="38,68,39,102" concept="7" />
+      <node id="7600370246417176062" at="41,30,42,17" concept="7" />
+      <node id="7600370246417176684" at="44,61,45,63" concept="6" />
+      <node id="7600370246417176684" at="45,63,46,30" concept="6" />
+      <node id="7600370246417176684" at="46,30,47,220" concept="0" />
+      <node id="7600370246417176684" at="46,30,47,220" concept="0" />
+      <node id="7600370246417176684" at="46,30,47,220" concept="2" />
+      <node id="7600370246417176684" at="47,220,48,24" concept="7" />
+      <node id="7600370246423285041" at="50,61,51,63" concept="6" />
+      <node id="7600370246423285041" at="51,63,52,30" concept="6" />
+      <node id="7600370246423285041" at="52,30,53,30" concept="6" />
+      <node id="7600370246423285041" at="53,30,54,30" concept="6" />
+      <node id="7600370246423285041" at="54,30,55,30" concept="6" />
+      <node id="7600370246423285041" at="55,30,56,30" concept="6" />
+      <node id="7600370246423285041" at="56,30,57,30" concept="6" />
+      <node id="7600370246423285041" at="57,30,58,30" concept="6" />
+      <node id="7600370246423285041" at="58,30,59,30" concept="6" />
+      <node id="7600370246423285041" at="59,30,60,30" concept="6" />
+      <node id="7600370246423285041" at="60,30,61,224" concept="2" />
+      <node id="7600370246423285041" at="61,224,62,237" concept="2" />
+      <node id="7600370246423285041" at="62,237,63,221" concept="2" />
+      <node id="7600370246423285041" at="63,221,64,168" concept="2" />
+      <node id="7600370246423285041" at="64,168,65,165" concept="2" />
+      <node id="7600370246423285041" at="65,165,66,237" concept="2" />
+      <node id="7600370246423285041" at="66,237,67,231" concept="2" />
+      <node id="7600370246423285041" at="67,231,68,168" concept="2" />
+      <node id="7600370246423285041" at="68,168,69,165" concept="2" />
+      <node id="7600370246423285041" at="69,165,70,237" concept="2" />
+      <node id="7600370246423285041" at="70,237,71,222" concept="2" />
+      <node id="7600370246423285041" at="71,222,72,168" concept="2" />
+      <node id="7600370246423285041" at="72,168,73,165" concept="2" />
+      <node id="7600370246423285041" at="73,165,74,237" concept="2" />
+      <node id="7600370246423285041" at="74,237,75,227" concept="2" />
+      <node id="7600370246423285041" at="75,227,76,467" concept="2" />
+      <node id="7600370246423285041" at="76,467,77,168" concept="2" />
+      <node id="7600370246423285041" at="77,168,78,165" concept="2" />
+      <node id="7600370246423285041" at="78,165,79,24" concept="7" />
+      <node id="7600370246417176062" at="19,0,21,0" concept="1" trace="typeof_ShowExpression_InferenceRule#()V" />
+      <node id="7600370246423285041" at="62,237,64,168" concept="0" />
+      <node id="7600370246423285041" at="62,237,64,168" concept="0" />
+      <node id="7600370246423285041" at="66,237,68,168" concept="0" />
+      <node id="7600370246423285041" at="66,237,68,168" concept="0" />
+      <node id="7600370246423285041" at="70,237,72,168" concept="0" />
+      <node id="7600370246423285041" at="70,237,72,168" concept="0" />
+      <node id="7600370246417176062" at="35,0,38,0" concept="5" trace="getApplicableConcept#()Lorg/jetbrains/mps/openapi/language/SAbstractConcept;" />
+      <node id="7600370246417176062" at="38,0,41,0" concept="5" trace="isApplicableAndPattern#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;" />
+      <node id="7600370246417176062" at="41,0,44,0" concept="5" trace="overrides#()Z" />
+      <node id="7600370246423285041" at="74,237,77,168" concept="0" />
+      <node id="7600370246423285041" at="74,237,77,168" concept="0" />
+      <node id="7600370246423285041" at="61,224,65,165" concept="0" />
+      <node id="7600370246423285041" at="61,224,65,165" concept="0" />
+      <node id="7600370246423285041" at="65,165,69,165" concept="0" />
+      <node id="7600370246423285041" at="65,165,69,165" concept="0" />
+      <node id="7600370246423285041" at="69,165,73,165" concept="0" />
+      <node id="7600370246423285041" at="69,165,73,165" concept="0" />
+      <node id="7600370246417176611" at="21,127,26,5" concept="0" />
+      <node id="7600370246423284446" at="27,59,32,7" concept="0" />
+      <node id="7600370246423285041" at="73,165,78,165" concept="0" />
+      <node id="7600370246423285041" at="73,165,78,165" concept="0" />
+      <node id="7600370246417176684" at="44,0,50,0" concept="9" trace="_quotation_createNode_jy8svg_a0a0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7600370246423284446" at="26,5,33,5" concept="4" />
+      <node id="7600370246417176062" at="21,0,35,0" concept="5" trace="applyRule#(Lorg/jetbrains/mps/openapi/model/SNode;Ljetbrains/mps/typesystem/inference/TypeCheckingContext;Ljetbrains/mps/lang/typesystem/runtime/IsApplicableStatus;)V" />
+      <node id="7600370246423285041" at="60,30,78,165" concept="0" />
+      <node id="7600370246423285041" at="60,30,78,165" concept="0" />
+      <node id="7600370246423285041" at="50,0,81,0" concept="9" trace="_quotation_createNode_jy8svg_a0b0b#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="7600370246417176062" at="19,48,19,48" />
+      <scope id="7600370246417176062" at="35,50,36,166" />
+      <scope id="7600370246417176062" at="38,68,39,102" />
+      <scope id="7600370246417176062" at="41,30,42,17" />
+      <scope id="7600370246417176684" at="46,30,47,220" />
+      <scope id="7600370246417176062" at="19,0,21,0" />
+      <scope id="7600370246423285041" at="62,237,64,168" />
+      <scope id="7600370246423285041" at="66,237,68,168" />
+      <scope id="7600370246423285041" at="70,237,72,168" />
+      <scope id="7600370246417176611" at="22,5,25,287">
+        <var name="_info_12389875345" id="7600370246417176611" />
+        <var name="_nodeToCheck_1029348928467" id="7600370246417176611" />
+      </scope>
+      <scope id="7600370246423284446" at="28,7,31,311">
+        <var name="_info_12389875345" id="7600370246423284446" />
+        <var name="_nodeToCheck_1029348928467" id="7600370246423284446" />
+      </scope>
+      <scope id="7600370246417176062" at="35,0,38,0" />
+      <scope id="7600370246417176062" at="38,0,41,0">
+        <var name="argument" id="7600370246417176062" />
+      </scope>
+      <scope id="7600370246417176062" at="41,0,44,0" />
+      <scope id="7600370246423285041" at="74,237,77,168" />
+      <scope id="7600370246417176684" at="44,61,48,24">
+        <var name="facade" id="7600370246417176684" />
+        <var name="quotedNode_1" id="7600370246417176684" />
+      </scope>
+      <scope id="7600370246423285041" at="61,224,65,165" />
+      <scope id="7600370246423285041" at="65,165,69,165" />
+      <scope id="7600370246423285041" at="69,165,73,165" />
+      <scope id="7600370246423284446" at="27,59,32,7" />
+      <scope id="7600370246423285041" at="73,165,78,165" />
+      <scope id="7600370246417176684" at="44,0,50,0" />
+      <scope id="7600370246417176063" at="21,127,33,5" />
+      <scope id="7600370246417176062" at="21,0,35,0">
+        <var name="showExpression" id="7600370246417176062" />
+        <var name="status" id="7600370246417176062" />
+        <var name="typeCheckingContext" id="7600370246417176062" />
+      </scope>
+      <scope id="7600370246423285041" at="60,30,78,165" />
+      <scope id="7600370246423285041" at="50,61,79,24">
+        <var name="facade" id="7600370246423285041" />
+        <var name="quotedNode_1" id="7600370246423285041" />
+        <var name="quotedNode_2" id="7600370246423285041" />
+        <var name="quotedNode_3" id="7600370246423285041" />
+        <var name="quotedNode_4" id="7600370246423285041" />
+        <var name="quotedNode_5" id="7600370246423285041" />
+        <var name="quotedNode_6" id="7600370246423285041" />
+        <var name="quotedNode_7" id="7600370246423285041" />
+        <var name="quotedNode_8" id="7600370246423285041" />
+        <var name="quotedNode_9" id="7600370246423285041" />
+      </scope>
+      <scope id="7600370246423285041" at="50,0,81,0" />
+      <unit id="7600370246417176062" at="18,0,82,0" name="jetbrains.mps.console.ideCommands.typesystem.typeof_ShowExpression_InferenceRule" />
+    </file>
+  </root>
   <root nodeRef="r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)/9053534423438560978">
     <file name="check_ShowGenPlan_NonTypesystemRule.java">
       <node id="207553032706502350" at="23,124,24,310" concept="6" />
diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/typeof_ShowExpression_InferenceRule.java
similarity index 85%
rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java
rename to plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/typeof_ShowExpression_InferenceRule.java
index e78ff5c2302d..2e54f198d513 100644
--- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java
+++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/typeof_ShowExpression_InferenceRule.java
@@ -1,4 +1,4 @@
-package jetbrains.mps.console.blCommand.typesystem;
+package jetbrains.mps.console.ideCommands.typesystem;
 
 /*Generated by MPS */
 
@@ -21,19 +21,19 @@ public typeof_ShowExpression_InferenceRule() {
   public void applyRule(final SNode showExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) {
     {
       SNode _nodeToCheck_1029348928467 = showExpression;
-      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246417176611", 0, null);
-      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246417176148", true), (SNode) _quotation_createNode_jy8svg_a0a0b(), _info_12389875345);
+      EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)", "7600370246417176611", 0, null);
+      typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)", "7600370246417176148", true), (SNode) _quotation_createNode_jy8svg_a0a0b(), _info_12389875345);
     }
     if (!(typeCheckingContext.isSingleTypeComputation())) {
       {
-        SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(showExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"));
-        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246423284446", 0, null);
-        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246423276130", true), (SNode) _quotation_createNode_jy8svg_a0b0b(), true, true, _info_12389875345);
+        SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(showExpression, MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"));
+        EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)", "7600370246423284446", 0, null);
+        typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)", "7600370246423276130", true), (SNode) _quotation_createNode_jy8svg_a0b0b(), true, true, _info_12389875345);
       }
     }
   }
   public SAbstractConcept getApplicableConcept() {
-    return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.console.blCommand.structure.ShowExpression");
+    return MetaAdapterFactory.getConcept(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, "jetbrains.mps.console.ideCommands.structure.ShowExpression");
   }
   public IsApplicableStatus isApplicableAndPattern(SNode argument) {
     return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null);
diff --git a/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd b/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd
index 8ab7b7e83c96..dda9bdac62fe 100644
--- a/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd
+++ b/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd
@@ -13,9 +13,9 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">5fa23c0a-216d-4571-a163-e286643e6f5f(jetbrains.mps.generator)</dependency>
-    <dependency reexport="false">8f6725be-608d-433b-98fd-844f816eb05f(jetbrains.mps.ide.make)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin)</dependency>
+    <dependency reexport="false">8f6725be-608d-433b-98fd-844f816eb05f(jetbrains.mps.ide.make)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
diff --git a/plugins/console/lang/ideCommandsRuntime/models/jetbrains/mps/console/ideCommands/runtime/util.mps b/plugins/console/lang/ideCommandsRuntime/models/jetbrains/mps/console/ideCommands/runtime/util.mps
index 66ea2af2b7be..7a5071807bf3 100644
--- a/plugins/console/lang/ideCommandsRuntime/models/jetbrains/mps/console/ideCommands/runtime/util.mps
+++ b/plugins/console/lang/ideCommandsRuntime/models/jetbrains/mps/console/ideCommands/runtime/util.mps
@@ -1797,9 +1797,7 @@
                       </node>
                       <node concept="37vLTG" id="7VSQgz8PAR2" role="3clF46">
                         <property role="TrG5h" value="key" />
-                        <node concept="3uibUv" id="7VSQgz8PAR3" role="1tU5fm">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                        </node>
+                        <node concept="17QB3L" id="3ZgZ1njMHRg" role="1tU5fm" />
                         <node concept="2AHcQZ" id="7VSQgz8PAR4" role="2AJF6D">
                           <ref role="2AI5Lk" to="mhfm:~NonNls" resolve="NonNls" />
                         </node>
diff --git a/plugins/console/lang/ideCommandsRuntime/source_gen.caches/jetbrains/mps/console/ideCommands/runtime/util/generated b/plugins/console/lang/ideCommandsRuntime/source_gen.caches/jetbrains/mps/console/ideCommands/runtime/util/generated
index f2b64602fe6b..7ce22bca051c 100644
--- a/plugins/console/lang/ideCommandsRuntime/source_gen.caches/jetbrains/mps/console/ideCommands/runtime/util/generated
+++ b/plugins/console/lang/ideCommandsRuntime/source_gen.caches/jetbrains/mps/console/ideCommands/runtime/util/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="1q46iguf1cnvbznclmnkvolu5ymztuv" />
+<dependencies version="2" modelHash="-4umap6i3miscnahv0m25vi8znhemu5a" />
 
diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/dependencies b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/dependencies
index 4e05c2e38ed3..7a843d71580e 100644
--- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/dependencies
+++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/dependencies
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
   <dependency className="jetbrains.mps.console.internalCommands.generator.template.main.QueriesGenerated" file="QueriesGenerated.java">
-    <classNode dependClassName="java.lang.Object" />
     <classNode dependClassName="jetbrains.mps.generator.runtime.Generated" />
     <classNode dependClassName="jetbrains.mps.generator.template.BaseMappingRuleContext" />
-    <classNode dependClassName="jetbrains.mps.generator.template.ReferenceMacroContext" />
     <classNode dependClassName="jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated
index 579c42fea892..729de112696f 100644
--- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated
+++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-bkem0ngz8nt1aa4xd1ledslyu8iudt6" />
+<dependencies version="2" modelHash="-bn5l8sphuz93k6cncdm42xief3qb99k" />
 
diff --git a/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/QueriesGenerated.java b/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/QueriesGenerated.java
index 0ba00a8827b0..09077876a88e 100644
--- a/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/QueriesGenerated.java
+++ b/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/QueriesGenerated.java
@@ -7,7 +7,6 @@
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
 import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
 import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
-import jetbrains.mps.generator.template.ReferenceMacroContext;
 import org.jetbrains.mps.openapi.model.SNode;
 import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext;
 
@@ -16,9 +15,6 @@ public class QueriesGenerated {
   public static boolean baseMappingRule_Condition_8829647120617326153(final BaseMappingRuleContext _context) {
     return SNodeOperations.isInstanceOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11b0d00332cL, 0xf8c77f1e97L, "lValue")), MetaAdapterFactory.getConcept(0x995a73947f764b8bL, 0xa929c53448708106L, 0x7a89354654722219L, "jetbrains.mps.console.internalCommands.structure.InternalMode"));
   }
-  public static Object referenceMacro_GetReferent_5582028874770465419(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
   public static SNode sourceNodeQuery_6369875563697213767(final SourceSubstituteMacroNodeContext _context) {
     return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11b0d00332cL, 0xf8c77f1e99L, "rValue"));
   }
diff --git a/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/trace.info b/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/trace.info
index ac32e67aa7f0..92bf8161578f 100644
--- a/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/trace.info
+++ b/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/trace.info
@@ -3,21 +3,15 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
   <root>
     <file name="QueriesGenerated.java">
-      <unit at="14,0,26,0" name="jetbrains.mps.console.internalCommands.generator.template.main.QueriesGenerated" />
-    </file>
-  </root>
-  <root nodeRef="r:445e7307-af0d-43ba-baa4-fce1d9f37357(jetbrains.mps.console.internalCommands.generator.template.main@generator)/5582028874770465405">
-    <file name="QueriesGenerated.java">
-      <node id="5582028874770465421" at="19,109,20,296" concept="0" />
-      <scope id="5582028874770465420" at="19,109,20,296" />
+      <unit at="13,0,22,0" name="jetbrains.mps.console.internalCommands.generator.template.main.QueriesGenerated" />
     </file>
   </root>
   <root nodeRef="r:445e7307-af0d-43ba-baa4-fce1d9f37357(jetbrains.mps.console.internalCommands.generator.template.main@generator)/8483375838963160299">
     <file name="QueriesGenerated.java">
-      <node id="8829647120617379727" at="16,110,17,368" concept="0" />
-      <node id="6369875563697213769" at="22,108,23,179" concept="0" />
-      <scope id="8829647120617326154" at="16,110,17,368" />
-      <scope id="6369875563697213768" at="22,108,23,179" />
+      <node id="8829647120617379727" at="15,110,16,368" concept="0" />
+      <node id="6369875563697213769" at="18,108,19,179" concept="0" />
+      <scope id="8829647120617326154" at="15,110,16,368" />
+      <scope id="6369875563697213768" at="18,108,19,179" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps
index b479d947f7c9..ab6fc39b489f 100644
--- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps
+++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps
@@ -10,14 +10,11 @@
   </languages>
   <imports>
     <import index="7y2s" ref="r:6eb42b25-83db-4c72-9ba5-c1a95b1514ba(jetbrains.mps.console.internalCommands.runtime.util)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
-    <import index="74y1" ref="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="wns9" ref="r:90445206-a973-4c1d-b760-30e5c77b7497(jetbrains.mps.console.internalCommands.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="caxt" ref="r:135a606f-0376-4c5c-9ab8-4030f051a062(jetbrains.mps.console.ideCommands.structure)" />
-    <import index="jfzm" ref="r:ad044ded-b26d-4454-89a4-9fd4566328df(jetbrains.mps.console.ideCommands.generator.template.main@generator)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -33,6 +30,10 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
@@ -56,6 +57,9 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -100,33 +104,15 @@
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
-      <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
       <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">
-        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
-      </concept>
-    </language>
-    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
-      <concept id="1216860049627" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput" flags="nn" index="1iwH70">
-        <reference id="1216860049628" name="label" index="1iwH77" />
-        <child id="1216860049632" name="inputNode" index="1iwH7V" />
-      </concept>
-      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <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="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -136,10 +122,6 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
-        <property id="1757699476691236116" name="linkRole" index="2qtEX8" />
-        <property id="1341860900488019036" name="linkId" index="P3scX" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -234,38 +216,19 @@
         <node concept="3clFbS" id="4PRmqZeEGa6" role="3clF47">
           <node concept="3clFbF" id="4PRmqZeEGa7" role="3cqZAp">
             <node concept="2OqwBi" id="7M1Gaz37Rge" role="3clFbG">
-              <node concept="2OqwBi" id="4PRmqZeEGa8" role="2Oq$k0">
-                <node concept="37vLTw" id="4PRmqZeEGa9" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4PRmqZeEGa0" resolve="context" />
-                  <node concept="1ZhdrF" id="4PRmqZeEGaa" role="lGtFl">
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <node concept="3$xsQk" id="4PRmqZeEGab" role="3$ytzL">
-                      <node concept="3clFbS" id="4PRmqZeEGac" role="2VODD2">
-                        <node concept="3clFbF" id="4PRmqZeEGad" role="3cqZAp">
-                          <node concept="2OqwBi" id="4PRmqZeEGae" role="3clFbG">
-                            <node concept="1iwH7S" id="4PRmqZeEGaf" role="2Oq$k0" />
-                            <node concept="1iwH70" id="4PRmqZeEGag" role="2OqNvi">
-                              <ref role="1iwH77" to="74y1:1El5OLsAWHX" resolve="contextParameter" />
-                              <node concept="2OqwBi" id="4PRmqZeEGah" role="1iwH7V">
-                                <node concept="30H73N" id="4PRmqZeEGai" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="4PRmqZeEGaj" role="2OqNvi">
-                                  <node concept="1xMEDy" id="4PRmqZeEGak" role="1xVPHs">
-                                    <node concept="chp4Y" id="4PRmqZeEGal" role="ri$Ld">
-                                      <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+              <node concept="1eOMI4" id="3ZgZ1njTt2X" role="2Oq$k0">
+                <node concept="10QFUN" id="3ZgZ1njTt2Y" role="1eOMHV">
+                  <node concept="2OqwBi" id="3ZgZ1njTt2U" role="10QFUP">
+                    <node concept="37vLTw" id="3ZgZ1njTt2V" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4PRmqZeEGa0" resolve="context" />
+                    </node>
+                    <node concept="liA8E" id="3ZgZ1njTt2W" role="2OqNvi">
+                      <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getOutputWindow" />
                     </node>
                   </node>
-                </node>
-                <node concept="liA8E" id="4PRmqZeEGam" role="2OqNvi">
-                  <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getConsoleTab" />
+                  <node concept="3uibUv" id="3ZgZ1njTt3x" role="10QFUM">
+                    <ref role="3uigEE" to="qgo0:4gO8Gruz$1J" resolve="BaseConsoleTab" />
+                  </node>
                 </node>
               </node>
               <node concept="liA8E" id="7M1Gaz37VIH" role="2OqNvi">
diff --git a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl
index eddaddd511ff..0856700f9aed 100644
--- a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl
+++ b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl
@@ -18,13 +18,12 @@
       </facets>
       <external-templates>
         <generator generatorUID="985c8c6a-64b4-486d-a91e-7d4112742556(jetbrains.mps.baseLanguage#1129914002933)" />
-        <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
       </external-templates>
       <dependencies>
         <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
         <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
         <dependency reexport="false">a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)</dependency>
-        <dependency reexport="false">1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)</dependency>
+        <dependency reexport="false">1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)</dependency>
         <dependency reexport="false">995a7394-7f76-4b8b-a929-c53448708106(jetbrains.mps.console.internalCommands)</dependency>
         <dependency reexport="false">1a497c57-0f1a-4016-8042-2ff7591fe612(jetbrains.mps.console.internalCommands.runtime)</dependency>
       </dependencies>
@@ -71,7 +70,7 @@
             </external-mapping>
           </greater-priority-mapping>
           <lesser-priority-mapping>
-            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
+            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.lang.smodel.query#5336086527852811409)" />
             <external-mapping>
               <mapping-node modelUID="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" nodeID="5336086527852811410" />
             </external-mapping>
@@ -115,7 +114,7 @@
   </runtime>
   <extendedLanguages>
     <extendedLanguage>de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)</extendedLanguage>
-    <extendedLanguage>1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)</extendedLanguage>
+    <extendedLanguage>1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps
index f3ad2161c6a7..cad7bee0bd05 100644
--- a/plugins/console/lang/internalCommands/languageModels/behavior.mps
+++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps
@@ -12,9 +12,8 @@
     <import index="wns9" ref="r:90445206-a973-4c1d-b760-30e5c77b7497(jetbrains.mps.console.internalCommands.structure)" />
     <import index="zyb2" ref="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
-    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.console.blCommand.behavior)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
-    <import index="caxt" ref="r:135a606f-0376-4c5c-9ab8-4030f051a062(jetbrains.mps.console.ideCommands.structure)" />
+    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -88,7 +87,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3THzug">
+      <concept id="1172420572800" name="jetbrains.mps.lang.smodel.structure.ConceptNodeType" flags="in" index="3THzug">
         <reference id="1180481110358" name="conceptDeclaraton" index="3qa414" />
       </concept>
     </language>
@@ -164,7 +163,7 @@
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getShortHelp" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
       <node concept="3Tm1VV" id="DySRn8ZxA6" role="1B3o_S" />
       <node concept="3clFbS" id="DySRn8ZxA9" role="3clF47">
         <node concept="3clFbF" id="DySRn90daw" role="3cqZAp">
@@ -239,7 +238,7 @@
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getShortHelp" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
       <node concept="3Tm1VV" id="DySRn8ZxJj" role="1B3o_S" />
       <node concept="3clFbS" id="DySRn8ZxJm" role="3clF47">
         <node concept="3clFbF" id="DySRn8ZxJD" role="3cqZAp">
@@ -279,7 +278,7 @@
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getShortHelp" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
       <node concept="3Tm1VV" id="6eQQAdlPDu7" role="1B3o_S" />
       <node concept="3clFbS" id="6eQQAdlPDua" role="3clF47">
         <node concept="3clFbF" id="6eQQAdlPDvD" role="3cqZAp">
diff --git a/plugins/console/lang/internalCommands/languageModels/editor.mps b/plugins/console/lang/internalCommands/languageModels/editor.mps
index 011178328f78..21c365092d67 100644
--- a/plugins/console/lang/internalCommands/languageModels/editor.mps
+++ b/plugins/console/lang/internalCommands/languageModels/editor.mps
@@ -8,7 +8,7 @@
   <imports>
     <import index="wns9" ref="r:90445206-a973-4c1d-b760-30e5c77b7497(jetbrains.mps.console.internalCommands.structure)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
-    <import index="n8mm" ref="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.console.blCommand.editor)" />
+    <import index="n8mm" ref="r:be520d7c-8791-490a-9d50-1adca7cd12c4(jetbrains.mps.lang.smodel.query.editor)" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
     <import index="caxt" ref="r:135a606f-0376-4c5c-9ab8-4030f051a062(jetbrains.mps.console.ideCommands.structure)" />
   </imports>
diff --git a/plugins/console/lang/internalCommands/languageModels/structure.mps b/plugins/console/lang/internalCommands/languageModels/structure.mps
index aa4e25e80b6a..03385caf65b7 100644
--- a/plugins/console/lang/internalCommands/languageModels/structure.mps
+++ b/plugins/console/lang/internalCommands/languageModels/structure.mps
@@ -8,7 +8,7 @@
   <imports>
     <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies
index 9743b816c914..4eee9e2c9189 100644
--- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies
+++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies
@@ -20,9 +20,9 @@
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.internalCommands.behavior.ConsoleModelExpression_Behavior" />
     <classNode dependClassName="jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="java.lang.Cloneable" />
@@ -37,10 +37,10 @@
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.internalCommands.behavior.InternalMode_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
     <classNode extendsClassName="java.lang.Cloneable" />
diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated
index 28215b981432..3cc496524803 100644
--- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated
+++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-75o3qif77s16skjxr01v294r52z3fk" />
+<dependencies version="2" modelHash="-4knb339rk85wqzyiyv8svaidosttemy" />
 
diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/editor/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/editor/generated
index 9e9ca72c0b54..df4390860d4b 100644
--- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/editor/generated
+++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/editor/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-60fpwhbxg9ophrnzvpn8ew7adergk7y" />
+<dependencies version="2" modelHash="-afurps6893rvv8o0nryl45skv1sfhcn" />
 
diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated
index 92a6f2cb57b9..2277f81a9430 100644
--- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated
+++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-ciehzoa4ovha0i5gth18d0fluhrgyqb" />
+<dependencies version="2" modelHash="biaik7h6q8m5zb6gv08zhsyoamsllai" />
 
diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/structure/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/structure/generated
index 30859178a858..d88e5a1b1fb7 100644
--- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/structure/generated
+++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/structure/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="3jxbvv1klbipjfbt78bglnth202mrnd" />
+<dependencies version="2" modelHash="-dkb4ti5a8z13oue2aebgza0ohre74bt" />
 
diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/Language.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/Language.java
index e5a0e26b5b2c..ff979c8e6ccc 100644
--- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/Language.java
+++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/Language.java
@@ -35,7 +35,7 @@ public SLanguageId getId() {
   }
   @Override
   protected String[] getExtendedLanguageIDs() {
-    return new String[]{"jetbrains.mps.console.base", "jetbrains.mps.console.blCommand"};
+    return new String[]{"jetbrains.mps.console.base", "jetbrains.mps.lang.smodel.query"};
   }
   @Override
   public Collection<TemplateModule> getGenerators() {
diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ConsoleModelExpression_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ConsoleModelExpression_BehaviorDescriptor.java
index dbe2266d82c9..cc833b3c08a8 100644
--- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ConsoleModelExpression_BehaviorDescriptor.java
+++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ConsoleModelExpression_BehaviorDescriptor.java
@@ -2,7 +2,7 @@
 
 /*Generated by MPS */
 
-import jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor;
 import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
 import org.jetbrains.mps.openapi.model.SNode;
diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java
index bb0fa8fc1311..81fe1e03f5da 100644
--- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java
+++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java
@@ -3,29 +3,29 @@
 /*Generated by MPS */
 
 import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor;
-import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior;
-import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior;
 import org.jetbrains.mps.openapi.model.SNode;
 
-public class InternalMode_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor {
+public class InternalMode_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor {
   public InternalMode_BehaviorDescriptor() {
   }
   public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
+    return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
   }
   public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
   }
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
+    return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
   }
   public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
-    return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept);
+    return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept);
   }
   public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
   }
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
     return InternalMode_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/structure/StructureAspectDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/structure/StructureAspectDescriptor.java
index d51352c3a2cc..d926536a9e17 100644
--- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/structure/StructureAspectDescriptor.java
+++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/structure/StructureAspectDescriptor.java
@@ -12,8 +12,8 @@
 
 public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
 
-  /*package*/ final ConceptDescriptor myConceptConsoleModelExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.ConsoleModelExpression", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x4d7759afcea851bdL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).alias("#consoleModel", "").create();
-  /*package*/ final ConceptDescriptor myConceptInternalMode = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.InternalMode", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x7a89354654722219L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).alias("#internalMode", "").create();
+  /*package*/ final ConceptDescriptor myConceptConsoleModelExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.ConsoleModelExpression", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x4d7759afcea851bdL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).alias("#consoleModel", "").create();
+  /*package*/ final ConceptDescriptor myConceptInternalMode = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.InternalMode", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x7a89354654722219L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).alias("#internalMode", "").create();
   /*package*/ final ConceptDescriptor myConceptReloadClassesCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.ReloadClassesCommand", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x75bb0160f191dd31L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).alias("#reloadClasses", "").create();
   /*package*/ final ConceptDescriptor myConceptShowRepositoryCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.ShowRepositoryCommand", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x75bb0160f191df0cL)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).abstract_().alias("#show repository", "").create();
 
diff --git a/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd b/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd
index 0d6a0172a35b..65ba677b50a3 100644
--- a/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd
+++ b/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd
@@ -20,7 +20,7 @@
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="-1" />
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
diff --git a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated
index 57bd7d9e5908..d3c4c7d76139 100644
--- a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated
+++ b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="9clfj50oxhjzlcv2ssogq2g2vi9dn3c" />
+<dependencies version="2" modelHash="172ihl3scqip7vexvposwtpvzlxc10d" />
 
diff --git a/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/QueriesGenerated.java b/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/QueriesGenerated.java
index 1201c01cee57..1ba2dc390565 100644
--- a/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/QueriesGenerated.java
+++ b/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/QueriesGenerated.java
@@ -19,9 +19,6 @@ public static boolean baseMappingRule_Condition_1672541786946118133(final BaseMa
   public static Object referenceMacro_GetReferent_1734392475491234406(final ReferenceMacroContext _context) {
     return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getReferenceLink(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3dc6aL, 0x1811ccc46ac3dc6bL, "script"));
   }
-  public static Object referenceMacro_GetReferent_2377091791518659475(final ReferenceMacroContext _context) {
-    return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter");
-  }
   public static SNode sourceNodeQuery_2377091791518076320(final SourceSubstituteMacroNodeContext _context) {
     return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"));
   }
diff --git a/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/trace.info b/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/trace.info
index fcafd422b75d..625f06430b1e 100644
--- a/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/trace.info
+++ b/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/trace.info
@@ -3,17 +3,15 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.ReturnStatement" />
   <root>
     <file name="QueriesGenerated.java">
-      <unit at="14,0,32,0" name="jetbrains.mps.console.scripts.generator.main.QueriesGenerated" />
+      <unit at="14,0,29,0" name="jetbrains.mps.console.scripts.generator.main.QueriesGenerated" />
     </file>
   </root>
   <root nodeRef="r:d126bb78-add4-48f5-8d7d-bb3111805e2a(jetbrains.mps.console.scripts.generator.main@generator)/1672541786945837086">
     <file name="QueriesGenerated.java">
-      <node id="2377091791518660554" at="22,109,23,296" concept="0" />
-      <node id="2377091791518076327" at="25,108,26,181" concept="0" />
-      <node id="2377091791518083967" at="28,108,29,509" concept="0" />
-      <scope id="2377091791518659476" at="22,109,23,296" />
-      <scope id="2377091791518076321" at="25,108,26,181" />
-      <scope id="2377091791518083961" at="28,108,29,509" />
+      <node id="2377091791518076327" at="22,108,23,181" concept="0" />
+      <node id="2377091791518083967" at="25,108,26,509" concept="0" />
+      <scope id="2377091791518076321" at="22,108,23,181" />
+      <scope id="2377091791518083961" at="25,108,26,509" />
     </file>
   </root>
   <root nodeRef="r:d126bb78-add4-48f5-8d7d-bb3111805e2a(jetbrains.mps.console.scripts.generator.main@generator)/1734392475490465061">
diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps
index 199269925ba2..c20ea096dc97 100644
--- a/plugins/console/lang/scripts/generator/template/main@generator.mps
+++ b/plugins/console/lang/scripts/generator/template/main@generator.mps
@@ -4,15 +4,12 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
   </languages>
   <imports>
     <import index="z2sp" ref="r:e712f353-5c3c-4288-adce-87c956a52ffb(jetbrains.mps.console.scripts.structure)" />
-    <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
     <import index="8wae" ref="r:e3aa7efa-3cb3-44f7-8e8b-0643a8a5ad38(jetbrains.mps.console.scripts.runtime.util)" />
-    <import index="74y1" ref="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
@@ -29,6 +26,10 @@
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
@@ -106,34 +107,22 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
-      <concept id="1216860049627" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput" flags="nn" index="1iwH70">
-        <reference id="1216860049628" name="label" index="1iwH77" />
-        <child id="1216860049632" name="inputNode" index="1iwH7V" />
-      </concept>
-      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <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="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB" />
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
         <reference id="1140138128738" name="concept" index="1PxNhF" />
         <child id="1140138123956" name="leftExpression" index="1PxMeX" />
       </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -214,23 +203,28 @@
               <node concept="37vLTw" id="1whNchEKZ9z" role="37wK5m">
                 <ref role="3cqZAo" node="1whNchEKZ9q" resolve="context" />
               </node>
-              <node concept="3B5_sB" id="1whNchEKZ9$" role="37wK5m">
-                <node concept="1ZhdrF" id="1whNchEKZ9_" role="lGtFl">
-                  <property role="2qtEX8" value="referentNode" />
-                  <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/1219352745532/1219352800908" />
-                  <node concept="3$xsQk" id="1whNchEKZ9A" role="3$ytzL">
-                    <node concept="3clFbS" id="1whNchEKZ9B" role="2VODD2">
-                      <node concept="3clFbF" id="1whNchEKZ9C" role="3cqZAp">
-                        <node concept="2OqwBi" id="1whNchEKZ9D" role="3clFbG">
-                          <node concept="3TrEf2" id="1whNchEKZ9E" role="2OqNvi">
-                            <ref role="3Tt5mk" to="z2sp:1whNchEKXLF" />
+              <node concept="10QFUN" id="3ZgZ1njMIa1" role="37wK5m">
+                <node concept="3B5_sB" id="1whNchEKZ9$" role="10QFUP">
+                  <node concept="1ZhdrF" id="1whNchEKZ9_" role="lGtFl">
+                    <property role="2qtEX8" value="referentNode" />
+                    <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/1219352745532/1219352800908" />
+                    <node concept="3$xsQk" id="1whNchEKZ9A" role="3$ytzL">
+                      <node concept="3clFbS" id="1whNchEKZ9B" role="2VODD2">
+                        <node concept="3clFbF" id="1whNchEKZ9C" role="3cqZAp">
+                          <node concept="2OqwBi" id="1whNchEKZ9D" role="3clFbG">
+                            <node concept="3TrEf2" id="1whNchEKZ9E" role="2OqNvi">
+                              <ref role="3Tt5mk" to="z2sp:1whNchEKXLF" />
+                            </node>
+                            <node concept="30H73N" id="1whNchEKZ9F" role="2Oq$k0" />
                           </node>
-                          <node concept="30H73N" id="1whNchEKZ9F" role="2Oq$k0" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
+                <node concept="3Tqbb2" id="3ZgZ1njMIa2" role="10QFUM">
+                  <ref role="ehGHo" to="z2sp:1whNchEKZrp" resolve="AbstractConsoleScript" />
+                </node>
               </node>
             </node>
           </node>
@@ -269,32 +263,6 @@
               <ref role="37wK5l" to="8wae:23X86fnS_$6" resolve="refactor" />
               <node concept="37vLTw" id="23X86fnVb5G" role="37wK5m">
                 <ref role="3cqZAo" node="23X86fnVai2" resolve="context" />
-                <node concept="1ZhdrF" id="23X86fnXRei" role="lGtFl">
-                  <property role="2qtEX8" value="variableDeclaration" />
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                  <node concept="3$xsQk" id="23X86fnXRej" role="3$ytzL">
-                    <node concept="3clFbS" id="23X86fnXRek" role="2VODD2">
-                      <node concept="3clFbF" id="23X86fnXRva" role="3cqZAp">
-                        <node concept="2OqwBi" id="23X86fnXRAy" role="3clFbG">
-                          <node concept="1iwH7S" id="23X86fnXRv9" role="2Oq$k0" />
-                          <node concept="1iwH70" id="23X86fnXRWD" role="2OqNvi">
-                            <ref role="1iwH77" to="74y1:1El5OLsAWHX" resolve="contextParameter" />
-                            <node concept="2OqwBi" id="23X86fnXSaN" role="1iwH7V">
-                              <node concept="30H73N" id="23X86fnXS3F" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="23X86fnXUby" role="2OqNvi">
-                                <node concept="1xMEDy" id="23X86fnXUb$" role="1xVPHs">
-                                  <node concept="chp4Y" id="1sQ3YjaUPU9" role="ri$Ld">
-                                    <ref role="cht4Q" to="3xdn:4Jke6BA4ffD" resolve="BLCommand" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
               </node>
               <node concept="10Nm6u" id="23X86fnVCLP" role="37wK5m">
                 <node concept="29HgVG" id="23X86fnVCQt" role="lGtFl">
diff --git a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl
index bf1e6ffa3102..8feee44e229c 100644
--- a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl
+++ b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl
@@ -2,7 +2,7 @@
 <language namespace="jetbrains.mps.console.scripts" uuid="f26691d2-0def-4c06-aec6-2cb90c4af0a4" version="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
-      <sourceRoot path="${module}/languageModels" />
+      <sourceRoot location="languageModels" />
     </modelRoot>
   </models>
   <accessoryModels />
@@ -13,11 +13,9 @@
           <sourceRoot location="generator/template" />
         </modelRoot>
       </models>
-      <external-templates>
-        <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
-      </external-templates>
+      <external-templates />
       <dependencies>
-        <dependency reexport="false">1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)</dependency>
+        <dependency reexport="false">1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)</dependency>
         <dependency reexport="false" scope="design">2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696)</dependency>
       </dependencies>
       <usedDevKits>
@@ -30,25 +28,10 @@
         <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
         <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
         <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
-        <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
       <mapping-priorities>
-        <mapping-priority-rule kind="strictly_together">
-          <greater-priority-mapping>
-            <generator generatorUID="b372f31d-dc58-46b6-ad0b-2e1b2e187b9d(jetbrains.mps.console.scripts#1734392475490224704)" />
-            <external-mapping>
-              <mapping-node modelUID="r:d126bb78-add4-48f5-8d7d-bb3111805e2a(jetbrains.mps.console.scripts.generator.main@generator)" nodeID="1734392475490465061" />
-            </external-mapping>
-          </greater-priority-mapping>
-          <lesser-priority-mapping>
-            <generator generatorUID="504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)" />
-            <external-mapping>
-              <mapping-node modelUID="r:443bf6a4-9266-4251-8983-0f2d347a9c11(jetbrains.mps.console.blCommand.generator.template.main@generator)" nodeID="5336086527852811410" />
-            </external-mapping>
-          </lesser-priority-mapping>
-        </mapping-priority-rule>
         <mapping-priority-rule kind="strictly_before">
           <greater-priority-mapping>
             <generator generatorUID="b372f31d-dc58-46b6-ad0b-2e1b2e187b9d(jetbrains.mps.console.scripts#1734392475490224704)" />
@@ -100,7 +83,7 @@
   </runtime>
   <extendedLanguages>
     <extendedLanguage>de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)</extendedLanguage>
-    <extendedLanguage>1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)</extendedLanguage>
+    <extendedLanguage>1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/plugins/console/lang/scripts/languageModels/behavior.mps b/plugins/console/lang/scripts/languageModels/behavior.mps
index a46863211d13..a43d7bb1117b 100644
--- a/plugins/console/lang/scripts/languageModels/behavior.mps
+++ b/plugins/console/lang/scripts/languageModels/behavior.mps
@@ -9,6 +9,7 @@
     <import index="z2sp" ref="r:e712f353-5c3c-4288-adce-87c956a52ffb(jetbrains.mps.console.scripts.structure)" />
     <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
     <import index="zyb2" ref="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)" />
+    <import index="fq2o" ref="r:11d950c0-cabb-4b20-860f-4f2898171c08(jetbrains.mps.lang.smodel.query.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -123,12 +124,6 @@
       </node>
     </node>
   </node>
-  <node concept="13h7C7" id="DySRn8ZRY$">
-    <ref role="13h7C2" to="z2sp:1whNchEKXLE" resolve="Execute" />
-    <node concept="13hLZK" id="DySRn8ZRY_" role="13h7CW">
-      <node concept="3clFbS" id="DySRn8ZRYA" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="2jRIeHQ1WiA">
     <ref role="13h7C2" to="z2sp:23X86fnRD$Y" resolve="RefactorOperation" />
     <node concept="13hLZK" id="2jRIeHQ1Wl1" role="13h7CW">
@@ -139,7 +134,7 @@
       <property role="13i0it" value="false" />
       <property role="TrG5h" value="getShortHelp" />
       <property role="2Ki8OM" value="true" />
-      <ref role="13i0hy" to="zyb2:qgIopNa9Hb" resolve="getShortHelp" />
+      <ref role="13i0hy" to="fq2o:qgIopNa9Hb" resolve="getShortHelp" />
       <node concept="3Tm1VV" id="2jRIeHQ1XWr" role="1B3o_S" />
       <node concept="3clFbS" id="2jRIeHQ1XWu" role="3clF47">
         <node concept="3clFbF" id="2jRIeHQ27BD" role="3cqZAp">
@@ -155,7 +150,7 @@
       <property role="13i0it" value="false" />
       <property role="2Ki8OM" value="true" />
       <property role="TrG5h" value="getHelpPage" />
-      <ref role="13i0hy" to="zyb2:64VftqEen2L" resolve="getHelpPage" />
+      <ref role="13i0hy" to="fq2o:64VftqEen2L" resolve="getHelpPage" />
       <node concept="3Tm1VV" id="2jRIeHQ27BS" role="1B3o_S" />
       <node concept="3clFbS" id="2jRIeHQ27BX" role="3clF47">
         <node concept="3clFbF" id="2jRIeHQ27Iw" role="3cqZAp">
diff --git a/plugins/console/lang/scripts/languageModels/structure.mps b/plugins/console/lang/scripts/languageModels/structure.mps
index 0b082128fbca..d23066d27a3a 100644
--- a/plugins/console/lang/scripts/languageModels/structure.mps
+++ b/plugins/console/lang/scripts/languageModels/structure.mps
@@ -9,7 +9,7 @@
     <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" />
-    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)" />
+    <import index="3xdn" ref="r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies
index 5a6d3fdc170a..dfda808d8157 100644
--- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies
+++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies
@@ -37,9 +37,6 @@
     <classNode extendsClassName="java.lang.Cloneable" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
   </dependency>
-  <dependency className="jetbrains.mps.console.scripts.behavior.Execute_Behavior" file="Execute_Behavior.java">
-    <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
-  </dependency>
   <dependency className="jetbrains.mps.console.scripts.behavior.Execute_BehaviorDescriptor" file="Execute_BehaviorDescriptor.java">
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
@@ -55,10 +52,10 @@
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.collections.behavior.InternalSequenceOperation_BehaviorDescriptor" />
-    <classNode dependClassName="jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior" />
-    <classNode dependClassName="jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor" />
     <classNode dependClassName="jetbrains.mps.console.scripts.behavior.RefactorOperation_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_Behavior" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_BehaviorDescriptor" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SConcept" />
     <classNode extendsClassName="java.lang.Cloneable" />
     <classNode extendsClassName="jetbrains.mps.smodel.runtime.impl.CompiledBehaviorDescriptor" />
diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated
index a4ffad3f74c5..d941b491f46a 100644
--- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated
+++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="bohc0ehub8pciqk7y8vwdetdg1yrml2" />
+<dependencies version="2" modelHash="b1aglr5qgovfe4q562qzpzoi7bt5gmh" />
 
diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated
index 4aae506f1112..07944effa4ab 100644
--- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated
+++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="8hpr8ft0h5rum1sd6invlajjqgzt0lp" />
+<dependencies version="2" modelHash="8pn1p4gfnuczmlnauq03qot8tuk4fc2" />
 
diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/structure/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/structure/generated
index 975a30144a3d..d551e19ae64b 100644
--- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/structure/generated
+++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/structure/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="e7egfgks98e0jhlz7njbmd0ut9vxvjc" />
+<dependencies version="2" modelHash="-6bg27dhw2j4nbsj1hog8sgphzpd5v5j" />
 
diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/Language.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/Language.java
index c61bd0202228..86d97b7fe5c0 100644
--- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/Language.java
+++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/Language.java
@@ -37,7 +37,7 @@ public SLanguageId getId() {
   }
   @Override
   protected String[] getExtendedLanguageIDs() {
-    return new String[]{"jetbrains.mps.console.base", "jetbrains.mps.console.blCommand"};
+    return new String[]{"jetbrains.mps.console.base", "jetbrains.mps.lang.smodel.query"};
   }
   @Override
   public Collection<TemplateModule> getGenerators() {
diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/Execute_Behavior.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/Execute_Behavior.java
deleted file mode 100644
index 91ebf6130dbf..000000000000
--- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/Execute_Behavior.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package jetbrains.mps.console.scripts.behavior;
-
-/*Generated by MPS */
-
-import org.jetbrains.mps.openapi.model.SNode;
-
-public class Execute_Behavior {
-  public static void init(SNode thisNode) {
-  }
-}
diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java
index 272634685f48..f6bec7384a6f 100644
--- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java
+++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java
@@ -3,28 +3,28 @@
 /*Generated by MPS */
 
 import jetbrains.mps.baseLanguage.collections.behavior.InternalSequenceOperation_BehaviorDescriptor;
-import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor;
+import jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_BehaviorDescriptor;
 import org.jetbrains.mps.openapi.language.SConcept;
-import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior;
-import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior;
+import jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_Behavior;
 
-public class RefactorOperation_BehaviorDescriptor extends InternalSequenceOperation_BehaviorDescriptor implements ConsoleOperation_BehaviorDescriptor {
+public class RefactorOperation_BehaviorDescriptor extends InternalSequenceOperation_BehaviorDescriptor implements OperationHelpProvider_BehaviorDescriptor {
   public RefactorOperation_BehaviorDescriptor() {
   }
   public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
+    return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept);
   }
   public String virtual_getGroup_6928665434441162387(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
+    return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept);
   }
   public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) {
     return RefactorOperation_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept);
   }
   public String virtual_getKind_7006261637493126084(SConcept thisConcept) {
-    return ConsoleOperation_Behavior.virtual_getKind_7006261637493126084(thisConcept);
+    return OperationHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept);
   }
   public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) {
-    return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
+    return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept);
   }
   public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) {
     return RefactorOperation_Behavior.virtual_getShortHelp_473081947982699339(thisConcept);
diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/trace.info b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/trace.info
index f9b5faed9103..f729e4b11155 100644
--- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/trace.info
+++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/trace.info
@@ -67,15 +67,5 @@
       <unit id="2663801026049983654" at="8,0,18,0" name="jetbrains.mps.console.scripts.behavior.RefactorOperation_Behavior" />
     </file>
   </root>
-  <root nodeRef="r:330bc565-6764-4368-b8fa-04f1a782e337(jetbrains.mps.console.scripts.behavior)/748410583119789988">
-    <file name="Execute_Behavior.java">
-      <node id="748410583119789988" at="8,0,10,0" concept="1" trace="init#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <scope id="748410583119789990" at="8,43,8,43" />
-      <scope id="748410583119789988" at="8,0,10,0">
-        <var name="thisNode" id="748410583119789988" />
-      </scope>
-      <unit id="748410583119789988" at="7,0,11,0" name="jetbrains.mps.console.scripts.behavior.Execute_Behavior" />
-    </file>
-  </root>
 </debug-info>
 
diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/structure/StructureAspectDescriptor.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/structure/StructureAspectDescriptor.java
index 702f0db6e6cb..bcf6737440d4 100644
--- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/structure/StructureAspectDescriptor.java
+++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/structure/StructureAspectDescriptor.java
@@ -15,7 +15,7 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor {
   /*package*/ final ConceptDescriptor myConceptAbstractConsoleScript = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.AbstractConsoleScript", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3f6d9L)).interface_().parents("jetbrains.mps.baseLanguage.structure.IValidIdentifier").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11a3afa8c0dL)).create();
   /*package*/ final ConceptDescriptor myConceptConsoleScript = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.ConsoleScript", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3f6deL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.scripts.structure.AbstractConsoleScript").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3f6d9L)).childDescriptors(new ConceptDescriptorBuilder.Link(1734392475491235551L, "command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL), true, true, false)).children(new String[]{"command"}, new boolean[]{true}).create();
   /*package*/ final ConceptDescriptor myConceptExecute = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.Execute", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3dc6aL)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(1734392475491228779L, "script", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3f6d9L), false)).references("script").alias("#exec", "execute a script").create();
-  /*package*/ final ConceptDescriptor myConceptRefactorOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.RefactorOperation", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL)).super_("jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation").super_(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL)).parents("jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation", "jetbrains.mps.console.blCommand.structure.ConsoleOperation").parentIds(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).alias("refactor", "perform changes on selected nodes").create();
+  /*package*/ final ConceptDescriptor myConceptRefactorOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.RefactorOperation", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL)).super_("jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation").super_(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL)).parents("jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider").parentIds(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).alias("refactor", "perform changes on selected nodes").create();
 
   @Override
   public Collection<ConceptDescriptor> getDescriptors() {
diff --git a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd
index 6113f9987719..77adb1039fb0 100644
--- a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd
+++ b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd
@@ -23,7 +23,6 @@
   <languageVersions>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="1" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" fqName="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
diff --git a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps
index 7853bf216f4f..73fe1dca5ab9 100644
--- a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps
+++ b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps
@@ -2,23 +2,17 @@
 <model ref="r:e3aa7efa-3cb3-44f7-8e8b-0643a8a5ad38(jetbrains.mps.console.scripts.runtime.util)">
   <persistence version="9" />
   <languages>
-    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
-    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
-    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
-    <import index="zyb2" ref="r:1754cb33-73c2-441d-96bc-93a7824726e7(jetbrains.mps.console.base.behavior)" />
     <import index="qgo0" ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)" />
-    <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
     <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
     <import index="2e2z" ref="r:330bc565-6764-4368-b8fa-04f1a782e337(jetbrains.mps.console.scripts.behavior)" />
     <import index="z2sp" ref="r:e712f353-5c3c-4288-adce-87c956a52ffb(jetbrains.mps.console.scripts.structure)" />
     <import index="u42p" ref="r:986938bb-bdb1-4307-b062-e4647a4db0f9(jetbrains.mps.ide.platform.refactoring)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="o2jy" ref="r:5a764b6f-e05f-4050-b22c-cbcad1577f1b(jetbrains.mps.ide.refactoring)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
@@ -26,9 +20,7 @@
     <import index="g4jo" ref="r:d98d04fb-4a60-4106-81cf-6cb40b67de4d(jetbrains.mps.ide.findusages.model)" />
     <import index="ngmm" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.findusages.view(MPS.Platform/)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
-    <import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
-    <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -72,6 +64,10 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
@@ -122,6 +118,9 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -309,12 +308,19 @@
             <node concept="3clFbS" id="7mj7IbYTRAK" role="1bW5cS">
               <node concept="3clFbF" id="7mj7IbYRaIf" role="3cqZAp">
                 <node concept="2OqwBi" id="7mj7IbYRaIg" role="3clFbG">
-                  <node concept="2OqwBi" id="7mj7IbYRaIh" role="2Oq$k0">
-                    <node concept="37vLTw" id="7mj7IbYRaIi" role="2Oq$k0">
-                      <ref role="3cqZAo" node="ntTX465wNx" resolve="context" />
-                    </node>
-                    <node concept="liA8E" id="7mj7IbYRaIj" role="2OqNvi">
-                      <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getConsoleTab" />
+                  <node concept="1eOMI4" id="3ZgZ1njTsbT" role="2Oq$k0">
+                    <node concept="10QFUN" id="3ZgZ1njTsbU" role="1eOMHV">
+                      <node concept="2OqwBi" id="3ZgZ1njTsbQ" role="10QFUP">
+                        <node concept="37vLTw" id="3ZgZ1njTsbR" role="2Oq$k0">
+                          <ref role="3cqZAo" node="ntTX465wNx" resolve="context" />
+                        </node>
+                        <node concept="liA8E" id="3ZgZ1njTsbS" role="2OqNvi">
+                          <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getOutputWindow" />
+                        </node>
+                      </node>
+                      <node concept="3uibUv" id="3ZgZ1njTsfW" role="10QFUM">
+                        <ref role="3uigEE" to="qgo0:4gO8Gruz$1J" resolve="BaseConsoleTab" />
+                      </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="7mj7IbYRndd" role="2OqNvi">
@@ -595,57 +601,18 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="GwaEdBDLZH" role="3cqZAp">
-                          <node concept="2OqwBi" id="GwaEdBDQR9" role="3clFbG">
-                            <node concept="2OqwBi" id="GwaEdBDN9p" role="2Oq$k0">
-                              <node concept="2OqwBi" id="GwaEdBDLZJ" role="2Oq$k0">
-                                <node concept="2OqwBi" id="GwaEdBDLZK" role="2Oq$k0">
-                                  <node concept="37vLTw" id="GwaEdBDLZL" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2UF8zdu0mcN" resolve="context" />
-                                  </node>
-                                  <node concept="liA8E" id="GwaEdBDLZM" role="2OqNvi">
-                                    <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getConsoleTab" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="GwaEdBDLZN" role="2OqNvi">
-                                  <ref role="37wK5l" to="qgo0:2UF8zdtZoFf" resolve="getConsoleTool" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="GwaEdBDQ00" role="2OqNvi">
-                                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow():com.intellij.openapi.wm.ToolWindow" resolve="getToolWindow" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="GwaEdBDSmF" role="2OqNvi">
-                              <ref role="37wK5l" to="jkny:~ToolWindow.activate(java.lang.Runnable):void" resolve="activate" />
-                              <node concept="10Nm6u" id="GwaEdBDTga" role="37wK5m" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="2UF8zdtYdZY" role="3cqZAp">
-                          <node concept="2OqwBi" id="2UF8zdu0c2w" role="3clFbG">
-                            <node concept="2OqwBi" id="2UF8zdtYfiX" role="2Oq$k0">
-                              <node concept="2OqwBi" id="2UF8zdu0rpI" role="2Oq$k0">
-                                <node concept="37vLTw" id="2UF8zdu0qDR" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2UF8zdu0mcN" resolve="context" />
-                                </node>
-                                <node concept="liA8E" id="2UF8zdu0rZn" role="2OqNvi">
-                                  <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getConsoleTab" />
-                                </node>
+                        <node concept="3clFbF" id="3ZgZ1njR5CU" role="3cqZAp">
+                          <node concept="2OqwBi" id="3ZgZ1njR5Gc" role="3clFbG">
+                            <node concept="2OqwBi" id="GwaEdBDLZK" role="2Oq$k0">
+                              <node concept="37vLTw" id="GwaEdBDLZL" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2UF8zdu0mcN" resolve="context" />
                               </node>
-                              <node concept="liA8E" id="2UF8zdu0b4J" role="2OqNvi">
-                                <ref role="37wK5l" to="qgo0:2UF8zdtZoFf" resolve="getConsoleTool" />
+                              <node concept="liA8E" id="GwaEdBDLZM" role="2OqNvi">
+                                <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getOutputWindow" />
                               </node>
                             </node>
-                            <node concept="liA8E" id="2UF8zdu0eN6" role="2OqNvi">
-                              <ref role="37wK5l" to="qgo0:6ImRKzlZaoo" resolve="selectTab" />
-                              <node concept="2OqwBi" id="2UF8zdu0tBH" role="37wK5m">
-                                <node concept="37vLTw" id="2UF8zdu0sRJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2UF8zdu0mcN" resolve="context" />
-                                </node>
-                                <node concept="liA8E" id="2UF8zdu0ue6" role="2OqNvi">
-                                  <ref role="37wK5l" to="qgo0:7L2VFB5mjvh" resolve="getConsoleTab" />
-                                </node>
-                              </node>
+                            <node concept="liA8E" id="3ZgZ1njR5Pm" role="2OqNvi">
+                              <ref role="37wK5l" to="qgo0:3ZgZ1njQR0n" resolve="activate" />
                             </node>
                           </node>
                         </node>
diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies
index 383614d8c169..15fb336bd8c8 100644
--- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies
+++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies
@@ -9,6 +9,7 @@
     <classNode dependClassName="java.util.List" />
     <classNode dependClassName="javax.swing.SwingUtilities" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes" />
+    <classNode dependClassName="jetbrains.mps.console.tool.BaseConsoleTab" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleContext" />
     <classNode dependClassName="jetbrains.mps.ide.findusages.model.SearchResult" />
     <classNode dependClassName="jetbrains.mps.ide.findusages.model.SearchResults" />
diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated
index 7c710a27ba00..6b3a192b8584 100644
--- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated
+++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-3li0je0nojidwkpx32q7juck8ruhmzx" />
+<dependencies version="2" modelHash="-7g3tm1gf7w09pz453gfkoqp1xz46l4s" />
 
diff --git a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java
index 88acf7979abb..1131b2dda8af 100644
--- a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java
+++ b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import jetbrains.mps.internal.collections.runtime.ListSequence;
 import jetbrains.mps.smodel.ModelAccess;
+import jetbrains.mps.console.tool.BaseConsoleTab;
 import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes;
 import com.intellij.openapi.project.Project;
 import jetbrains.mps.ide.project.ProjectHelper;
@@ -41,7 +42,7 @@ public static void executeCommands(final ConsoleContext context, final List<SNod
     }
     ModelAccess.instance().runWriteActionInCommand(new Runnable() {
       public void run() {
-        context.getConsoleTab().execute(ListSequence.fromList(commands).getElement(startWith), null, new Runnable() {
+        ((BaseConsoleTab) context.getOutputWindow()).execute(ListSequence.fromList(commands).getElement(startWith), null, new Runnable() {
           public void run() {
             executeCommands(context, commands, startWith + 1);
           }
@@ -76,8 +77,7 @@ public SNode select(SNodeReference it) {
           }
         });
         refactoringViewItem.close();
-        context.getConsoleTab().getConsoleTool().getToolWindow().activate(null);
-        context.getConsoleTab().getConsoleTool().selectTab(context.getConsoleTab());
+        context.getOutputWindow().activate();
       }
     }, sr, false, "refactor");
   }
diff --git a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info
index d25dd61527ac..22994e64f25d 100644
--- a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info
+++ b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info
@@ -10,62 +10,61 @@
   <concept fqn="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" />
   <root nodeRef="r:e3aa7efa-3cb3-44f7-8e8b-0643a8a5ad38(jetbrains.mps.console.scripts.runtime.util)/1734392475490226499">
     <file name="ScriptsUtil.java">
-      <node id="8403006350606710878" at="29,80,30,186" concept="5" />
-      <node id="422748824979112365" at="32,25,33,86" concept="1" />
-      <node id="422748824979107399" at="39,63,40,13" concept="6" />
-      <node id="422748824979023362" at="45,29,46,62" concept="1" />
-      <node id="2377091791517983399" at="53,161,54,72" concept="5" />
-      <node id="7349810439588411781" at="54,72,55,55" concept="5" />
-      <node id="6636597128305943724" at="59,29,60,42" concept="5" />
-      <node id="6636597128306186415" at="61,73,62,176" concept="5" />
-      <node id="6636597128306284953" at="64,56,65,71" concept="6" />
-      <node id="6636597128306118681" at="68,20,69,36" concept="1" />
-      <node id="3267115895197588849" at="72,39,73,57" concept="1" />
-      <node id="7349810439587240221" at="77,11,78,36" concept="1" />
-      <node id="801687614978990061" at="78,36,79,80" concept="1" />
-      <node id="3362819150777475070" at="79,80,80,84" concept="1" />
+      <node id="8403006350606710878" at="30,80,31,186" concept="5" />
+      <node id="422748824979112365" at="33,25,34,86" concept="1" />
+      <node id="422748824979107399" at="40,63,41,13" concept="6" />
+      <node id="422748824979023362" at="46,29,47,62" concept="1" />
+      <node id="2377091791517983399" at="54,161,55,72" concept="5" />
+      <node id="7349810439588411781" at="55,72,56,55" concept="5" />
+      <node id="6636597128305943724" at="60,29,61,42" concept="5" />
+      <node id="6636597128306186415" at="62,73,63,176" concept="5" />
+      <node id="6636597128306284953" at="65,56,66,71" concept="6" />
+      <node id="6636597128306118681" at="69,20,70,36" concept="1" />
+      <node id="3267115895197588849" at="73,39,74,57" concept="1" />
+      <node id="7349810439587240221" at="78,11,79,36" concept="1" />
+      <node id="4598452390224222778" at="79,36,80,45" concept="1" />
       <node id="7349810439588636681" at="85,87,86,67" concept="5" />
       <node id="7349810439589440458" at="88,35,89,88" concept="1" />
       <node id="7349810439588706602" at="91,7,92,18" concept="6" />
       <node id="6636597128306093385" at="96,86,97,47" concept="6" />
-      <node id="6636597128306118237" at="68,18,70,13" concept="0" />
-      <node id="5222183305496184699" at="32,0,35,0" concept="4" trace="run#()V" />
-      <node id="422748824979040440" at="38,117,41,5" concept="3" />
-      <node id="422748824979023025" at="45,0,48,0" concept="4" trace="run#()V" />
-      <node id="6636597128306280473" at="64,0,67,0" concept="4" trace="select#(Lorg/jetbrains/mps/openapi/model/SNodeReference;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="6636597128306333884" at="71,75,74,15" concept="3" />
+      <node id="6636597128306118237" at="69,18,71,13" concept="0" />
+      <node id="5222183305496184699" at="33,0,36,0" concept="4" trace="run#()V" />
+      <node id="422748824979040440" at="39,117,42,5" concept="3" />
+      <node id="422748824979023025" at="46,0,49,0" concept="4" trace="run#()V" />
+      <node id="6636597128306280473" at="65,0,68,0" concept="4" trace="select#(Lorg/jetbrains/mps/openapi/model/SNodeReference;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="6636597128306333884" at="72,75,75,15" concept="3" />
       <node id="7349810439589440456" at="88,0,91,0" concept="4" trace="visit#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
       <node id="6636597128306093385" at="96,0,99,0" concept="7" trace="as_bb8vid_a0a0a0a1a0a0a0a0a0a0b0a2a5#(Ljava/lang/Object;Ljava/lang/Class;)null" />
-      <node id="5222183305496181609" at="30,186,35,7" concept="1" />
-      <node id="8472149284301351823" at="43,25,48,11" concept="1" />
-      <node id="6636597128306082290" at="62,176,67,17" concept="1" />
-      <node id="3267115895197545353" at="70,13,75,13" concept="2" />
+      <node id="5222183305496181609" at="31,186,36,7" concept="1" />
+      <node id="8472149284301351823" at="44,25,49,11" concept="1" />
+      <node id="6636597128306082290" at="63,176,68,17" concept="1" />
+      <node id="3267115895197545353" at="71,13,76,13" concept="2" />
       <node id="7349810439589440452" at="86,67,91,7" concept="1" />
-      <node id="8472149284302059950" at="43,0,50,0" concept="4" trace="run#()V" />
-      <node id="2197843344735277510" at="29,0,37,0" concept="7" trace="executeScript#(Ljetbrains/mps/console/tool/ConsoleContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="8472149284302059948" at="41,5,50,7" concept="1" />
+      <node id="8472149284302059950" at="44,0,51,0" concept="4" trace="run#()V" />
+      <node id="2197843344735277510" at="30,0,38,0" concept="7" trace="executeScript#(Ljetbrains/mps/console/tool/ConsoleContext;Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="8472149284302059948" at="42,5,51,7" concept="1" />
       <node id="7349810439588579493" at="85,0,94,0" concept="7" trace="nodesToRefactoringResult#(Ljava/lang/Iterable;)Ljetbrains/mps/ide/findusages/model/SearchResults;" />
-      <node id="6636597128305957335" at="60,42,70,13" concept="3" />
-      <node id="422748824978979008" at="38,0,52,0" concept="7" trace="executeCommands#(Ljetbrains/mps/console/tool/ConsoleContext;Ljava/util/List;I)V" />
-      <node id="2799321329874979146" at="59,0,77,0" concept="4" trace="run#()V" />
-      <node id="2799321329874979144" at="57,80,77,11" concept="1" />
-      <node id="7349810439587240215" at="57,0,82,0" concept="4" trace="performAction#(Ljetbrains/mps/ide/platform/refactoring/RefactoringViewItem;)V" />
-      <node id="7349810439587220704" at="55,55,82,30" concept="1" />
-      <node id="2377091791517276422" at="53,0,84,0" concept="7" trace="refactor#(Ljetbrains/mps/console/tool/ConsoleContext;Ljava/lang/Iterable;Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_void_P1_E0;)V" />
-      <scope id="5222183305496184700" at="32,25,33,86" />
-      <scope id="422748824979040443" at="39,63,40,13" />
-      <scope id="422748824979023027" at="45,29,46,62" />
-      <scope id="6636597128306280474" at="64,56,65,71" />
-      <scope id="6636597128306118238" at="68,20,69,36" />
-      <scope id="6636597128306333887" at="72,39,73,57" />
+      <node id="6636597128305957335" at="61,42,71,13" concept="3" />
+      <node id="422748824978979008" at="39,0,53,0" concept="7" trace="executeCommands#(Ljetbrains/mps/console/tool/ConsoleContext;Ljava/util/List;I)V" />
+      <node id="2799321329874979146" at="60,0,78,0" concept="4" trace="run#()V" />
+      <node id="2799321329874979144" at="58,80,78,11" concept="1" />
+      <node id="7349810439587240215" at="58,0,82,0" concept="4" trace="performAction#(Ljetbrains/mps/ide/platform/refactoring/RefactoringViewItem;)V" />
+      <node id="7349810439587220704" at="56,55,82,30" concept="1" />
+      <node id="2377091791517276422" at="54,0,84,0" concept="7" trace="refactor#(Ljetbrains/mps/console/tool/ConsoleContext;Ljava/lang/Iterable;Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_void_P1_E0;)V" />
+      <scope id="5222183305496184700" at="33,25,34,86" />
+      <scope id="422748824979040443" at="40,63,41,13" />
+      <scope id="422748824979023027" at="46,29,47,62" />
+      <scope id="6636597128306280474" at="65,56,66,71" />
+      <scope id="6636597128306118238" at="69,20,70,36" />
+      <scope id="6636597128306333887" at="73,39,74,57" />
       <scope id="7349810439589440457" at="88,35,89,88" />
       <scope id="6636597128306093385" at="96,86,97,47" />
-      <scope id="5222183305496184699" at="32,0,35,0" />
-      <scope id="422748824979023025" at="45,0,48,0" />
-      <scope id="6636597128306280473" at="64,0,67,0">
+      <scope id="5222183305496184699" at="33,0,36,0" />
+      <scope id="422748824979023025" at="46,0,49,0" />
+      <scope id="6636597128306280473" at="65,0,68,0">
         <var name="it" id="6636597128306280473" />
       </scope>
-      <scope id="3267115895197545359" at="71,75,74,15" />
+      <scope id="3267115895197545359" at="72,75,75,15" />
       <scope id="7349810439589440456" at="88,0,91,0">
         <var name="it" id="7349810439589440456" />
       </scope>
@@ -73,58 +72,58 @@
         <var name="o" id="6636597128306093385" />
         <var name="type" id="6636597128306093385" />
       </scope>
-      <scope id="8472149284302059952" at="43,25,48,11" />
-      <scope id="3267115895197545353" at="70,13,75,13">
+      <scope id="8472149284302059952" at="44,25,49,11" />
+      <scope id="3267115895197545353" at="71,13,76,13">
         <var name="resultNode" id="3267115895197545355" />
       </scope>
-      <scope id="2197843344735277513" at="29,80,35,7">
+      <scope id="2197843344735277513" at="30,80,36,7">
         <var name="commands" id="8403006350606710881" />
       </scope>
-      <scope id="6636597128305957338" at="61,73,67,17">
+      <scope id="6636597128305957338" at="62,73,68,17">
         <var name="nodeRefs" id="6636597128306186418" />
       </scope>
-      <scope id="8472149284302059950" at="43,0,50,0" />
+      <scope id="8472149284302059950" at="44,0,51,0" />
       <scope id="7349810439588579496" at="85,87,92,18">
         <var name="result" id="7349810439588636682" />
       </scope>
-      <scope id="2197843344735277510" at="29,0,37,0">
+      <scope id="2197843344735277510" at="30,0,38,0">
         <var name="context" id="2197843344735282493" />
         <var name="script" id="2197843344735279659" />
       </scope>
       <scope id="7349810439588579493" at="85,0,94,0">
         <var name="nodes" id="7349810439588590294" />
       </scope>
-      <scope id="422748824978979011" at="38,117,50,7" />
-      <scope id="422748824978979008" at="38,0,52,0">
+      <scope id="422748824978979011" at="39,117,51,7" />
+      <scope id="422748824978979008" at="39,0,53,0">
         <var name="commands" id="422748824978981364" />
         <var name="context" id="422748824978984161" />
         <var name="startWith" id="422748824978981545" />
       </scope>
-      <scope id="2799321329874979148" at="59,29,75,13">
+      <scope id="2799321329874979148" at="60,29,76,13">
         <var name="includedNodes" id="6636597128305943727" />
       </scope>
-      <scope id="2799321329874979146" at="59,0,77,0" />
-      <scope id="7349810439587240220" at="57,80,80,84" />
-      <scope id="7349810439587240215" at="57,0,82,0">
+      <scope id="2799321329874979146" at="60,0,78,0" />
+      <scope id="7349810439587240220" at="58,80,80,45" />
+      <scope id="7349810439587240215" at="58,0,82,0">
         <var name="refactoringViewItem" id="7349810439587240218" />
       </scope>
-      <scope id="2377091791517276425" at="53,161,82,30">
+      <scope id="2377091791517276425" at="54,161,82,30">
         <var name="project" id="2377091791517983400" />
         <var name="sr" id="7349810439588411782" />
       </scope>
-      <scope id="2377091791517276422" at="53,0,84,0">
+      <scope id="2377091791517276422" at="54,0,84,0">
         <var name="context" id="3362819150778032947" />
         <var name="nodes" id="2377091791517284893" />
         <var name="toExecuteWithEachNode" id="2377091791517286140" />
       </scope>
-      <unit id="5222183305496184699" at="31,35,35,5" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$1" />
-      <unit id="422748824979023025" at="44,105,48,9" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$3" />
-      <unit id="6636597128306280473" at="63,73,67,15" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$5" />
+      <unit id="5222183305496184699" at="32,35,36,5" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$1" />
+      <unit id="422748824979023025" at="45,126,49,9" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$3" />
+      <unit id="6636597128306280473" at="64,73,68,15" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$5" />
       <unit id="7349810439589440456" at="87,46,91,5" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$4" />
-      <unit id="8472149284302059950" at="42,55,50,5" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$2" />
-      <unit id="2799321329874979146" at="58,59,77,9" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$4" />
-      <unit id="7349810439587240213" at="56,71,82,5" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$3" />
-      <unit id="1734392475490226499" at="27,0,100,0" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil" />
+      <unit id="8472149284302059950" at="43,55,51,5" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$2" />
+      <unit id="2799321329874979146" at="59,59,78,9" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$4" />
+      <unit id="7349810439587240213" at="57,71,82,5" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil$3" />
+      <unit id="1734392475490226499" at="28,0,100,0" name="jetbrains.mps.console.scripts.runtime.util.ScriptsUtil" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps
index e9ea2a8ac0ed..84f6c72a1d49 100644
--- a/plugins/console/models/jetbrains/mps/console/tool.mps
+++ b/plugins/console/models/jetbrains/mps/console/tool.mps
@@ -2,16 +2,16 @@
 <model ref="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)">
   <persistence version="9" />
   <languages>
-    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
-    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="-1" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
   </languages>
   <imports>
     <import index="eynw" ref="r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)" />
@@ -67,6 +67,10 @@
     <import index="9w4s" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util(MPS.IDEA/)" />
     <import index="mte5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes()" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang()" />
+    <import index="yo81" ref="r:4ea5a78b-cb8a-4831-b227-f7860a22491d(jetbrains.mps.make.resources)" />
+    <import index="9erk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model()" />
+    <import index="ngmm" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.findusages.view()" />
+    <import index="kxzb" ref="r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -310,7 +314,9 @@
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
+        <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
+      </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
         <child id="1163668914799" name="condition" index="3K4Cdx" />
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
@@ -346,6 +352,12 @@
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
+        <child id="1235746996653" name="function" index="2SgG2M" />
+      </concept>
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+      </concept>
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -402,6 +414,9 @@
         <child id="3542851458883491298" name="languageId" index="2V$M_3" />
       </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>
       <concept id="1166648550386" name="jetbrains.mps.lang.smodel.structure.Model_CreateNewRootNodeOperation" flags="nn" index="2xF2bX" />
       <concept id="8758390115028452779" name="jetbrains.mps.lang.smodel.structure.Node_GetReferencesOperation" flags="nn" index="2z74zc" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
@@ -457,6 +472,9 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -517,63 +535,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="3HP615" id="5WpmwkrQPPk">
-    <property role="TrG5h" value="ConsoleStream" />
-    <node concept="3clFb_" id="5WpmwkrQPWC" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="addText" />
-      <node concept="3cqZAl" id="5WpmwkrQPWE" role="3clF45" />
-      <node concept="3Tm1VV" id="5WpmwkrQPWF" role="1B3o_S" />
-      <node concept="3clFbS" id="5WpmwkrQPWG" role="3clF47" />
-      <node concept="37vLTG" id="5WpmwkrRhDz" role="3clF46">
-        <property role="TrG5h" value="text" />
-        <node concept="17QB3L" id="3qGrMAJgU4I" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="7Jzw3XJWFQB" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="addNode" />
-      <node concept="3cqZAl" id="7Jzw3XJWFQC" role="3clF45" />
-      <node concept="3Tm1VV" id="7Jzw3XJWFQD" role="1B3o_S" />
-      <node concept="3clFbS" id="7Jzw3XJWFQE" role="3clF47" />
-      <node concept="37vLTG" id="7Jzw3XJWFQF" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="3qGrMAJgjsB" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="5WpmwkrQPPl" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="jysm2GDsTL">
-    <property role="TrG5h" value="ConsoleContext" />
-    <node concept="3clFb_" id="3MPHfSuPT3Y" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="getProject" />
-      <node concept="3uibUv" id="3MPHfSuPT4d" role="3clF45">
-        <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-      </node>
-      <node concept="3Tm1VV" id="3MPHfSuPT41" role="1B3o_S" />
-      <node concept="3clFbS" id="3MPHfSuPT42" role="3clF47" />
-    </node>
-    <node concept="3clFb_" id="3lidccNHjWv" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="getDefaultSearchscope" />
-      <node concept="3uibUv" id="3lidccNI3yb" role="3clF45">
-        <ref role="3uigEE" to="lui2:~SearchScope" resolve="SearchScope" />
-      </node>
-      <node concept="3Tm1VV" id="3lidccNHjWy" role="1B3o_S" />
-      <node concept="3clFbS" id="3lidccNHjWz" role="3clF47" />
-    </node>
-    <node concept="3clFb_" id="7L2VFB5mjvh" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="getConsoleTab" />
-      <node concept="3uibUv" id="4gO8GruTI6Q" role="3clF45">
-        <ref role="3uigEE" node="4gO8Gruz$1J" resolve="BaseConsoleTab" />
-      </node>
-      <node concept="3Tm1VV" id="7L2VFB5mjvj" role="1B3o_S" />
-      <node concept="3clFbS" id="7L2VFB5mjvk" role="3clF47" />
-    </node>
-    <node concept="3Tm1VV" id="jysm2GDsTM" role="1B3o_S" />
-  </node>
   <node concept="312cEu" id="3NTPlNtr9LB">
     <property role="TrG5h" value="ConsoleFileEditor" />
     <node concept="312cEg" id="2Y6GhaXyDRD" role="jymVt">
@@ -888,9 +849,7 @@
       <property role="DiZV1" value="false" />
       <property role="IEkAT" value="false" />
       <node concept="3Tm1VV" id="3NTPlNtrgVH" role="1B3o_S" />
-      <node concept="3uibUv" id="3NTPlNtrgVJ" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-      </node>
+      <node concept="17QB3L" id="3ZgZ1njMHRh" role="3clF45" />
       <node concept="2AHcQZ" id="3NTPlNtrgVK" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~NonNls" resolve="NonNls" />
       </node>
@@ -2284,15 +2243,15 @@
             <node concept="3uibUv" id="1eZSuKdWEqU" role="1tU5fm">
               <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
             </node>
-            <node concept="2OqwBi" id="1eZSuKdWEK5" role="33vP2m">
-              <node concept="2YIFZM" id="1eZSuKdWEAA" role="2Oq$k0">
+            <node concept="2OqwBi" id="2mWP9pMvBD0" role="33vP2m">
+              <node concept="2YIFZM" id="2mWP9pMvBjE" role="2Oq$k0">
                 <ref role="37wK5l" to="alof:~ProjectHelper.toMPSProject(com.intellij.openapi.project.Project):jetbrains.mps.project.Project" resolve="toMPSProject" />
                 <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                <node concept="1rXfSq" id="1eZSuKdWEDJ" role="37wK5m">
+                <node concept="1rXfSq" id="2mWP9pMvBy$" role="37wK5m">
                   <ref role="37wK5l" node="6ysF3v1ncGk" resolve="getProject" />
                 </node>
               </node>
-              <node concept="liA8E" id="1eZSuKdWF8a" role="2OqNvi">
+              <node concept="liA8E" id="2mWP9pMvBXU" role="2OqNvi">
                 <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
               </node>
             </node>
@@ -3224,9 +3183,7 @@
           <property role="TrG5h" value="arg" />
           <node concept="3uibUv" id="6ysF3v1j_mo" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="6ysF3v1j_mp" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="3ZgZ1njMHRj" role="11_B2D" />
             <node concept="3uibUv" id="6ysF3v1j_mq" role="11_B2D">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
             </node>
@@ -3371,9 +3328,7 @@
           <property role="TrG5h" value="arg" />
           <node concept="3uibUv" id="6ysF3v1j_rD" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="6ysF3v1j_rE" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="3ZgZ1njMHRi" role="11_B2D" />
             <node concept="3uibUv" id="6ysF3v1j_rF" role="11_B2D">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
             </node>
@@ -3456,9 +3411,7 @@
           <property role="TrG5h" value="arg" />
           <node concept="3uibUv" id="6ysF3v1j_sc" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="6ysF3v1j_sd" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="3ZgZ1njMHRl" role="11_B2D" />
             <node concept="3uibUv" id="6ysF3v1j_se" role="11_B2D">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
             </node>
@@ -3746,9 +3699,7 @@
           <property role="TrG5h" value="arg" />
           <node concept="3uibUv" id="6ysF3v1j_u8" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="6ysF3v1j_u9" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="3ZgZ1njMHRm" role="11_B2D" />
             <node concept="3uibUv" id="6ysF3v1j_ua" role="11_B2D">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
             </node>
@@ -4188,9 +4139,7 @@
       </node>
       <node concept="37vLTG" id="22CzinasFdE" role="3clF46">
         <property role="TrG5h" value="id" />
-        <node concept="3uibUv" id="22CzinasFdF" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-        </node>
+        <node concept="17QB3L" id="3ZgZ1njMHRk" role="1tU5fm" />
         <node concept="2AHcQZ" id="22CzinasFdG" role="2AJF6D">
           <ref role="2AI5Lk" to="mhfm:~NonNls" resolve="NonNls" />
         </node>
@@ -4373,6 +4322,43 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2UF8zdtYV3G" role="jymVt" />
+    <node concept="3clFb_" id="3ZgZ1njQR0n" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="activate" />
+      <node concept="3Tm1VV" id="3ZgZ1njQR0p" role="1B3o_S" />
+      <node concept="3cqZAl" id="3ZgZ1njQR0q" role="3clF45" />
+      <node concept="3clFbS" id="3ZgZ1njQR0t" role="3clF47">
+        <node concept="3clFbF" id="3ZgZ1njQYlP" role="3cqZAp">
+          <node concept="2OqwBi" id="3ZgZ1njQZas" role="3clFbG">
+            <node concept="2OqwBi" id="3ZgZ1njQYuM" role="2Oq$k0">
+              <node concept="1rXfSq" id="3ZgZ1njQYlN" role="2Oq$k0">
+                <ref role="37wK5l" node="2UF8zdtZoFf" resolve="getConsoleTool" />
+              </node>
+              <node concept="liA8E" id="3ZgZ1njQZ6G" role="2OqNvi">
+                <ref role="37wK5l" to="71xd:~BaseTool.getToolWindow():com.intellij.openapi.wm.ToolWindow" resolve="getToolWindow" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3ZgZ1njQZzs" role="2OqNvi">
+              <ref role="37wK5l" to="jkny:~ToolWindow.activate(java.lang.Runnable):void" resolve="activate" />
+              <node concept="10Nm6u" id="3ZgZ1njR01a" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3ZgZ1njR1Qo" role="3cqZAp">
+          <node concept="2OqwBi" id="3ZgZ1njR202" role="3clFbG">
+            <node concept="1rXfSq" id="3ZgZ1njR1Qm" role="2Oq$k0">
+              <ref role="37wK5l" node="2UF8zdtZoFf" resolve="getConsoleTool" />
+            </node>
+            <node concept="liA8E" id="3ZgZ1njR2Cy" role="2OqNvi">
+              <ref role="37wK5l" node="6ImRKzlZaoo" resolve="selectTab" />
+              <node concept="Xjq3P" id="3ZgZ1njR362" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3ZgZ1njR3Bc" role="jymVt" />
     <node concept="3clFb_" id="6ysF3v1j_9k" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="addBuiltInImports" />
@@ -4851,9 +4837,7 @@
                     </node>
                     <node concept="37vLTG" id="6ysF3v1j_cK" role="3clF46">
                       <property role="TrG5h" value="key" />
-                      <node concept="3uibUv" id="6ysF3v1j_cL" role="1tU5fm">
-                        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                      </node>
+                      <node concept="17QB3L" id="3ZgZ1njMHRo" role="1tU5fm" />
                       <node concept="2AHcQZ" id="6ysF3v1j_cM" role="2AJF6D">
                         <ref role="2AI5Lk" to="mhfm:~NonNls" resolve="NonNls" />
                       </node>
@@ -5186,9 +5170,7 @@
           <property role="TrG5h" value="map" />
           <node concept="3uibUv" id="6ysF3v1j_vP" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="6ysF3v1j_vQ" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="3ZgZ1njMHRn" role="11_B2D" />
             <node concept="3uibUv" id="6ysF3v1j_vR" role="11_B2D">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
             </node>
@@ -5831,7 +5813,7 @@
                 </node>
                 <node concept="3clFb_" id="1hGiwlkUV2G" role="jymVt">
                   <property role="1EzhhJ" value="false" />
-                  <property role="TrG5h" value="getDefaultSearchscope" />
+                  <property role="TrG5h" value="getDefaultSearchScope" />
                   <node concept="3uibUv" id="1hGiwlkUV2H" role="3clF45">
                     <ref role="3uigEE" to="lui2:~SearchScope" resolve="SearchScope" />
                   </node>
@@ -5849,14 +5831,14 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFb_" id="6ysF3v1j_nh" role="jymVt">
+                <node concept="3clFb_" id="3ZgZ1njS8ja" role="jymVt">
                   <property role="1EzhhJ" value="false" />
-                  <property role="TrG5h" value="getConsoleTab" />
-                  <node concept="3uibUv" id="4gO8GruTyO8" role="3clF45">
+                  <property role="TrG5h" value="getOutputWindow" />
+                  <node concept="3uibUv" id="1ycrhFMMUr4" role="3clF45">
                     <ref role="3uigEE" node="4gO8Gruz$1J" resolve="BaseConsoleTab" />
                   </node>
-                  <node concept="3Tm1VV" id="6ysF3v1j_nj" role="1B3o_S" />
-                  <node concept="3clFbS" id="6ysF3v1j_nk" role="3clF47">
+                  <node concept="3Tm1VV" id="3ZgZ1njS8jc" role="1B3o_S" />
+                  <node concept="3clFbS" id="3ZgZ1njS8jf" role="3clF47">
                     <node concept="3clFbF" id="7M1Gaz3azV0" role="3cqZAp">
                       <node concept="Xjq3P" id="4gO8GruTCsQ" role="3clFbG">
                         <ref role="1HBi2w" node="4gO8Gruz$1J" resolve="BaseConsoleTab" />
@@ -6417,6 +6399,339 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3clFb_" id="3ZgZ1njWV6A" role="jymVt">
+                  <property role="1EzhhJ" value="false" />
+                  <property role="TrG5h" value="addNodeRef" />
+                  <node concept="3cqZAl" id="3ZgZ1njWV6B" role="3clF45" />
+                  <node concept="3Tm1VV" id="3ZgZ1njWV6C" role="1B3o_S" />
+                  <node concept="37vLTG" id="3ZgZ1njWV6E" role="3clF46">
+                    <property role="TrG5h" value="target" />
+                    <node concept="3Tqbb2" id="3ZgZ1njWV6F" role="1tU5fm" />
+                  </node>
+                  <node concept="3clFbS" id="3ZgZ1njWV6H" role="3clF47">
+                    <node concept="3cpWs8" id="22lVekVIvjf" role="3cqZAp">
+                      <node concept="3cpWsn" id="22lVekVIvji" role="3cpWs9">
+                        <property role="TrG5h" value="node" />
+                        <node concept="3Tqbb2" id="22lVekVIvjd" role="1tU5fm">
+                          <ref role="ehGHo" to="eynw:22lVekVIQ0c" resolve="NodeReferencePresentation" />
+                        </node>
+                        <node concept="2ShNRf" id="22lVekVLjuG" role="33vP2m">
+                          <node concept="3zrR0B" id="22lVekVLjuE" role="2ShVmc">
+                            <node concept="3Tqbb2" id="22lVekVLjuF" role="3zrR0E">
+                              <ref role="ehGHo" to="eynw:22lVekVIQ0c" resolve="NodeReferencePresentation" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="22lVekVLjBa" role="3cqZAp">
+                      <node concept="2OqwBi" id="22lVekVLnyD" role="3clFbG">
+                        <node concept="2OqwBi" id="22lVekVLjSd" role="2Oq$k0">
+                          <node concept="37vLTw" id="22lVekVLjB9" role="2Oq$k0">
+                            <ref role="3cqZAo" node="22lVekVIvji" resolve="node" />
+                          </node>
+                          <node concept="3TrEf2" id="igjXyuTl5A" role="2OqNvi">
+                            <ref role="3Tt5mk" to="eynw:igjXyutfLJ" />
+                          </node>
+                        </node>
+                        <node concept="2oxUTD" id="22lVekVLonG" role="2OqNvi">
+                          <node concept="37vLTw" id="3ZgZ1njX9Aq" role="2oxUTC">
+                            <ref role="3cqZAo" node="3ZgZ1njWV6E" resolve="target" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="3ZgZ1njX4aj" role="3cqZAp">
+                      <node concept="1rXfSq" id="3ZgZ1njX4ah" role="3clFbG">
+                        <ref role="37wK5l" node="6ysF3v1j_on" resolve="addNode" />
+                        <node concept="37vLTw" id="3ZgZ1njX5gt" role="37wK5m">
+                          <ref role="3cqZAo" node="22lVekVIvji" resolve="node" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFb_" id="3ZgZ1njWV6I" role="jymVt">
+                  <property role="1EzhhJ" value="false" />
+                  <property role="TrG5h" value="addException" />
+                  <node concept="3cqZAl" id="3ZgZ1njWV6J" role="3clF45" />
+                  <node concept="3Tm1VV" id="3ZgZ1njWV6K" role="1B3o_S" />
+                  <node concept="37vLTG" id="3ZgZ1njWV6M" role="3clF46">
+                    <property role="TrG5h" value="t" />
+                    <node concept="3uibUv" id="3ZgZ1njWV6N" role="1tU5fm">
+                      <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="3ZgZ1njWV6P" role="3clF47">
+                    <node concept="3cpWs8" id="5G2W3aW$Ty1" role="3cqZAp">
+                      <node concept="3cpWsn" id="5G2W3aW$Ty2" role="3cpWs9">
+                        <property role="TrG5h" value="writer" />
+                        <property role="3TUv4t" value="false" />
+                        <node concept="3uibUv" id="5G2W3aW$Ty3" role="1tU5fm">
+                          <ref role="3uigEE" to="guwi:~StringWriter" resolve="StringWriter" />
+                        </node>
+                        <node concept="2ShNRf" id="5G2W3aW$Ty4" role="33vP2m">
+                          <node concept="1pGfFk" id="5G2W3aW$Ty5" role="2ShVmc">
+                            <ref role="37wK5l" to="guwi:~StringWriter.&lt;init&gt;()" resolve="StringWriter" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="5G2W3aW$Ty6" role="3cqZAp">
+                      <node concept="2OqwBi" id="5G2W3aW$Ty7" role="3clFbG">
+                        <node concept="37vLTw" id="3ZgZ1njXcb5" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3ZgZ1njWV6M" resolve="t" />
+                        </node>
+                        <node concept="liA8E" id="5G2W3aW$Ty9" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace(java.io.PrintWriter):void" resolve="printStackTrace" />
+                          <node concept="2ShNRf" id="5G2W3aW$Tya" role="37wK5m">
+                            <node concept="1pGfFk" id="5G2W3aW$Tyb" role="2ShVmc">
+                              <ref role="37wK5l" to="guwi:~PrintWriter.&lt;init&gt;(java.io.Writer)" resolve="PrintWriter" />
+                              <node concept="37vLTw" id="5G2W3aW$Tyc" role="37wK5m">
+                                <ref role="3cqZAo" node="5G2W3aW$Ty2" resolve="writer" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="5G2W3aWBxdh" role="3cqZAp">
+                      <node concept="3cpWsn" id="5G2W3aWBxdk" role="3cpWs9">
+                        <property role="TrG5h" value="exceptionHolder" />
+                        <node concept="3Tqbb2" id="5G2W3aWBxdf" role="1tU5fm">
+                          <ref role="ehGHo" to="eynw:5G2W3aW$Vsk" resolve="ExceptionHolder" />
+                        </node>
+                        <node concept="2ShNRf" id="5G2W3aWBxCa" role="33vP2m">
+                          <node concept="3zrR0B" id="5G2W3aWBxC8" role="2ShVmc">
+                            <node concept="3Tqbb2" id="5G2W3aWBxC9" role="3zrR0E">
+                              <ref role="ehGHo" to="eynw:5G2W3aW$Vsk" resolve="ExceptionHolder" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="5G2W3aWBxZ7" role="3cqZAp">
+                      <node concept="2OqwBi" id="5G2W3aWBAqu" role="3clFbG">
+                        <node concept="2OqwBi" id="5G2W3aWByri" role="2Oq$k0">
+                          <node concept="37vLTw" id="5G2W3aWBxZ6" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5G2W3aWBxdk" resolve="exceptionHolder" />
+                          </node>
+                          <node concept="3TrcHB" id="5G2W3aWB$ZB" role="2OqNvi">
+                            <ref role="3TsBF5" to="eynw:5G2W3aWBbyD" resolve="stackTrace" />
+                          </node>
+                        </node>
+                        <node concept="tyxLq" id="5G2W3aWBCmH" role="2OqNvi">
+                          <node concept="2OqwBi" id="5G2W3aWBCz_" role="tz02z">
+                            <node concept="37vLTw" id="5G2W3aWBCo5" role="2Oq$k0">
+                              <ref role="3cqZAo" node="5G2W3aW$Ty2" resolve="writer" />
+                            </node>
+                            <node concept="liA8E" id="5G2W3aWBE$r" role="2OqNvi">
+                              <ref role="37wK5l" to="guwi:~StringWriter.toString():java.lang.String" resolve="toString" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="5G2W3aWCkuq" role="3cqZAp">
+                      <node concept="2OqwBi" id="5G2W3aWCoZS" role="3clFbG">
+                        <node concept="2OqwBi" id="5G2W3aWCkXL" role="2Oq$k0">
+                          <node concept="37vLTw" id="5G2W3aWCkup" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5G2W3aWBxdk" resolve="exceptionHolder" />
+                          </node>
+                          <node concept="3TrcHB" id="5G2W3aWCn_1" role="2OqNvi">
+                            <ref role="3TsBF5" to="eynw:3ob4OZ0hWSE" resolve="text" />
+                          </node>
+                        </node>
+                        <node concept="tyxLq" id="5G2W3aWCqZ1" role="2OqNvi">
+                          <node concept="2OqwBi" id="5G2W3aWCt2J" role="tz02z">
+                            <node concept="2OqwBi" id="5G2W3aWCr82" role="2Oq$k0">
+                              <node concept="37vLTw" id="3ZgZ1njXcLT" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3ZgZ1njWV6M" resolve="t" />
+                              </node>
+                              <node concept="liA8E" id="5G2W3aWCsoP" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="5G2W3aWCyWv" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~Class.getName():java.lang.String" resolve="getName" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="3ZgZ1njXf2c" role="3cqZAp">
+                      <node concept="1rXfSq" id="3ZgZ1njXf2a" role="3clFbG">
+                        <ref role="37wK5l" node="6ysF3v1j_on" resolve="addNode" />
+                        <node concept="37vLTw" id="3ZgZ1njXgby" role="37wK5m">
+                          <ref role="3cqZAo" node="5G2W3aWBxdk" resolve="exceptionHolder" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFb_" id="3ZgZ1njWV6Q" role="jymVt">
+                  <property role="1EzhhJ" value="false" />
+                  <property role="TrG5h" value="addClosure" />
+                  <node concept="37vLTG" id="3ZgZ1njWV6R" role="3clF46">
+                    <property role="TrG5h" value="closure" />
+                    <node concept="1ajhzC" id="3ZgZ1njWV6S" role="1tU5fm">
+                      <node concept="3cqZAl" id="3ZgZ1njWV6T" role="1ajl9A" />
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="6_TW7xVHprM" role="3clF46">
+                    <property role="TrG5h" value="text" />
+                    <node concept="17QB3L" id="6_TW7xVHpPs" role="1tU5fm" />
+                  </node>
+                  <node concept="3cqZAl" id="3ZgZ1njWV6U" role="3clF45" />
+                  <node concept="3Tm1VV" id="3ZgZ1njWV6V" role="1B3o_S" />
+                  <node concept="3clFbS" id="3ZgZ1njWV6Y" role="3clF47">
+                    <node concept="3cpWs8" id="6_TW7xVvsk4" role="3cqZAp">
+                      <node concept="3cpWsn" id="6_TW7xVvsk5" role="3cpWs9">
+                        <property role="TrG5h" value="nodeWithClosure" />
+                        <node concept="3Tqbb2" id="6_TW7xVvsk6" role="1tU5fm">
+                          <ref role="ehGHo" to="eynw:XHjpmeKJb6" resolve="NodeWithClosure" />
+                        </node>
+                        <node concept="2ShNRf" id="6_TW7xVvsk7" role="33vP2m">
+                          <node concept="3zrR0B" id="6_TW7xVvsk8" role="2ShVmc">
+                            <node concept="3Tqbb2" id="6_TW7xVvsk9" role="3zrR0E">
+                              <ref role="ehGHo" to="eynw:XHjpmeKJb6" resolve="NodeWithClosure" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6_TW7xVvska" role="3cqZAp">
+                      <node concept="37vLTI" id="6_TW7xVvskb" role="3clFbG">
+                        <node concept="2OqwBi" id="6_TW7xVvskc" role="37vLTJ">
+                          <node concept="37vLTw" id="6_TW7xVvskd" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6_TW7xVvsk5" resolve="nodeWithClosure" />
+                          </node>
+                          <node concept="3TrcHB" id="6_TW7xVvske" role="2OqNvi">
+                            <ref role="3TsBF5" to="eynw:3ob4OZ0hWSE" resolve="text" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="6_TW7xVHrmy" role="37vLTx">
+                          <ref role="3cqZAo" node="6_TW7xVHprM" resolve="text" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6_TW7xVvskl" role="3cqZAp">
+                      <node concept="2OqwBi" id="6_TW7xVvskm" role="3clFbG">
+                        <node concept="2YIFZM" id="6_TW7xVvskn" role="2Oq$k0">
+                          <ref role="37wK5l" to="oh9p:2ONldth5FtA" resolve="getInstance" />
+                          <ref role="1Pybhc" to="oh9p:2ONldth5Ft3" resolve="ClosureHoldingNodeUtil" />
+                        </node>
+                        <node concept="liA8E" id="6_TW7xVvsko" role="2OqNvi">
+                          <ref role="37wK5l" to="oh9p:2ONldth5FtR" resolve="register" />
+                          <node concept="37vLTw" id="6_TW7xVvskp" role="37wK5m">
+                            <ref role="3cqZAo" node="6_TW7xVvsk5" resolve="nodeWithClosure" />
+                          </node>
+                          <node concept="37vLTw" id="igjXyurl_9" role="37wK5m">
+                            <ref role="3cqZAo" node="3ZgZ1njWV6R" resolve="closure" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="3ZgZ1njWZYW" role="3cqZAp">
+                      <node concept="1rXfSq" id="3ZgZ1njWZYU" role="3clFbG">
+                        <ref role="37wK5l" node="6ysF3v1j_on" resolve="addNode" />
+                        <node concept="37vLTw" id="3ZgZ1njX17$" role="37wK5m">
+                          <ref role="3cqZAo" node="6_TW7xVvsk5" resolve="nodeWithClosure" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFb_" id="1ycrhFMNpxs" role="jymVt">
+                  <property role="TrG5h" value="addSequence" />
+                  <property role="IEkAT" value="false" />
+                  <property role="DiZV1" value="false" />
+                  <property role="od$2w" value="false" />
+                  <node concept="3clFbS" id="7OcVEq$r3oC" role="3clF47">
+                    <node concept="3clFbJ" id="7uW68YxsGKv" role="3cqZAp">
+                      <node concept="3clFbS" id="7uW68YxsGKy" role="3clFbx">
+                        <node concept="3clFbF" id="1ycrhFMNsaH" role="3cqZAp">
+                          <node concept="1rXfSq" id="1ycrhFMNsaF" role="3clFbG">
+                            <ref role="37wK5l" node="6ysF3v1j_nr" resolve="addText" />
+                            <node concept="Xl_RD" id="7uW68YxsIPy" role="37wK5m">
+                              <property role="Xl_RC" value="empty sequence" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbC" id="7uW68YxsIa$" role="3clFbw">
+                        <node concept="3cmrfG" id="7uW68YxsI_D" role="3uHU7w">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="37vLTw" id="7uW68YxsHcp" role="3uHU7B">
+                          <ref role="3cqZAo" node="7OcVEq$ssJv" resolve="resultsCount" />
+                        </node>
+                      </node>
+                      <node concept="9aQIb" id="7uW68YxsJ1w" role="9aQIa">
+                        <node concept="3clFbS" id="7uW68YxsJ1x" role="9aQI4">
+                          <node concept="3clFbF" id="1ycrhFMNuge" role="3cqZAp">
+                            <node concept="1rXfSq" id="1ycrhFMNugc" role="3clFbG">
+                              <ref role="37wK5l" node="3ZgZ1njWV6Q" resolve="addClosure" />
+                              <node concept="1bVj0M" id="igjXyur9Iz" role="37wK5m">
+                                <node concept="3clFbS" id="igjXyur9I_" role="1bW5cS">
+                                  <node concept="3clFbF" id="6_TW7xVIkl9" role="3cqZAp">
+                                    <node concept="2YIFZM" id="WMsS6mDJnX" role="3clFbG">
+                                      <ref role="37wK5l" node="YwfKjlX8gC" resolve="show" />
+                                      <ref role="1Pybhc" node="7zdHeh8agf_" resolve="ConsoleUtil" />
+                                      <node concept="37vLTw" id="WMsS6mDJnY" role="37wK5m">
+                                        <ref role="3cqZAo" node="7OcVEq$so7u" resolve="project" />
+                                      </node>
+                                      <node concept="37vLTw" id="WMsS6mDJnZ" role="37wK5m">
+                                        <ref role="3cqZAo" node="7OcVEq$sqLw" resolve="results" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWs3" id="6_TW7xVKW7p" role="37wK5m">
+                                <node concept="3cpWs3" id="6_TW7xVHOQ_" role="3uHU7B">
+                                  <node concept="Xl_RD" id="6_TW7xVKYUn" role="3uHU7w">
+                                    <property role="Xl_RC" value=" " />
+                                  </node>
+                                  <node concept="37vLTw" id="7OcVEq$stnI" role="3uHU7B">
+                                    <ref role="3cqZAo" node="7OcVEq$ssJv" resolve="resultsCount" />
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="7OcVEq$swV5" role="3uHU7w">
+                                  <ref role="3cqZAo" node="7OcVEq$sv8h" resolve="resultDescription" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="7OcVEq$so7u" role="3clF46">
+                    <property role="TrG5h" value="project" />
+                    <node concept="3uibUv" id="7OcVEq$upcg" role="1tU5fm">
+                      <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="7OcVEq$sqLw" role="3clF46">
+                    <property role="TrG5h" value="results" />
+                    <node concept="1ajhzC" id="32notsQ8ZpQ" role="1tU5fm">
+                      <node concept="3uibUv" id="32notsQ903A" role="1ajl9A">
+                        <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="7OcVEq$ssJv" role="3clF46">
+                    <property role="TrG5h" value="resultsCount" />
+                    <node concept="10Oyi0" id="7OcVEq$st9G" role="1tU5fm" />
+                  </node>
+                  <node concept="37vLTG" id="7OcVEq$sv8h" role="3clF46">
+                    <property role="TrG5h" value="resultDescription" />
+                    <node concept="17QB3L" id="7OcVEq$swc4" role="1tU5fm" />
+                  </node>
+                  <node concept="3cqZAl" id="7OcVEq$r3ov" role="3clF45" />
+                  <node concept="3Tm1VV" id="7OcVEq$r2Wm" role="1B3o_S" />
+                </node>
               </node>
             </node>
           </node>
@@ -7916,9 +8231,7 @@
           <property role="TrG5h" value="arg" />
           <node concept="3uibUv" id="6u3s5B1ld91" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="6u3s5B1ld92" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="3ZgZ1njMHRp" role="11_B2D" />
             <node concept="3uibUv" id="6u3s5B1ld93" role="11_B2D">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
             </node>
@@ -7948,51 +8261,6 @@
   </node>
   <node concept="312cEu" id="7zdHeh8agf_">
     <property role="TrG5h" value="ConsoleUtil" />
-    <node concept="2tJIrI" id="6tSARFM591r" role="jymVt" />
-    <node concept="2YIFZL" id="7zdHeh8bIs_" role="jymVt">
-      <property role="TrG5h" value="getGeneratedModelName" />
-      <property role="IEkAT" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="7zdHeh8agwb" role="3clF47">
-        <node concept="3cpWs6" id="4xjLIcndjR9" role="3cqZAp">
-          <node concept="3cpWs3" id="4xjLIcndmxR" role="3cqZAk">
-            <node concept="Xl_RD" id="4xjLIcndmxU" role="3uHU7w">
-              <property role="Xl_RC" value=".Main" />
-            </node>
-            <node concept="2OqwBi" id="4xjLIcndlpR" role="3uHU7B">
-              <node concept="liA8E" id="4xjLIcndm9j" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getModelName():java.lang.String" resolve="getModelName" />
-              </node>
-              <node concept="2JrnkZ" id="7zdHeh8aEUO" role="2Oq$k0">
-                <node concept="2OqwBi" id="7zdHeh8ajd8" role="2JrQYb">
-                  <node concept="2OqwBi" id="7zdHeh8ahSd" role="2Oq$k0">
-                    <node concept="37vLTw" id="7zdHeh8ahIv" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7zdHeh8aha3" resolve="context" />
-                    </node>
-                    <node concept="liA8E" id="7zdHeh8aind" role="2OqNvi">
-                      <ref role="37wK5l" node="7L2VFB5mjvh" resolve="getConsoleTab" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="7zdHeh8aEtu" role="2OqNvi">
-                    <ref role="37wK5l" node="7M1Gaz36FXw" resolve="getConsoleModel" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7zdHeh8aha3" role="3clF46">
-        <property role="TrG5h" value="context" />
-        <node concept="3uibUv" id="7zdHeh8aha2" role="1tU5fm">
-          <ref role="3uigEE" node="jysm2GDsTL" resolve="ConsoleContext" />
-        </node>
-      </node>
-      <node concept="17QB3L" id="7zdHeh8agw4" role="3clF45" />
-      <node concept="3Tm1VV" id="7zdHeh8agpY" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="6tSARFM58kt" role="jymVt" />
     <node concept="2YIFZL" id="3wGjY11sG2P" role="jymVt">
       <property role="TrG5h" value="make" />
       <property role="od$2w" value="false" />
@@ -8407,7 +8675,204 @@
       <node concept="3Tm1VV" id="3wGjY11sBsh" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6tSARFM591K" role="jymVt" />
+    <node concept="2YIFZL" id="YwfKjlX8gC" role="jymVt">
+      <property role="TrG5h" value="show" />
+      <property role="DiZV1" value="false" />
+      <node concept="3cqZAl" id="YwfKjlWH82" role="3clF45" />
+      <node concept="37vLTG" id="YwfKjlWH9m" role="3clF46">
+        <property role="TrG5h" value="p" />
+        <node concept="3uibUv" id="YwfKjlWH9l" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="YwfKjlWH9y" role="3clF46">
+        <property role="TrG5h" value="results" />
+        <node concept="1ajhzC" id="1oFmEVz5uJq" role="1tU5fm">
+          <node concept="3uibUv" id="1oFmEVz5vnA" role="1ajl9A">
+            <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="YwfKjlWH8e" role="3clF47">
+        <node concept="SfApY" id="6M9lfhDHQRu" role="3cqZAp">
+          <node concept="3clFbS" id="6M9lfhDHQRw" role="SfCbr">
+            <node concept="3clFbF" id="YwfKjlWHaA" role="3cqZAp">
+              <node concept="2OqwBi" id="6M9lfhDGIIu" role="3clFbG">
+                <node concept="2EnYce" id="7wtp0S5i5vV" role="2Oq$k0">
+                  <node concept="2YIFZM" id="YwfKjlWHEt" role="2Oq$k0">
+                    <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project):com.intellij.openapi.project.Project" resolve="toIdeaProject" />
+                    <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+                    <node concept="37vLTw" id="YwfKjlWHEN" role="37wK5m">
+                      <ref role="3cqZAo" node="YwfKjlWH9m" resolve="p" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="YwfKjlWKKQ" role="2OqNvi">
+                    <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                    <node concept="3VsKOn" id="YwfKjlWLmT" role="37wK5m">
+                      <ref role="3VsUkX" to="ngmm:~UsagesViewTool" resolve="UsagesViewTool" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="YwfKjlX7TS" role="2OqNvi">
+                  <ref role="37wK5l" to="ngmm:~UsagesViewTool.show(jetbrains.mps.ide.findusages.model.SearchResults,java.lang.String):void" resolve="show" />
+                  <node concept="2Sg_IR" id="1oFmEVz5w9u" role="37wK5m">
+                    <node concept="37vLTw" id="1oFmEVz5w9v" role="2SgG2M">
+                      <ref role="3cqZAo" node="YwfKjlWH9y" resolve="results" />
+                    </node>
+                  </node>
+                  <node concept="Xl_RD" id="6M9lfhDGpMO" role="37wK5m">
+                    <property role="Xl_RC" value="No results to show" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="TDmWw" id="6M9lfhDHQRx" role="TEbGg">
+            <node concept="3cpWsn" id="6M9lfhDHQRz" role="TDEfY">
+              <property role="TrG5h" value="e" />
+              <node concept="3uibUv" id="6M9lfhDHRy6" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="6M9lfhDHQRB" role="TDEfX">
+              <node concept="34ab3g" id="6M9lfhDHRXD" role="3cqZAp">
+                <property role="35gtTG" value="warn" />
+                <property role="34fQS0" value="true" />
+                <node concept="Xl_RD" id="6M9lfhDHRXF" role="34bqiv">
+                  <property role="Xl_RC" value="Exception in showing custom console result" />
+                </node>
+                <node concept="37vLTw" id="6M9lfhDHSTh" role="34bMjA">
+                  <ref role="3cqZAo" node="6M9lfhDHQRz" resolve="e" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="YwfKjlWH6V" role="1B3o_S" />
+    </node>
     <node concept="3Tm1VV" id="7zdHeh8agfA" role="1B3o_S" />
   </node>
+  <node concept="3HP615" id="jysm2GDsTL">
+    <property role="TrG5h" value="ConsoleContext" />
+    <node concept="3clFb_" id="3MPHfSuPT3Y" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="getProject" />
+      <node concept="3uibUv" id="3ZgZ1njKpcr" role="3clF45">
+        <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+      </node>
+      <node concept="3Tm1VV" id="3MPHfSuPT41" role="1B3o_S" />
+      <node concept="3clFbS" id="3MPHfSuPT42" role="3clF47" />
+    </node>
+    <node concept="3clFb_" id="7L2VFB5mjvh" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="getOutputWindow" />
+      <node concept="3uibUv" id="1ycrhFMM_73" role="3clF45">
+        <ref role="3uigEE" node="4gO8Gruz$1J" resolve="BaseConsoleTab" />
+      </node>
+      <node concept="3Tm1VV" id="7L2VFB5mjvj" role="1B3o_S" />
+      <node concept="3clFbS" id="7L2VFB5mjvk" role="3clF47" />
+    </node>
+    <node concept="3Tm1VV" id="jysm2GDsTM" role="1B3o_S" />
+    <node concept="3uibUv" id="WMsS6mDoBi" role="3HQHJm">
+      <ref role="3uigEE" to="kxzb:1ycrhFMLI_B" resolve="QueryExecutionContext" />
+    </node>
+  </node>
+  <node concept="3HP615" id="5WpmwkrQPPk">
+    <property role="TrG5h" value="ConsoleStream" />
+    <node concept="3clFb_" id="5WpmwkrQPWC" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="addText" />
+      <node concept="3cqZAl" id="5WpmwkrQPWE" role="3clF45" />
+      <node concept="3Tm1VV" id="5WpmwkrQPWF" role="1B3o_S" />
+      <node concept="3clFbS" id="5WpmwkrQPWG" role="3clF47" />
+      <node concept="37vLTG" id="5WpmwkrRhDz" role="3clF46">
+        <property role="TrG5h" value="text" />
+        <node concept="17QB3L" id="3qGrMAJgU4I" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="3clFb_" id="7Jzw3XJWFQB" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="addNode" />
+      <node concept="3cqZAl" id="7Jzw3XJWFQC" role="3clF45" />
+      <node concept="3Tm1VV" id="7Jzw3XJWFQD" role="1B3o_S" />
+      <node concept="3clFbS" id="7Jzw3XJWFQE" role="3clF47" />
+      <node concept="37vLTG" id="7Jzw3XJWFQF" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="3qGrMAJgjsB" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="3clFb_" id="3ZgZ1njWRnh" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="addNodeRef" />
+      <node concept="3cqZAl" id="3ZgZ1njWRni" role="3clF45" />
+      <node concept="3Tm1VV" id="3ZgZ1njWRnj" role="1B3o_S" />
+      <node concept="3clFbS" id="3ZgZ1njWRnk" role="3clF47" />
+      <node concept="37vLTG" id="3ZgZ1njWRnl" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="3ZgZ1njWRnm" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="3clFb_" id="3ZgZ1njWQP3" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="addException" />
+      <node concept="3cqZAl" id="3ZgZ1njWQP4" role="3clF45" />
+      <node concept="3Tm1VV" id="3ZgZ1njWQP5" role="1B3o_S" />
+      <node concept="3clFbS" id="3ZgZ1njWQP6" role="3clF47" />
+      <node concept="37vLTG" id="3ZgZ1njWQP7" role="3clF46">
+        <property role="TrG5h" value="t" />
+        <node concept="3uibUv" id="3ZgZ1njWQWr" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="3ZgZ1njWQRY" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="addClosure" />
+      <node concept="37vLTG" id="6_TW7xVHjmt" role="3clF46">
+        <property role="TrG5h" value="closure" />
+        <node concept="1ajhzC" id="igjXyurl8w" role="1tU5fm">
+          <node concept="3cqZAl" id="igjXyurlrQ" role="1ajl9A" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1ycrhFMLQDe" role="3clF46">
+        <property role="TrG5h" value="text" />
+        <node concept="17QB3L" id="1ycrhFMLQDf" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="3ZgZ1njWQRZ" role="3clF45" />
+      <node concept="3Tm1VV" id="3ZgZ1njWQS0" role="1B3o_S" />
+      <node concept="3clFbS" id="3ZgZ1njWQS1" role="3clF47" />
+    </node>
+    <node concept="3clFb_" id="1ycrhFMNuOa" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="addSequence" />
+      <node concept="37vLTG" id="1ycrhFMNuTm" role="3clF46">
+        <property role="TrG5h" value="project" />
+        <node concept="3uibUv" id="1ycrhFMNuTn" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1ycrhFMNuTo" role="3clF46">
+        <property role="TrG5h" value="results" />
+        <node concept="1ajhzC" id="1ycrhFMNuTp" role="1tU5fm">
+          <node concept="3uibUv" id="1ycrhFMNuTq" role="1ajl9A">
+            <ref role="3uigEE" to="9erk:~SearchResults" resolve="SearchResults" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="1ycrhFMNuTr" role="3clF46">
+        <property role="TrG5h" value="resultsCount" />
+        <node concept="10Oyi0" id="1ycrhFMNuTs" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1ycrhFMNuTt" role="3clF46">
+        <property role="TrG5h" value="resultDescription" />
+        <node concept="17QB3L" id="1ycrhFMNuTu" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="1ycrhFMNuOg" role="3clF45" />
+      <node concept="3Tm1VV" id="1ycrhFMNuOh" role="1B3o_S" />
+      <node concept="3clFbS" id="1ycrhFMNuOi" role="3clF47" />
+    </node>
+    <node concept="3Tm1VV" id="5WpmwkrQPPl" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies
index 818d90733d7c..987002c5afb4 100644
--- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies
+++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies
@@ -23,6 +23,8 @@
     <classNode dependClassName="java.awt.event.KeyEvent" />
     <classNode dependClassName="java.awt.event.MouseEvent" />
     <classNode dependClassName="java.io.IOException" />
+    <classNode dependClassName="java.io.PrintWriter" />
+    <classNode dependClassName="java.io.StringWriter" />
     <classNode dependClassName="java.lang.Class" />
     <classNode dependClassName="java.lang.Exception" />
     <classNode dependClassName="java.lang.IllegalStateException" />
@@ -40,11 +42,15 @@
     <classNode dependClassName="java.util.Scanner" />
     <classNode dependClassName="javax.swing.KeyStroke" />
     <classNode dependClassName="jetbrains.mps.baseLanguage.closures.runtime.Wrappers" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes" />
+    <classNode dependClassName="jetbrains.mps.console.actions.ClosureHoldingNodeUtil" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleContext" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleFileEditor" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleStream" />
     <classNode dependClassName="jetbrains.mps.console.tool.ConsoleTool" />
+    <classNode dependClassName="jetbrains.mps.console.tool.ConsoleUtil" />
     <classNode dependClassName="jetbrains.mps.ide.datatransfer.SModelDataFlavor" />
+    <classNode dependClassName="jetbrains.mps.ide.findusages.model.SearchResults" />
     <classNode dependClassName="jetbrains.mps.ide.findusages.model.scopes.ProjectScope" />
     <classNode dependClassName="jetbrains.mps.ide.project.ProjectHelper" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.CollectionSequence" />
@@ -56,6 +62,7 @@
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SModelOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.EditorComponent" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.Highlighter" />
     <classNode dependClassName="jetbrains.mps.nodeEditor.UIEditorComponent" />
@@ -99,7 +106,7 @@
   <dependency className="jetbrains.mps.console.tool.ConsoleContext" file="ConsoleContext.java">
     <classNode dependClassName="jetbrains.mps.console.tool.BaseConsoleTab" />
     <classNode dependClassName="jetbrains.mps.project.Project" />
-    <classNode dependClassName="org.jetbrains.mps.openapi.module.SearchScope" />
+    <classNode extendsClassName="jetbrains.mps.smodel.query.QueryExecutionContext" />
   </dependency>
   <dependency className="jetbrains.mps.console.tool.ConsoleFileEditor" file="ConsoleFileEditor.java">
     <classNode dependClassName="com.intellij.codeHighlighting.BackgroundEditorHighlighter" />
@@ -127,6 +134,10 @@
   </dependency>
   <dependency className="jetbrains.mps.console.tool.ConsoleStream" file="ConsoleStream.java">
     <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="java.lang.Throwable" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes" />
+    <classNode dependClassName="jetbrains.mps.ide.findusages.model.SearchResults" />
+    <classNode dependClassName="jetbrains.mps.project.Project" />
     <classNode dependClassName="org.jetbrains.mps.openapi.model.SNode" />
   </dependency>
   <dependency className="jetbrains.mps.console.tool.ConsoleTab" file="ConsoleTab.java">
@@ -192,14 +203,19 @@
     <classNode extendsClassName="jetbrains.mps.ide.tools.BaseTabbedProjectTool" />
   </dependency>
   <dependency className="jetbrains.mps.console.tool.ConsoleUtil" file="ConsoleUtil.java">
+    <classNode dependClassName="com.intellij.openapi.project.Project" />
+    <classNode dependClassName="java.lang.Exception" />
     <classNode dependClassName="java.lang.InterruptedException" />
     <classNode dependClassName="java.lang.Override" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.concurrent.ExecutionException" />
     <classNode dependClassName="java.util.concurrent.Future" />
     <classNode dependClassName="javax.swing.SwingUtilities" />
-    <classNode dependClassName="jetbrains.mps.console.tool.ConsoleContext" />
+    <classNode dependClassName="jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes" />
+    <classNode dependClassName="jetbrains.mps.ide.findusages.model.SearchResults" />
+    <classNode dependClassName="jetbrains.mps.ide.findusages.view.UsagesViewTool" />
     <classNode dependClassName="jetbrains.mps.ide.messages.MessagesViewTool" />
+    <classNode dependClassName="jetbrains.mps.ide.project.ProjectHelper" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.Sequence" />
     <classNode dependClassName="jetbrains.mps.make.IMakeService" />
     <classNode dependClassName="jetbrains.mps.make.MakeSession" />
diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated
index 85e619ed6a70..a95955ed2e9f 100644
--- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated
+++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-7r5p80z41umzf908bvfr0u2xx70cqo5" />
+<dependencies version="2" modelHash="-eayzaanq5d99bfziqp9ooaf8mtkkma5" />
 
diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java
index 127be58e2340..4ff306c83227 100644
--- a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java
+++ b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java
@@ -65,6 +65,12 @@
 import org.jetbrains.mps.openapi.model.SReference;
 import jetbrains.mps.internal.collections.runtime.Sequence;
 import java.util.Scanner;
+import java.io.StringWriter;
+import java.io.PrintWriter;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
+import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes;
+import jetbrains.mps.console.actions.ClosureHoldingNodeUtil;
+import jetbrains.mps.ide.findusages.model.SearchResults;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.actionSystem.MouseShortcut;
 import java.awt.event.MouseEvent;
@@ -110,6 +116,11 @@ public ConsoleTool getConsoleTool() {
     return myTool;
   }
 
+  public void activate() {
+    getConsoleTool().getToolWindow().activate(null);
+    getConsoleTool().selectTab(this);
+  }
+
   protected void addBuiltInImports() {
     SLanguage base = MetaAdapterFactory.getLanguage(MetaIdFactory.langId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L), "jetbrains.mps.console.base");
     Collection<SLanguage> baseAndExtensions = new SLanguageHierarchy(Collections.singleton(base)).getExtending();
@@ -151,7 +162,7 @@ protected BaseAction registerShortcutSet(BaseAction a, ShortcutSet shortcutSet)
   }
 
   protected void createEditor() {
-    this.myEditor = new UIEditorComponent(check_6q36mf_a0a0a0a62(ProjectHelper.toMPSProject(myTool.getProject())), null) {
+    this.myEditor = new UIEditorComponent(check_6q36mf_a0a0a0a82(ProjectHelper.toMPSProject(myTool.getProject())), null) {
       @Nullable
       @Override
       public Object getData(@NonNls String key) {
@@ -159,7 +170,7 @@ public Object getData(@NonNls String key) {
           return myFileEditor;
         }
         if (PlatformDataKeys.PASTE_PROVIDER.is(key)) {
-          PasteProvider parentPasteProvider = as_6q36mf_a0a0a1a0a0a0a0ab(super.getData(key), PasteProvider.class);
+          PasteProvider parentPasteProvider = as_6q36mf_a0a0a1a0a0a0a0cb(super.getData(key), PasteProvider.class);
           return (myTool.getPasteAsRef() ? new BaseConsoleTab.MyPasteProvider(parentPasteProvider) : parentPasteProvider);
         }
         return super.getData(key);
@@ -228,8 +239,8 @@ public void run() {
           }
           EditorCell currentCell = myEditor.getSelectedCell();
           SRepository repository = getProject().getRepository();
-          SNode referenceTarget = check_6q36mf_a0e0a0a0a5lb(pastingNodeReference, repository);
-          if (referenceTarget != null && currentCell != null && !(check_6q36mf_a0a5a0a0a0f73(check_6q36mf_a0a0f0a0a0a5lb(pastingNodeReference), myModel))) {
+          SNode referenceTarget = check_6q36mf_a0e0a0a0a5nb(pastingNodeReference, repository);
+          if (referenceTarget != null && currentCell != null && !(check_6q36mf_a0a5a0a0a0f93(check_6q36mf_a0a0f0a0a0a5nb(pastingNodeReference), myModel))) {
             SNode refContainer = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x51132a123c89fa7eL, "jetbrains.mps.console.base.structure.PastedNodeReference")));
             SLinkOperations.setTarget(refContainer, MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x36ac6f29ae8c1fb5L, 0x4904fd89e74fc6fL, "target"), referenceTarget);
             NodePaster paster = new NodePaster(ListSequence.fromListAndArray(new ArrayList<SNode>(), refContainer));
@@ -240,7 +251,7 @@ public void run() {
             }
             TemporaryModels.getInstance().addMissingImports(myModel);
           } else {
-            check_6q36mf_a0a0f0a0a0a5lb_0(myDefaultPasteProvider, context);
+            check_6q36mf_a0a0f0a0a0a5nb_0(myDefaultPasteProvider, context);
           }
         }
       });
@@ -277,10 +288,10 @@ protected ConsoleContext getConsoleContext() {
       public Project getProject() {
         return ProjectHelper.toMPSProject(myTool.getProject());
       }
-      public SearchScope getDefaultSearchscope() {
+      public SearchScope getDefaultSearchScope() {
         return new ProjectScope(getProject());
       }
-      public BaseConsoleTab getConsoleTab() {
+      public BaseConsoleTab getOutputWindow() {
         return BaseConsoleTab.this;
       }
     };
@@ -320,7 +331,7 @@ public void addText(String text) {
         while (scanner.hasNextLine()) {
           String line = scanner.nextLine();
           if ((line != null && line.length() > 0)) {
-            ListSequence.fromList(SLinkOperations.getChildren(getLastReponse(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L, 0x4e3b035171b356edL, "item"))).addElement(createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a94(line));
+            ListSequence.fromList(SLinkOperations.getChildren(getLastReponse(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L, 0x4e3b035171b356edL, "item"))).addElement(createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a15(line));
           }
           if (scanner.hasNextLine() || text.charAt(text.length() - 1) == '\n') {
             SLinkOperations.addNewChild(getLastReponse(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L, 0x4e3b035171b356edL, "item"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35d30L, "jetbrains.mps.console.base.structure.NewLineResponseItem")));
@@ -331,6 +342,36 @@ public void addNode(SNode node) {
         addNodeImports(node);
         SLinkOperations.setTarget(SLinkOperations.addNewChild(getLastReponse(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L, 0x4e3b035171b356edL, "item"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c14L, "jetbrains.mps.console.base.structure.NodeResponseItem"))), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c14L, 0x4e3b035171b35c15L, "node"), node);
       }
+      public void addNodeRef(SNode target) {
+        SNode node = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bbb600cL, "jetbrains.mps.console.base.structure.NodeReferencePresentation")));
+        SLinkOperations.setTarget(node, MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x36ac6f29ae8c1fb5L, 0x4904fd89e74fc6fL, "target"), target);
+        addNode(node);
+      }
+      public void addException(Throwable t) {
+        StringWriter writer = new StringWriter();
+        t.printStackTrace(new PrintWriter(writer));
+        SNode exceptionHolder = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, "jetbrains.mps.console.base.structure.ExceptionHolder")));
+        SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace"), writer.toString());
+        SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L, 0x360b134fc047ce2aL, "text"), t.getClass().getName());
+        addNode(exceptionHolder);
+      }
+      public void addClosure(_FunctionTypes._void_P0_E0 closure, String text) {
+        SNode nodeWithClosure = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xf6d4d958ec2f2c6L, "jetbrains.mps.console.base.structure.NodeWithClosure")));
+        SPropertyOperations.set(nodeWithClosure, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L, 0x360b134fc047ce2aL, "text"), text);
+        ClosureHoldingNodeUtil.getInstance().register(nodeWithClosure, closure);
+        addNode(nodeWithClosure);
+      }
+      public void addSequence(final Project project, final _FunctionTypes._return_P0_E0<? extends SearchResults> results, int resultsCount, String resultDescription) {
+        if (resultsCount == 0) {
+          addText("empty sequence");
+        } else {
+          addClosure(new _FunctionTypes._void_P0_E0() {
+            public void invoke() {
+              ConsoleUtil.show(project, results);
+            }
+          }, resultsCount + " " + resultDescription);
+        }
+      }
     };
   }
 
@@ -377,7 +418,7 @@ public void run() {
     this.add(toolbarComponent, BorderLayout.WEST);
     this.add(myEditor.getExternalComponent(), BorderLayout.CENTER);
 
-    myHighlighter = check_6q36mf_a0o0gc(myTool.getProject());
+    myHighlighter = check_6q36mf_a0o0ic(myTool.getProject());
     myHighlighter.addAdditionalEditorComponent(myEditor);
   }
 
@@ -400,7 +441,7 @@ public void run() {
           public void run() {
             ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(myRoot, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bafL, "history")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL, 0x63da33792b5df49aL, "item"))).addElement(SNodeOperations.copyNode(SLinkOperations.getTarget(myRoot, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder"))));
             SNodeOperations.deleteNode(SLinkOperations.getTarget(SLinkOperations.getTarget(myRoot, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command")));
-            check_6q36mf_a2a0a0a0a0a2a0d0ic(executeBefore);
+            check_6q36mf_a2a0a0a0a0a2a0d0kc(executeBefore);
           }
         });
       }
@@ -409,7 +450,7 @@ public void run() {
         getProject().getModelAccess().executeCommand(new Runnable() {
           public void run() {
             SLinkOperations.setTarget(SLinkOperations.getTarget(myRoot, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command"), SLinkOperations.getTarget(typedCommand[0], MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command")));
-            check_6q36mf_a1a0a0a0a0a3a0d0ic(executeAfter);
+            check_6q36mf_a1a0a0a0a0a3a0d0kc(executeAfter);
           }
         });
       }
@@ -469,61 +510,61 @@ public void visit(SNode it) {
   }
 
   protected static Logger LOG = LogManager.getLogger(BaseConsoleTab.class);
-  private static SRepository check_6q36mf_a0a0a0a62(Project checkedDotOperand) {
+  private static SRepository check_6q36mf_a0a0a0a82(Project checkedDotOperand) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.getRepository();
     }
     return null;
   }
-  private static SNode check_6q36mf_a0e0a0a0a5lb(SNodeReference checkedDotOperand, SRepository repository) {
+  private static SNode check_6q36mf_a0e0a0a0a5nb(SNodeReference checkedDotOperand, SRepository repository) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.resolve(repository);
     }
     return null;
   }
-  private static boolean check_6q36mf_a0a5a0a0a0f73(SModelReference checkedDotOperand, SModel myModel) {
+  private static boolean check_6q36mf_a0a5a0a0a0f93(SModelReference checkedDotOperand, SModel myModel) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.equals(myModel.getReference());
     }
     return false;
   }
-  private static SModelReference check_6q36mf_a0a0f0a0a0a5lb(SNodeReference checkedDotOperand) {
+  private static SModelReference check_6q36mf_a0a0f0a0a0a5nb(SNodeReference checkedDotOperand) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.getModelReference();
     }
     return null;
   }
-  private static void check_6q36mf_a0a0f0a0a0a5lb_0(PasteProvider checkedDotOperand, DataContext context) {
+  private static void check_6q36mf_a0a0f0a0a0a5nb_0(PasteProvider checkedDotOperand, DataContext context) {
     if (null != checkedDotOperand) {
       checkedDotOperand.performPaste(context);
     }
 
   }
-  private static SNode createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a94(Object p0) {
+  private static SNode createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a15(Object p0) {
     PersistenceFacade facade = PersistenceFacade.getInstance();
     SNode n1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c38L, "jetbrains.mps.console.base.structure.TextResponseItem"), null, null, false);
     n1.setProperty(MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c38L, 0x4e3b035171b35d11L, "text"), p0 + "");
     return n1;
   }
-  private static Highlighter check_6q36mf_a0o0gc(com.intellij.openapi.project.Project checkedDotOperand) {
+  private static Highlighter check_6q36mf_a0o0ic(com.intellij.openapi.project.Project checkedDotOperand) {
     if (null != checkedDotOperand) {
       return checkedDotOperand.getComponent(Highlighter.class);
     }
     return null;
   }
-  private static void check_6q36mf_a2a0a0a0a0a2a0d0ic(Runnable checkedDotOperand) {
+  private static void check_6q36mf_a2a0a0a0a0a2a0d0kc(Runnable checkedDotOperand) {
     if (null != checkedDotOperand) {
       checkedDotOperand.run();
     }
 
   }
-  private static void check_6q36mf_a1a0a0a0a0a3a0d0ic(Runnable checkedDotOperand) {
+  private static void check_6q36mf_a1a0a0a0a0a3a0d0kc(Runnable checkedDotOperand) {
     if (null != checkedDotOperand) {
       checkedDotOperand.run();
     }
 
   }
-  private static <T> T as_6q36mf_a0a0a1a0a0a0a0ab(Object o, Class<T> type) {
+  private static <T> T as_6q36mf_a0a0a1a0a0a0a0cb(Object o, Class<T> type) {
     return (type.isInstance(o) ? (T) o : null);
   }
 }
diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java
index 4dad5ebaf69e..dcd9abfc08ca 100644
--- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java
+++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java
@@ -2,11 +2,10 @@
 
 /*Generated by MPS */
 
+import jetbrains.mps.smodel.query.QueryExecutionContext;
 import jetbrains.mps.project.Project;
-import org.jetbrains.mps.openapi.module.SearchScope;
 
-public interface ConsoleContext {
+public interface ConsoleContext extends QueryExecutionContext {
   public Project getProject();
-  public SearchScope getDefaultSearchscope();
-  public BaseConsoleTab getConsoleTab();
+  public BaseConsoleTab getOutputWindow();
 }
diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java
index 8a325c689b45..d4d86a9a8734 100644
--- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java
+++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java
@@ -3,8 +3,15 @@
 /*Generated by MPS */
 
 import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes;
+import jetbrains.mps.project.Project;
+import jetbrains.mps.ide.findusages.model.SearchResults;
 
 public interface ConsoleStream {
   public void addText(String text);
   public void addNode(SNode node);
+  public void addNodeRef(SNode node);
+  public void addException(Throwable t);
+  public void addClosure(_FunctionTypes._void_P0_E0 closure, String text);
+  public void addSequence(Project project, _FunctionTypes._return_P0_E0<? extends SearchResults> results, int resultsCount, String resultDescription);
 }
diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java
index 9bb149898c0f..936ee1e989d8 100644
--- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java
+++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java
@@ -23,15 +23,14 @@
 import jetbrains.mps.smodel.resources.ModelsToResources;
 import jetbrains.mps.internal.collections.runtime.Sequence;
 import java.util.concurrent.ExecutionException;
+import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes;
+import jetbrains.mps.ide.findusages.model.SearchResults;
+import jetbrains.mps.ide.project.ProjectHelper;
 import org.apache.log4j.Logger;
 import org.apache.log4j.LogManager;
+import jetbrains.mps.ide.findusages.view.UsagesViewTool;
 
 public class ConsoleUtil {
-
-  public static String getGeneratedModelName(ConsoleContext context) {
-    return context.getConsoleTab().getConsoleModel().getModelName() + ".Main";
-  }
-
   public static boolean make(final Project project, final SModel model) {
     if (SwingUtilities.isEventDispatchThread()) {
       if (LOG.isEnabledFor(Level.ERROR)) {
@@ -70,5 +69,20 @@ public <T extends IOption> T relayQuery(IQuery<T> query) {
     return false;
   }
 
+  public static void show(Project p, _FunctionTypes._return_P0_E0<? extends SearchResults> results) {
+    try {
+      check_xg48a4_a0a0a0c(ProjectHelper.toIdeaProject(p)).show(results.invoke(), "No results to show");
+    } catch (Exception e) {
+      if (LOG.isEnabledFor(Level.WARN)) {
+        LOG.warn("Exception in showing custom console result", e);
+      }
+    }
+  }
   protected static Logger LOG = LogManager.getLogger(ConsoleUtil.class);
+  private static UsagesViewTool check_xg48a4_a0a0a0c(com.intellij.openapi.project.Project checkedDotOperand) {
+    if (null != checkedDotOperand) {
+      return checkedDotOperand.getComponent(UsagesViewTool.class);
+    }
+    return null;
+  }
 }
diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info
index e3f703824100..5b48b97528c5 100644
--- a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info
+++ b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info
@@ -328,12 +328,10 @@
   <root nodeRef="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)/351968380915666545">
     <file name="ConsoleContext.java">
       <node id="4374601616592441598" at="9,0,10,0" concept="9" trace="getProject#()Ljetbrains/mps/project/Project;" />
-      <node id="3842191445091237663" at="10,0,11,0" concept="9" trace="getDefaultSearchscope#()Lorg/jetbrains/mps/openapi/module/SearchScope;" />
-      <node id="8953981490813286353" at="11,0,12,0" concept="9" trace="getConsoleTab#()Ljetbrains/mps/console/tool/BaseConsoleTab;" />
+      <node id="8953981490813286353" at="10,0,11,0" concept="9" trace="getOutputWindow#()Ljetbrains/mps/console/tool/BaseConsoleTab;" />
       <scope id="4374601616592441598" at="9,0,10,0" />
-      <scope id="3842191445091237663" at="10,0,11,0" />
-      <scope id="8953981490813286353" at="11,0,12,0" />
-      <unit id="351968380915666545" at="8,0,13,0" name="jetbrains.mps.console.tool.ConsoleContext" />
+      <scope id="8953981490813286353" at="10,0,11,0" />
+      <unit id="351968380915666545" at="8,0,12,0" name="jetbrains.mps.console.tool.ConsoleContext" />
     </file>
   </root>
   <root nodeRef="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)/4393777506305219687">
@@ -497,655 +495,735 @@
   </root>
   <root nodeRef="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)/4914591330900787311">
     <file name="BaseConsoleTab.java">
-      <node id="7538089231778086826" at="85,0,86,0" concept="6" trace="myTool" />
-      <node id="7538089231777681947" at="86,0,87,0" concept="6" trace="myModel" />
-      <node id="7538089231777681954" at="87,0,88,0" concept="6" trace="myRoot" />
-      <node id="4914591330902004696" at="88,0,89,0" concept="6" trace="myFileEditor" />
-      <node id="7538089231777681957" at="89,0,90,0" concept="6" trace="myEditor" />
-      <node id="4914591330902004700" at="90,0,91,0" concept="6" trace="myHighlighter" />
-      <node id="4914591330902004704" at="91,0,92,0" concept="6" trace="myTabTitle" />
-      <node id="8871522752922411326" at="93,28,94,22" concept="11" />
-      <node id="8971646171573192555" at="97,35,98,19" concept="11" />
-      <node id="773462683487751771" at="101,47,102,20" concept="11" />
-      <node id="773462683488968421" at="105,26,106,18" concept="11" />
-      <node id="3362819150777863543" at="109,39,110,18" concept="11" />
-      <node id="7538089231777682006" at="113,38,114,146" concept="10" />
-      <node id="7538089231777682010" at="114,146,115,113" concept="10" />
-      <node id="2971752488947190736" at="115,113,116,62" concept="10" />
-      <node id="7538089231777682035" at="117,78,118,35" concept="5" />
-      <node id="4214225063066303901" at="118,35,119,65" concept="10" />
-      <node id="4214225063066309895" at="120,37,121,17" concept="3" />
-      <node id="7538089231777682059" at="122,7,123,105" concept="5" />
-      <node id="7538089231777682074" at="123,105,124,105" concept="5" />
-      <node id="7538089231777682089" at="125,5,126,161" concept="5" />
-      <node id="2971752488947143030" at="129,36,130,60" concept="10" />
-      <node id="7538089231777682117" at="131,137,132,41" concept="5" />
-      <node id="7538089231777682139" at="134,129,135,47" concept="5" />
-      <node id="7538089231777682161" at="137,185,138,65" concept="5" />
-      <node id="7538089231777682182" at="139,5,140,24" concept="5" />
-      <node id="7538089231777682184" at="140,24,141,61" concept="5" />
-      <node id="7538089231777682540" at="144,67,145,106" concept="11" />
-      <node id="7538089231777682558" at="148,83,149,55" concept="5" />
-      <node id="7538089231777682564" at="149,55,150,13" concept="11" />
-      <node id="7538089231777682231" at="158,51,159,30" concept="11" />
-      <node id="3024471776891595059" at="161,54,162,114" concept="10" />
-      <node id="3024471776891774530" at="162,114,163,122" concept="11" />
-      <node id="7538089231777682250" at="164,9,165,34" concept="11" />
-      <node id="7538089231777682364" at="167,6,168,30" concept="5" />
-      <node id="7538089231777682690" at="172,39,173,124" concept="5" />
-      <node id="7538089231777682207" at="175,42,176,59" concept="5" />
-      <node id="7538089231777682209" at="177,7,178,13" concept="11" />
-      <node id="5364202125454758026" at="182,25,183,24" concept="5" />
-      <node id="7538089231777682714" at="189,31,190,29" concept="5" />
-      <node id="7538089231777682721" at="191,9,192,55" concept="5" />
-      <node id="7538089231777682726" at="194,7,195,60" concept="5" />
-      <node id="7538089231777683434" at="199,35,200,31" concept="15" />
-      <node id="7538089231777683449" at="202,76,203,177" concept="5" />
-      <node id="7538089231777683456" at="209,0,210,0" concept="6" trace="myDefaultPasteProvider" />
-      <node id="7538089231777683463" at="211,64,212,52" concept="5" />
-      <node id="7538089231777683483" at="217,27,218,53" concept="10" />
-      <node id="7538089231777683493" at="221,94,222,109" concept="5" />
-      <node id="7538089231777683510" at="223,15,224,20" concept="1" />
-      <node id="7538089231777683524" at="228,11,229,62" concept="10" />
-      <node id="8251307538231395334" at="229,62,230,64" concept="10" />
-      <node id="7538089231777683530" at="230,64,231,94" concept="10" />
-      <node id="7538089231777683539" at="232,156,233,255" concept="10" />
-      <node id="7538089231777683545" at="233,255,234,199" concept="5" />
-      <node id="7538089231777683552" at="234,199,235,116" concept="10" />
-      <node id="7538089231777683563" at="236,47,237,40" concept="5" />
-      <node id="7538089231777683580" at="238,80,239,66" concept="5" />
-      <node id="7538089231777683587" at="240,13,241,69" concept="5" />
-      <node id="7538089231777683612" at="242,18,243,75" concept="5" />
-      <node id="7538089231777683624" at="248,66,249,18" concept="11" />
-      <node id="7538089231777683633" at="251,65,252,18" concept="11" />
-      <node id="4914591330905910255" at="256,0,257,0" concept="9" trace="loadHistory#(Ljava/lang/String;)V" />
-      <node id="7538089231784120879" at="259,31,260,69" concept="10" />
-      <node id="7538089231784120889" at="263,13,264,117" concept="5" />
-      <node id="7538089231784120906" at="266,45,267,57" concept="5" />
-      <node id="7538089231784120909" at="271,7,272,24" concept="11" />
-      <node id="7538089231777682892" at="277,35,278,63" concept="11" />
-      <node id="1471632565003585563" at="280,50,281,46" concept="11" />
-      <node id="8971646171574058688" at="283,45,284,35" concept="11" />
-      <node id="2893936025728641226" at="289,36,290,537" concept="10" />
-      <node id="2893936025728641240" at="291,23,292,18" concept="11" />
-      <node id="2893936025728641242" at="293,5,294,516" concept="11" />
-      <node id="2971752488947184068" at="297,45,298,66" concept="10" />
-      <node id="4214225063065875703" at="298,66,299,73" concept="10" />
-      <node id="2971752488947196102" at="299,73,300,88" concept="10" />
-      <node id="7538089231777682980" at="301,129,302,66" concept="10" />
-      <node id="7538089231777682995" at="303,56,304,48" concept="5" />
-      <node id="7538089231777683032" at="306,92,307,88" concept="10" />
-      <node id="7538089231777683040" at="308,89,309,72" concept="5" />
-      <node id="7538089231777683050" at="309,72,310,133" concept="5" />
-      <node id="7538089231777682913" at="318,40,319,44" concept="10" />
-      <node id="7538089231777682921" at="320,39,321,43" concept="10" />
-      <node id="7538089231777682929" at="322,52,323,278" concept="5" />
-      <node id="7538089231777682944" at="325,80,326,378" concept="5" />
-      <node id="2893936025731410620" at="330,39,331,29" concept="5" />
-      <node id="7538089231777683086" at="331,29,332,535" concept="5" />
-      <node id="4914591330907811236" at="338,83,339,18" concept="5" />
-      <node id="4914591330907811240" at="339,18,340,23" concept="5" />
-      <node id="4914591330907811244" at="340,23,341,28" concept="5" />
-      <node id="7538089231777682492" at="344,60,345,135" concept="5" />
-      <node id="8251307538230822038" at="349,40,350,88" concept="10" />
-      <node id="8251307538230890014" at="351,29,352,88" concept="16" />
-      <node id="8251307538230499950" at="353,5,354,22" concept="11" />
-      <node id="4914591330904801215" at="359,25,360,29" concept="5" />
-      <node id="7538089231777682362" at="360,29,361,28" concept="5" />
-      <node id="3941329126770679131" at="361,28,362,29" concept="5" />
-      <node id="4914591330907671671" at="362,29,363,23" concept="5" />
-      <node id="7538089231777682356" at="363,23,364,55" concept="5" />
-      <node id="7538089231777682369" at="366,7,367,0" concept="12" />
-      <node id="7538089231777682375" at="367,0,368,39" concept="5" />
-      <node id="3976301908733013756" at="368,39,369,0" concept="12" />
-      <node id="3976301908733057463" at="369,0,370,0" concept="12" />
-      <node id="3976301908733039979" at="370,0,371,56" concept="10" />
-      <node id="3976301908733955771" at="371,56,372,27" concept="5" />
-      <node id="3976301908733040029" at="372,27,373,112" concept="10" />
-      <node id="3976301908733040039" at="373,112,374,61" concept="10" />
-      <node id="3976301908733040046" at="374,61,375,70" concept="5" />
-      <node id="3976301908733026737" at="375,70,376,0" concept="12" />
-      <node id="7538089231777682381" at="376,0,377,50" concept="5" />
-      <node id="7538089231777682412" at="377,50,378,67" concept="5" />
-      <node id="7538089231777682426" at="378,67,379,0" concept="12" />
-      <node id="7538089231777682427" at="379,0,380,61" concept="5" />
-      <node id="7538089231777682434" at="380,61,381,57" concept="5" />
-      <node id="7752629037608332873" at="384,133,385,27" concept="5" />
-      <node id="592665991632343035" at="385,27,386,46" concept="10" />
-      <node id="4110587197471394653" at="388,25,389,241" concept="5" />
-      <node id="2893936025731471144" at="390,30,391,34" concept="5" />
-      <node id="592665991632308142" at="391,34,392,545" concept="5" />
-      <node id="1740341680005292516" at="392,545,393,378" concept="5" />
-      <node id="7538089231777683104" at="400,29,401,574" concept="5" />
-      <node id="7538089231777683117" at="401,574,402,373" concept="5" />
-      <node id="2893936025731722750" at="402,373,403,59" concept="5" />
-      <node id="8251307538231050845" at="410,29,411,521" concept="5" />
-      <node id="8251307538231050857" at="411,521,412,58" concept="5" />
-      <node id="773462683489796046" at="423,29,424,46" concept="5" />
-      <node id="773462683489796065" at="424,46,425,58" concept="5" />
-      <node id="773462683489796071" at="425,58,426,91" concept="5" />
-      <node id="7752629037608246511" at="430,7,431,27" concept="5" />
-      <node id="4176612323165699204" at="436,11,437,147" concept="10" />
-      <node id="4176612323165161945" at="439,43,440,48" concept="11" />
-      <node id="4176612323166035575" at="444,233,445,247" concept="5" />
-      <node id="4176612323166333114" at="446,50,447,105" concept="5" />
-      <node id="4176612323166043767" at="449,20,450,39" concept="5" />
-      <node id="4176612323166310360" at="451,50,452,93" concept="5" />
-      <node id="4176612323165794620" at="456,11,457,33" concept="11" />
-      <node id="1036187445124522569" at="459,44,460,113" concept="5" />
-      <node id="9056261439947958023" at="463,44,464,60" concept="5" />
-      <node id="1036187445124812014" at="467,5,468,16" concept="11" />
-      <node id="4914591330900787311" at="471,0,472,0" concept="13" trace="LOG" />
-      <node id="2893936025727670284" at="473,36,474,47" concept="11" />
-      <node id="2893936025727670284" at="475,5,476,16" concept="11" />
-      <node id="7538089231777683533" at="479,36,480,51" concept="11" />
-      <node id="7538089231777683533" at="481,5,482,16" concept="11" />
-      <node id="7538089231777683601" at="485,36,486,62" concept="11" />
-      <node id="7538089231777683601" at="487,5,488,17" concept="11" />
-      <node id="7538089231777683602" at="491,36,492,51" concept="11" />
-      <node id="7538089231777683602" at="493,5,494,16" concept="11" />
-      <node id="3024471776889427731" at="497,36,498,46" concept="5" />
-      <node id="3024471776889427731" at="499,5,500,0" concept="12" />
-      <node id="48168216978432693" at="502,83,503,63" concept="10" />
-      <node id="48168216978432693" at="503,63,504,230" concept="10" />
-      <node id="48168216978432693" at="504,230,505,152" concept="0" />
-      <node id="48168216978432693" at="504,230,505,152" concept="5" />
-      <node id="48168216978432693" at="505,152,506,14" concept="11" />
-      <node id="7538089231777682430" at="509,36,510,63" concept="11" />
-      <node id="7538089231777682430" at="511,5,512,16" concept="11" />
-      <node id="2893936025732109408" at="515,36,516,30" concept="5" />
-      <node id="2893936025732109408" at="517,5,518,0" concept="12" />
-      <node id="8251307538231050858" at="521,36,522,30" concept="5" />
-      <node id="8251307538231050858" at="523,5,524,0" concept="12" />
-      <node id="3024471776891737930" at="526,76,527,47" concept="11" />
-      <node id="7538089231777683610" at="242,16,244,11" concept="0" />
-      <node id="8871522752922343330" at="93,0,96,0" concept="9" trace="getTitle#()Ljava/lang/String;" />
-      <node id="8971646171573043040" at="97,0,100,0" concept="9" trace="getConsoleModel#()Lorg/jetbrains/mps/openapi/model/SModel;" />
-      <node id="773462683487697955" at="101,0,104,0" concept="9" trace="getEditorComponent#()Ljetbrains/mps/nodeEditor/EditorComponent;" />
-      <node id="773462683488968419" at="105,0,108,0" concept="9" trace="getRoot#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3362819150777780943" at="109,0,112,0" concept="9" trace="getConsoleTool#()Ljetbrains/mps/console/tool/ConsoleTool;" />
-      <node id="4214225063066306497" at="119,65,122,7" concept="8" />
-      <node id="7538089231777682114" at="130,60,133,5" concept="7" />
-      <node id="7538089231777682136" at="133,5,136,5" concept="7" />
-      <node id="7538089231777682158" at="136,5,139,5" concept="7" />
-      <node id="7538089231777682538" at="144,0,147,0" concept="9" trace="registerKeyShortcut#(Ljetbrains/mps/workbench/action/BaseAction;I)Ljetbrains/mps/workbench/action/BaseAction;" />
-      <node id="7538089231777682229" at="157,49,160,9" concept="8" />
-      <node id="7538089231777682207" at="174,26,177,7" concept="0" />
-      <node id="7538089231777682207" at="174,26,177,7" concept="8" />
-      <node id="5364202125454715304" at="182,0,185,0" concept="9" trace="dispose#()V" />
-      <node id="7538089231777682712" at="188,25,191,9" concept="8" />
-      <node id="7538089231777683431" at="199,0,202,0" concept="2" trace="ExecuteClosureAction#()V" />
-      <node id="7538089231777683439" at="202,0,205,0" concept="9" trace="doExecute#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)V" />
-      <node id="7538089231777683460" at="211,0,214,0" concept="2" trace="MyPasteProvider#(Lcom/intellij/ide/PasteProvider;)V" />
-      <node id="7538089231777683491" at="220,90,223,15" concept="8" />
-      <node id="7538089231777683617" at="248,0,251,0" concept="9" trace="isPastePossible#(Lcom/intellij/openapi/actionSystem/DataContext;)Z" />
-      <node id="7538089231777683626" at="251,0,254,0" concept="9" trace="isPasteEnabled#(Lcom/intellij/openapi/actionSystem/DataContext;)Z" />
-      <node id="7538089231784120906" at="265,31,268,11" concept="0" />
-      <node id="7538089231784120906" at="265,31,268,11" concept="8" />
-      <node id="7538089231777682888" at="277,0,280,0" concept="9" trace="getProject#()Ljetbrains/mps/project/Project;" />
-      <node id="1471632565003333804" at="280,0,283,0" concept="9" trace="getDefaultSearchscope#()Lorg/jetbrains/mps/openapi/module/SearchScope;" />
-      <node id="7538089231777682897" at="283,0,286,0" concept="9" trace="getConsoleTab#()Ljetbrains/mps/console/tool/BaseConsoleTab;" />
-      <node id="2893936025728641235" at="290,537,293,5" concept="8" />
-      <node id="7538089231777682993" at="302,66,305,7" concept="8" />
-      <node id="7538089231777682927" at="321,43,324,11" concept="8" />
-      <node id="7538089231777682942" at="324,11,327,11" concept="8" />
-      <node id="3976301908733823576" at="344,0,347,0" concept="9" trace="registerActions#(Lcom/intellij/openapi/actionSystem/DefaultActionGroup;)V" />
-      <node id="8251307538230869628" at="350,88,353,5" concept="8" />
-      <node id="4176612323165936630" at="439,0,442,0" concept="9" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
-      <node id="4176612323166333114" at="445,247,448,15" concept="0" />
-      <node id="4176612323166333114" at="445,247,448,15" concept="8" />
-      <node id="4176612323166310360" at="450,39,453,15" concept="0" />
-      <node id="4176612323166310360" at="450,39,453,15" concept="8" />
-      <node id="1036187445124522569" at="458,36,461,9" concept="0" />
-      <node id="1036187445124522569" at="458,36,461,9" concept="8" />
-      <node id="9056261439947958023" at="462,29,465,9" concept="0" />
-      <node id="9056261439947958023" at="462,29,465,9" concept="8" />
-      <node id="2893936025727670284" at="472,80,475,5" concept="8" />
-      <node id="7538089231777683533" at="478,108,481,5" concept="8" />
-      <node id="7538089231777683601" at="484,104,487,5" concept="8" />
-      <node id="7538089231777683602" at="490,96,493,5" concept="8" />
-      <node id="3024471776889427731" at="496,107,499,5" concept="8" />
-      <node id="7538089231777682430" at="508,106,511,5" concept="8" />
-      <node id="2893936025732109408" at="514,83,517,5" concept="8" />
-      <node id="8251307538231050858" at="520,83,523,5" concept="8" />
-      <node id="3024471776891737930" at="526,0,529,0" concept="14" trace="as_6q36mf_a0a0a1a0a0a0a0ab#(Ljava/lang/Object;Ljava/lang/Class;)null" />
-      <node id="7538089231777682556" at="148,0,152,0" concept="9" trace="registerShortcutSet#(Ljetbrains/mps/workbench/action/BaseAction;Lcom/intellij/openapi/actionSystem/ShortcutSet;)Ljetbrains/mps/workbench/action/BaseAction;" />
-      <node id="7538089231777682237" at="160,9,164,9" concept="8" />
-      <node id="7538089231777683038" at="307,88,311,9" concept="8" />
-      <node id="7538089231777682967" at="330,0,334,0" concept="9" trace="addNode#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="8251307538231048899" at="410,0,414,0" concept="9" trace="run#()V" />
-      <node id="7538089231777683561" at="235,116,240,13" concept="8" />
-      <node id="4914591330907811233" at="338,0,343,0" concept="2" trace="BaseConsoleTab#(Ljetbrains/mps/console/tool/ConsoleTool;Ljava/lang/String;Ljava/lang/String;)V" />
-      <node id="592665991632297311" at="389,241,394,9" concept="8" />
-      <node id="8251307538231043755" at="400,0,405,0" concept="9" trace="run#()V" />
-      <node id="9008866792797021915" at="423,0,428,0" concept="9" trace="run#()V" />
-      <node id="4176612323166042694" at="449,18,454,13" concept="0" />
-      <node id="7538089231777682205" at="173,124,179,5" concept="8" />
-      <node id="8251307538231257695" at="188,0,194,0" concept="9" trace="run#()V" />
-      <node id="7538089231777683489" at="219,15,225,13" concept="7" />
-      <node id="8251307538231048893" at="408,25,414,11" concept="5" />
-      <node id="2893936025727670284" at="472,0,478,0" concept="14" trace="check_6q36mf_a0a0a0a62#(Ljetbrains/mps/project/Project;)Lorg/jetbrains/mps/openapi/module/SRepository;" />
-      <node id="7538089231777683533" at="478,0,484,0" concept="14" trace="check_6q36mf_a0e0a0a0a5lb#(Lorg/jetbrains/mps/openapi/model/SNodeReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7538089231777683601" at="484,0,490,0" concept="14" trace="check_6q36mf_a0a5a0a0a0f73#(Lorg/jetbrains/mps/openapi/model/SModelReference;Lorg/jetbrains/mps/openapi/model/SModel;)Z" />
-      <node id="7538089231777683602" at="490,0,496,0" concept="14" trace="check_6q36mf_a0a0f0a0a0a5lb#(Lorg/jetbrains/mps/openapi/model/SNodeReference;)Lorg/jetbrains/mps/openapi/model/SModelReference;" />
-      <node id="3024471776889427731" at="496,0,502,0" concept="14" trace="check_6q36mf_a0a0f0a0a0a5lb_0#(Lcom/intellij/ide/PasteProvider;Lcom/intellij/openapi/actionSystem/DataContext;)V" />
-      <node id="48168216978432693" at="502,0,508,0" concept="14" trace="createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a94#(Ljava/lang/Object;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7538089231777682430" at="508,0,514,0" concept="14" trace="check_6q36mf_a0o0gc#(Lcom/intellij/openapi/project/Project;)Ljetbrains/mps/nodeEditor/Highlighter;" />
-      <node id="2893936025732109408" at="514,0,520,0" concept="14" trace="check_6q36mf_a2a0a0a0a0a2a0d0ic#(Ljava/lang/Runnable;)V" />
-      <node id="8251307538231050858" at="520,0,526,0" concept="14" trace="check_6q36mf_a1a0a0a0a0a3a0d0ic#(Ljava/lang/Runnable;)V" />
-      <node id="7538089231784120887" at="262,25,269,9" concept="17" />
-      <node id="2893936025728641224" at="289,0,296,0" concept="9" trace="getLastReponse#()Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7538089231777683026" at="305,7,312,7" concept="7" />
-      <node id="8251307538231026807" at="359,0,366,0" concept="9" trace="run#()V" />
-      <node id="8251307538231043748" at="398,25,405,11" concept="5" />
-      <node id="9008866792797021913" at="421,25,428,11" concept="5" />
-      <node id="8251307538231249630" at="186,35,194,7" concept="5" />
-      <node id="8251307538230481484" at="348,0,356,0" concept="9" trace="getProject#()Ljetbrains/mps/project/Project;" />
-      <node id="8251307538231034266" at="388,0,396,0" concept="9" trace="run#()V" />
-      <node id="7287617939140904241" at="408,0,416,0" concept="9" trace="run#()V" />
-      <node id="7538089231777682018" at="116,62,125,5" concept="7" />
-      <node id="4914591330904584345" at="172,0,181,0" concept="9" trace="createConsoleModel#()V" />
-      <node id="7538089231784120885" at="262,0,271,0" concept="9" trace="run#()V" />
-      <node id="7538089231777682919" at="319,44,328,9" concept="18" />
-      <node id="8251307538231010551" at="357,65,366,7" concept="5" />
-      <node id="7287617939140817023" at="398,0,407,0" concept="9" trace="run#()V" />
-      <node id="9008866792796992719" at="421,0,430,0" concept="9" trace="run#()V" />
-      <node id="7538089231777683487" at="218,53,228,11" concept="17" />
-      <node id="8251307538231034259" at="386,46,396,7" concept="5" />
-      <node id="7538089231777682705" at="186,0,197,0" concept="9" trace="disposeConsoleTab#()V" />
-      <node id="7538089231784120884" at="260,69,271,7" concept="5" />
-      <node id="4914591330906548518" at="275,48,286,6" concept="11" />
-      <node id="9008866792796723747" at="419,52,430,7" concept="5" />
-      <node id="4176612323166027630" at="443,39,454,13" concept="8" />
-      <node id="7538089231777682221" at="155,0,167,0" concept="9" trace="getData#(Ljava/lang/String;)Ljava/lang/Object;" />
-      <node id="7538089231777682907" at="318,0,330,0" concept="9" trace="addText#(Ljava/lang/String;)V" />
-      <node id="7538089231777683537" at="231,94,244,11" concept="8" />
-      <node id="4914591330906414829" at="275,0,288,0" concept="9" trace="getConsoleContext#()Ljetbrains/mps/console/tool/ConsoleContext;" />
-      <node id="7538089231777682973" at="300,88,313,5" concept="7" />
-      <node id="4176612323166022616" at="443,0,456,0" concept="9" trace="visit#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7538089231777682112" at="129,0,143,0" concept="9" trace="validateImports#()V" />
-      <node id="7538089231777682216" at="153,33,167,6" concept="5" />
-      <node id="7752629037608769343" at="419,0,433,0" concept="9" trace="selectNode#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="7538089231777682004" at="113,0,128,0" concept="9" trace="addBuiltInImports#()V" />
-      <node id="7538089231784120874" at="258,0,274,0" concept="9" trace="saveHistory#()Ljava/lang/String;" />
-      <node id="4914591330907522709" at="153,0,170,0" concept="9" trace="createEditor#()V" />
-      <node id="2893936025731234515" at="297,0,315,0" concept="9" trace="addNodeImports#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <node id="4914591330906818579" at="316,43,334,6" concept="11" />
-      <node id="4176612323165894334" at="437,147,456,11" concept="5" />
-      <node id="4914591330906788048" at="316,0,336,0" concept="9" trace="getConsoleStream#()Ljetbrains/mps/console/tool/ConsoleStream;" />
-      <node id="7538089231777682881" at="396,7,416,8" concept="5" />
-      <node id="7538089231777682192" at="357,0,383,0" concept="9" trace="initConsoleTab#(Ljava/lang/String;)V" />
-      <node id="8251307538231340516" at="217,0,246,0" concept="9" trace="run#()V" />
-      <node id="8251307538231322534" at="215,66,246,9" concept="5" />
-      <node id="9056261439947806043" at="435,24,466,7" concept="17" />
-      <node id="7538089231777683473" at="215,0,248,0" concept="9" trace="performPaste#(Lcom/intellij/openapi/actionSystem/DataContext;)V" />
-      <node id="7538089231777683723" at="434,51,467,5" concept="8" />
-      <node id="2893936025730044886" at="384,0,418,0" concept="9" trace="execute#(Lorg/jetbrains/mps/openapi/model/SNode;Ljava/lang/Runnable;Ljava/lang/Runnable;)V" />
-      <node id="4176612323165356804" at="434,0,470,0" concept="9" trace="loadHistoryModel#(Ljava/lang/String;)Lorg/jetbrains/mps/openapi/model/SModel;" />
-      <scope id="7538089231777683516" at="226,0,226,56">
+      <node id="7538089231778086826" at="91,0,92,0" concept="6" trace="myTool" />
+      <node id="7538089231777681947" at="92,0,93,0" concept="6" trace="myModel" />
+      <node id="7538089231777681954" at="93,0,94,0" concept="6" trace="myRoot" />
+      <node id="4914591330902004696" at="94,0,95,0" concept="6" trace="myFileEditor" />
+      <node id="7538089231777681957" at="95,0,96,0" concept="6" trace="myEditor" />
+      <node id="4914591330902004700" at="96,0,97,0" concept="6" trace="myHighlighter" />
+      <node id="4914591330902004704" at="97,0,98,0" concept="6" trace="myTabTitle" />
+      <node id="8871522752922411326" at="99,28,100,22" concept="11" />
+      <node id="8971646171573192555" at="103,35,104,19" concept="11" />
+      <node id="773462683487751771" at="107,47,108,20" concept="11" />
+      <node id="773462683488968421" at="111,26,112,18" concept="11" />
+      <node id="3362819150777863543" at="115,39,116,18" concept="11" />
+      <node id="4598452390224192885" at="119,26,120,52" concept="5" />
+      <node id="4598452390224207256" at="120,52,121,37" concept="5" />
+      <node id="7538089231777682006" at="124,38,125,146" concept="10" />
+      <node id="7538089231777682010" at="125,146,126,113" concept="10" />
+      <node id="2971752488947190736" at="126,113,127,62" concept="10" />
+      <node id="7538089231777682035" at="128,78,129,35" concept="5" />
+      <node id="4214225063066303901" at="129,35,130,65" concept="10" />
+      <node id="4214225063066309895" at="131,37,132,17" concept="3" />
+      <node id="7538089231777682059" at="133,7,134,105" concept="5" />
+      <node id="7538089231777682074" at="134,105,135,105" concept="5" />
+      <node id="7538089231777682089" at="136,5,137,161" concept="5" />
+      <node id="2971752488947143030" at="140,36,141,60" concept="10" />
+      <node id="7538089231777682117" at="142,137,143,41" concept="5" />
+      <node id="7538089231777682139" at="145,129,146,47" concept="5" />
+      <node id="7538089231777682161" at="148,185,149,65" concept="5" />
+      <node id="7538089231777682182" at="150,5,151,24" concept="5" />
+      <node id="7538089231777682184" at="151,24,152,61" concept="5" />
+      <node id="7538089231777682540" at="155,67,156,106" concept="11" />
+      <node id="7538089231777682558" at="159,83,160,55" concept="5" />
+      <node id="7538089231777682564" at="160,55,161,13" concept="11" />
+      <node id="7538089231777682231" at="169,51,170,30" concept="11" />
+      <node id="3024471776891595059" at="172,54,173,114" concept="10" />
+      <node id="3024471776891774530" at="173,114,174,122" concept="11" />
+      <node id="7538089231777682250" at="175,9,176,34" concept="11" />
+      <node id="7538089231777682364" at="178,6,179,30" concept="5" />
+      <node id="7538089231777682690" at="183,39,184,124" concept="5" />
+      <node id="7538089231777682207" at="186,42,187,59" concept="5" />
+      <node id="7538089231777682209" at="188,7,189,13" concept="11" />
+      <node id="5364202125454758026" at="193,25,194,24" concept="5" />
+      <node id="7538089231777682714" at="200,31,201,29" concept="5" />
+      <node id="7538089231777682721" at="202,9,203,55" concept="5" />
+      <node id="7538089231777682726" at="205,7,206,60" concept="5" />
+      <node id="7538089231777683434" at="210,35,211,31" concept="15" />
+      <node id="7538089231777683449" at="213,76,214,177" concept="5" />
+      <node id="7538089231777683456" at="220,0,221,0" concept="6" trace="myDefaultPasteProvider" />
+      <node id="7538089231777683463" at="222,64,223,52" concept="5" />
+      <node id="7538089231777683483" at="228,27,229,53" concept="10" />
+      <node id="7538089231777683493" at="232,94,233,109" concept="5" />
+      <node id="7538089231777683510" at="234,15,235,20" concept="1" />
+      <node id="7538089231777683524" at="239,11,240,62" concept="10" />
+      <node id="8251307538231395334" at="240,62,241,64" concept="10" />
+      <node id="7538089231777683530" at="241,64,242,94" concept="10" />
+      <node id="7538089231777683539" at="243,156,244,255" concept="10" />
+      <node id="7538089231777683545" at="244,255,245,199" concept="5" />
+      <node id="7538089231777683552" at="245,199,246,116" concept="10" />
+      <node id="7538089231777683563" at="247,47,248,40" concept="5" />
+      <node id="7538089231777683580" at="249,80,250,66" concept="5" />
+      <node id="7538089231777683587" at="251,13,252,69" concept="5" />
+      <node id="7538089231777683612" at="253,18,254,75" concept="5" />
+      <node id="7538089231777683624" at="259,66,260,18" concept="11" />
+      <node id="7538089231777683633" at="262,65,263,18" concept="11" />
+      <node id="4914591330905910255" at="267,0,268,0" concept="9" trace="loadHistory#(Ljava/lang/String;)V" />
+      <node id="7538089231784120879" at="270,31,271,69" concept="10" />
+      <node id="7538089231784120889" at="274,13,275,117" concept="5" />
+      <node id="7538089231784120906" at="277,45,278,57" concept="5" />
+      <node id="7538089231784120909" at="282,7,283,24" concept="11" />
+      <node id="7538089231777682892" at="288,35,289,63" concept="11" />
+      <node id="1471632565003585563" at="291,50,292,46" concept="11" />
+      <node id="8971646171574058688" at="294,47,295,35" concept="11" />
+      <node id="2893936025728641226" at="300,36,301,537" concept="10" />
+      <node id="2893936025728641240" at="302,23,303,18" concept="11" />
+      <node id="2893936025728641242" at="304,5,305,516" concept="11" />
+      <node id="2971752488947184068" at="308,45,309,66" concept="10" />
+      <node id="4214225063065875703" at="309,66,310,73" concept="10" />
+      <node id="2971752488947196102" at="310,73,311,88" concept="10" />
+      <node id="7538089231777682980" at="312,129,313,66" concept="10" />
+      <node id="7538089231777682995" at="314,56,315,48" concept="5" />
+      <node id="7538089231777683032" at="317,92,318,88" concept="10" />
+      <node id="7538089231777683040" at="319,89,320,72" concept="5" />
+      <node id="7538089231777683050" at="320,72,321,133" concept="5" />
+      <node id="7538089231777682913" at="329,40,330,44" concept="10" />
+      <node id="7538089231777682921" at="331,39,332,43" concept="10" />
+      <node id="7538089231777682929" at="333,52,334,278" concept="5" />
+      <node id="7538089231777682944" at="336,80,337,378" concept="5" />
+      <node id="2893936025731410620" at="341,39,342,29" concept="5" />
+      <node id="7538089231777683086" at="342,29,343,535" concept="5" />
+      <node id="2348043250037290191" at="345,44,346,249" concept="10" />
+      <node id="2348043250038028746" at="346,249,347,178" concept="5" />
+      <node id="4598452390225789587" at="347,178,348,22" concept="5" />
+      <node id="6558068108107683969" at="350,45,351,49" concept="10" />
+      <node id="6558068108107683974" at="351,49,352,51" concept="5" />
+      <node id="6558068108108370769" at="352,51,353,250" concept="10" />
+      <node id="6558068108108373959" at="353,250,354,198" concept="5" />
+      <node id="6558068108108580762" at="354,198,355,197" concept="5" />
+      <node id="4598452390225834124" at="355,197,356,33" concept="5" />
+      <node id="7600370246423004420" at="358,79,359,249" concept="10" />
+      <node id="7600370246423004426" at="359,249,360,179" concept="5" />
+      <node id="7600370246423004437" at="360,179,361,80" concept="5" />
+      <node id="4598452390225772476" at="361,80,362,33" concept="5" />
+      <node id="1768908716159910573" at="365,32,366,36" concept="5" />
+      <node id="7600370246426903881" at="369,34,370,49" concept="5" />
+      <node id="4914591330907811236" at="379,83,380,18" concept="5" />
+      <node id="4914591330907811240" at="380,18,381,23" concept="5" />
+      <node id="4914591330907811244" at="381,23,382,28" concept="5" />
+      <node id="7538089231777682492" at="385,60,386,135" concept="5" />
+      <node id="8251307538230822038" at="390,40,391,88" concept="10" />
+      <node id="8251307538230890014" at="392,29,393,88" concept="16" />
+      <node id="8251307538230499950" at="394,5,395,22" concept="11" />
+      <node id="4914591330904801215" at="400,25,401,29" concept="5" />
+      <node id="7538089231777682362" at="401,29,402,28" concept="5" />
+      <node id="3941329126770679131" at="402,28,403,29" concept="5" />
+      <node id="4914591330907671671" at="403,29,404,23" concept="5" />
+      <node id="7538089231777682356" at="404,23,405,55" concept="5" />
+      <node id="7538089231777682369" at="407,7,408,0" concept="12" />
+      <node id="7538089231777682375" at="408,0,409,39" concept="5" />
+      <node id="3976301908733013756" at="409,39,410,0" concept="12" />
+      <node id="3976301908733057463" at="410,0,411,0" concept="12" />
+      <node id="3976301908733039979" at="411,0,412,56" concept="10" />
+      <node id="3976301908733955771" at="412,56,413,27" concept="5" />
+      <node id="3976301908733040029" at="413,27,414,112" concept="10" />
+      <node id="3976301908733040039" at="414,112,415,61" concept="10" />
+      <node id="3976301908733040046" at="415,61,416,70" concept="5" />
+      <node id="3976301908733026737" at="416,70,417,0" concept="12" />
+      <node id="7538089231777682381" at="417,0,418,50" concept="5" />
+      <node id="7538089231777682412" at="418,50,419,67" concept="5" />
+      <node id="7538089231777682426" at="419,67,420,0" concept="12" />
+      <node id="7538089231777682427" at="420,0,421,61" concept="5" />
+      <node id="7538089231777682434" at="421,61,422,57" concept="5" />
+      <node id="7752629037608332873" at="425,133,426,27" concept="5" />
+      <node id="592665991632343035" at="426,27,427,46" concept="10" />
+      <node id="4110587197471394653" at="429,25,430,241" concept="5" />
+      <node id="2893936025731471144" at="431,30,432,34" concept="5" />
+      <node id="592665991632308142" at="432,34,433,545" concept="5" />
+      <node id="1740341680005292516" at="433,545,434,378" concept="5" />
+      <node id="7538089231777683104" at="441,29,442,574" concept="5" />
+      <node id="7538089231777683117" at="442,574,443,373" concept="5" />
+      <node id="2893936025731722750" at="443,373,444,59" concept="5" />
+      <node id="8251307538231050845" at="451,29,452,521" concept="5" />
+      <node id="8251307538231050857" at="452,521,453,58" concept="5" />
+      <node id="773462683489796046" at="464,29,465,46" concept="5" />
+      <node id="773462683489796065" at="465,46,466,58" concept="5" />
+      <node id="773462683489796071" at="466,58,467,91" concept="5" />
+      <node id="7752629037608246511" at="471,7,472,27" concept="5" />
+      <node id="4176612323165699204" at="477,11,478,147" concept="10" />
+      <node id="4176612323165161945" at="480,43,481,48" concept="11" />
+      <node id="4176612323166035575" at="485,233,486,247" concept="5" />
+      <node id="4176612323166333114" at="487,50,488,105" concept="5" />
+      <node id="4176612323166043767" at="490,20,491,39" concept="5" />
+      <node id="4176612323166310360" at="492,50,493,93" concept="5" />
+      <node id="4176612323165794620" at="497,11,498,33" concept="11" />
+      <node id="1036187445124522569" at="500,44,501,113" concept="5" />
+      <node id="9056261439947958023" at="504,44,505,60" concept="5" />
+      <node id="1036187445124812014" at="508,5,509,16" concept="11" />
+      <node id="4914591330900787311" at="512,0,513,0" concept="13" trace="LOG" />
+      <node id="2893936025727670284" at="514,36,515,47" concept="11" />
+      <node id="2893936025727670284" at="516,5,517,16" concept="11" />
+      <node id="7538089231777683533" at="520,36,521,51" concept="11" />
+      <node id="7538089231777683533" at="522,5,523,16" concept="11" />
+      <node id="7538089231777683601" at="526,36,527,62" concept="11" />
+      <node id="7538089231777683601" at="528,5,529,17" concept="11" />
+      <node id="7538089231777683602" at="532,36,533,51" concept="11" />
+      <node id="7538089231777683602" at="534,5,535,16" concept="11" />
+      <node id="3024471776889427731" at="538,36,539,46" concept="5" />
+      <node id="3024471776889427731" at="540,5,541,0" concept="12" />
+      <node id="48168216978432693" at="543,83,544,63" concept="10" />
+      <node id="48168216978432693" at="544,63,545,230" concept="10" />
+      <node id="48168216978432693" at="545,230,546,152" concept="0" />
+      <node id="48168216978432693" at="545,230,546,152" concept="5" />
+      <node id="48168216978432693" at="546,152,547,14" concept="11" />
+      <node id="7538089231777682430" at="550,36,551,63" concept="11" />
+      <node id="7538089231777682430" at="552,5,553,16" concept="11" />
+      <node id="2893936025732109408" at="556,36,557,30" concept="5" />
+      <node id="2893936025732109408" at="558,5,559,0" concept="12" />
+      <node id="8251307538231050858" at="562,36,563,30" concept="5" />
+      <node id="8251307538231050858" at="564,5,565,0" concept="12" />
+      <node id="3024471776891737930" at="567,76,568,47" concept="11" />
+      <node id="7538089231777683610" at="253,16,255,11" concept="0" />
+      <node id="8871522752922343330" at="99,0,102,0" concept="9" trace="getTitle#()Ljava/lang/String;" />
+      <node id="8971646171573043040" at="103,0,106,0" concept="9" trace="getConsoleModel#()Lorg/jetbrains/mps/openapi/model/SModel;" />
+      <node id="773462683487697955" at="107,0,110,0" concept="9" trace="getEditorComponent#()Ljetbrains/mps/nodeEditor/EditorComponent;" />
+      <node id="773462683488968419" at="111,0,114,0" concept="9" trace="getRoot#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3362819150777780943" at="115,0,118,0" concept="9" trace="getConsoleTool#()Ljetbrains/mps/console/tool/ConsoleTool;" />
+      <node id="4214225063066306497" at="130,65,133,7" concept="8" />
+      <node id="7538089231777682114" at="141,60,144,5" concept="7" />
+      <node id="7538089231777682136" at="144,5,147,5" concept="7" />
+      <node id="7538089231777682158" at="147,5,150,5" concept="7" />
+      <node id="7538089231777682538" at="155,0,158,0" concept="9" trace="registerKeyShortcut#(Ljetbrains/mps/workbench/action/BaseAction;I)Ljetbrains/mps/workbench/action/BaseAction;" />
+      <node id="7538089231777682229" at="168,49,171,9" concept="8" />
+      <node id="7538089231777682207" at="185,26,188,7" concept="0" />
+      <node id="7538089231777682207" at="185,26,188,7" concept="8" />
+      <node id="5364202125454715304" at="193,0,196,0" concept="9" trace="dispose#()V" />
+      <node id="7538089231777682712" at="199,25,202,9" concept="8" />
+      <node id="7538089231777683431" at="210,0,213,0" concept="2" trace="ExecuteClosureAction#()V" />
+      <node id="7538089231777683439" at="213,0,216,0" concept="9" trace="doExecute#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)V" />
+      <node id="7538089231777683460" at="222,0,225,0" concept="2" trace="MyPasteProvider#(Lcom/intellij/ide/PasteProvider;)V" />
+      <node id="7538089231777683491" at="231,90,234,15" concept="8" />
+      <node id="7538089231777683617" at="259,0,262,0" concept="9" trace="isPastePossible#(Lcom/intellij/openapi/actionSystem/DataContext;)Z" />
+      <node id="7538089231777683626" at="262,0,265,0" concept="9" trace="isPasteEnabled#(Lcom/intellij/openapi/actionSystem/DataContext;)Z" />
+      <node id="7538089231784120906" at="276,31,279,11" concept="0" />
+      <node id="7538089231784120906" at="276,31,279,11" concept="8" />
+      <node id="7538089231777682888" at="288,0,291,0" concept="9" trace="getProject#()Ljetbrains/mps/project/Project;" />
+      <node id="1471632565003333804" at="291,0,294,0" concept="9" trace="getDefaultSearchScope#()Lorg/jetbrains/mps/openapi/module/SearchScope;" />
+      <node id="4598452390224495818" at="294,0,297,0" concept="9" trace="getOutputWindow#()Ljetbrains/mps/console/tool/BaseConsoleTab;" />
+      <node id="2893936025728641235" at="301,537,304,5" concept="8" />
+      <node id="7538089231777682993" at="313,66,316,7" concept="8" />
+      <node id="7538089231777682927" at="332,43,335,11" concept="8" />
+      <node id="7538089231777682942" at="335,11,338,11" concept="8" />
+      <node id="328850564587494307" at="369,0,372,0" concept="9" trace="invoke#()V" />
+      <node id="3976301908733823576" at="385,0,388,0" concept="9" trace="registerActions#(Lcom/intellij/openapi/actionSystem/DefaultActionGroup;)V" />
+      <node id="8251307538230869628" at="391,88,394,5" concept="8" />
+      <node id="4176612323165936630" at="480,0,483,0" concept="9" trace="accept#(Lorg/jetbrains/mps/openapi/model/SNode;)Z" />
+      <node id="4176612323166333114" at="486,247,489,15" concept="0" />
+      <node id="4176612323166333114" at="486,247,489,15" concept="8" />
+      <node id="4176612323166310360" at="491,39,494,15" concept="0" />
+      <node id="4176612323166310360" at="491,39,494,15" concept="8" />
+      <node id="1036187445124522569" at="499,36,502,9" concept="0" />
+      <node id="1036187445124522569" at="499,36,502,9" concept="8" />
+      <node id="9056261439947958023" at="503,29,506,9" concept="0" />
+      <node id="9056261439947958023" at="503,29,506,9" concept="8" />
+      <node id="2893936025727670284" at="513,80,516,5" concept="8" />
+      <node id="7538089231777683533" at="519,108,522,5" concept="8" />
+      <node id="7538089231777683601" at="525,104,528,5" concept="8" />
+      <node id="7538089231777683602" at="531,96,534,5" concept="8" />
+      <node id="3024471776889427731" at="537,107,540,5" concept="8" />
+      <node id="7538089231777682430" at="549,106,552,5" concept="8" />
+      <node id="2893936025732109408" at="555,83,558,5" concept="8" />
+      <node id="8251307538231050858" at="561,83,564,5" concept="8" />
+      <node id="3024471776891737930" at="567,0,570,0" concept="14" trace="as_6q36mf_a0a0a1a0a0a0a0cb#(Ljava/lang/Object;Ljava/lang/Class;)null" />
+      <node id="4598452390224162839" at="119,0,123,0" concept="9" trace="activate#()V" />
+      <node id="7538089231777682556" at="159,0,163,0" concept="9" trace="registerShortcutSet#(Ljetbrains/mps/workbench/action/BaseAction;Lcom/intellij/openapi/actionSystem/ShortcutSet;)Ljetbrains/mps/workbench/action/BaseAction;" />
+      <node id="7538089231777682237" at="171,9,175,9" concept="8" />
+      <node id="7538089231777683038" at="318,88,322,9" concept="8" />
+      <node id="7538089231777682967" at="341,0,345,0" concept="9" trace="addNode#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="8251307538231048899" at="451,0,455,0" concept="9" trace="run#()V" />
+      <node id="7538089231777683561" at="246,116,251,13" concept="8" />
+      <node id="4598452390225752486" at="345,0,350,0" concept="9" trace="addNodeRef#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="1768908716159919118" at="367,16,372,53" concept="5" />
+      <node id="4914591330907811233" at="379,0,384,0" concept="2" trace="BaseConsoleTab#(Ljetbrains/mps/console/tool/ConsoleTool;Ljava/lang/String;Ljava/lang/String;)V" />
+      <node id="592665991632297311" at="430,241,435,9" concept="8" />
+      <node id="8251307538231043755" at="441,0,446,0" concept="9" trace="run#()V" />
+      <node id="9008866792797021915" at="464,0,469,0" concept="9" trace="run#()V" />
+      <node id="4176612323166042694" at="490,18,495,13" concept="0" />
+      <node id="7538089231777682205" at="184,124,190,5" concept="8" />
+      <node id="8251307538231257695" at="199,0,205,0" concept="9" trace="run#()V" />
+      <node id="7538089231777683489" at="230,15,236,13" concept="7" />
+      <node id="4598452390225752502" at="358,0,364,0" concept="9" trace="addClosure#(Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_void_P0_E0;Ljava/lang/String;)V" />
+      <node id="8627797991303082080" at="367,14,373,9" concept="0" />
+      <node id="8251307538231048893" at="449,25,455,11" concept="5" />
+      <node id="2893936025727670284" at="513,0,519,0" concept="14" trace="check_6q36mf_a0a0a0a82#(Ljetbrains/mps/project/Project;)Lorg/jetbrains/mps/openapi/module/SRepository;" />
+      <node id="7538089231777683533" at="519,0,525,0" concept="14" trace="check_6q36mf_a0e0a0a0a5nb#(Lorg/jetbrains/mps/openapi/model/SNodeReference;Lorg/jetbrains/mps/openapi/module/SRepository;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7538089231777683601" at="525,0,531,0" concept="14" trace="check_6q36mf_a0a5a0a0a0f93#(Lorg/jetbrains/mps/openapi/model/SModelReference;Lorg/jetbrains/mps/openapi/model/SModel;)Z" />
+      <node id="7538089231777683602" at="531,0,537,0" concept="14" trace="check_6q36mf_a0a0f0a0a0a5nb#(Lorg/jetbrains/mps/openapi/model/SNodeReference;)Lorg/jetbrains/mps/openapi/model/SModelReference;" />
+      <node id="3024471776889427731" at="537,0,543,0" concept="14" trace="check_6q36mf_a0a0f0a0a0a5nb_0#(Lcom/intellij/ide/PasteProvider;Lcom/intellij/openapi/actionSystem/DataContext;)V" />
+      <node id="48168216978432693" at="543,0,549,0" concept="14" trace="createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a15#(Ljava/lang/Object;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7538089231777682430" at="549,0,555,0" concept="14" trace="check_6q36mf_a0o0ic#(Lcom/intellij/openapi/project/Project;)Ljetbrains/mps/nodeEditor/Highlighter;" />
+      <node id="2893936025732109408" at="555,0,561,0" concept="14" trace="check_6q36mf_a2a0a0a0a0a2a0d0kc#(Ljava/lang/Runnable;)V" />
+      <node id="8251307538231050858" at="561,0,567,0" concept="14" trace="check_6q36mf_a1a0a0a0a0a3a0d0kc#(Ljava/lang/Runnable;)V" />
+      <node id="7538089231784120887" at="273,25,280,9" concept="17" />
+      <node id="2893936025728641224" at="300,0,307,0" concept="9" trace="getLastReponse#()Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7538089231777683026" at="316,7,323,7" concept="7" />
+      <node id="8251307538231026807" at="400,0,407,0" concept="9" trace="run#()V" />
+      <node id="8251307538231043748" at="439,25,446,11" concept="5" />
+      <node id="9008866792797021913" at="462,25,469,11" concept="5" />
+      <node id="8251307538231249630" at="197,35,205,7" concept="5" />
+      <node id="4598452390225752494" at="350,0,358,0" concept="9" trace="addException#(Ljava/lang/Throwable;)V" />
+      <node id="8251307538230481484" at="389,0,397,0" concept="9" trace="getProject#()Ljetbrains/mps/project/Project;" />
+      <node id="8251307538231034266" at="429,0,437,0" concept="9" trace="run#()V" />
+      <node id="7287617939140904241" at="449,0,457,0" concept="9" trace="run#()V" />
+      <node id="7538089231777682018" at="127,62,136,5" concept="7" />
+      <node id="4914591330904584345" at="183,0,192,0" concept="9" trace="createConsoleModel#()V" />
+      <node id="7538089231784120885" at="273,0,282,0" concept="9" trace="run#()V" />
+      <node id="7538089231777682919" at="330,44,339,9" concept="18" />
+      <node id="8627797991303072799" at="364,167,373,9" concept="8" />
+      <node id="8251307538231010551" at="398,65,407,7" concept="5" />
+      <node id="7287617939140817023" at="439,0,448,0" concept="9" trace="run#()V" />
+      <node id="9008866792796992719" at="462,0,471,0" concept="9" trace="run#()V" />
+      <node id="7538089231777683487" at="229,53,239,11" concept="17" />
+      <node id="8251307538231034259" at="427,46,437,7" concept="5" />
+      <node id="7538089231777682705" at="197,0,208,0" concept="9" trace="disposeConsoleTab#()V" />
+      <node id="7538089231784120884" at="271,69,282,7" concept="5" />
+      <node id="4914591330906548518" at="286,48,297,6" concept="11" />
+      <node id="1768908716159899740" at="364,0,375,0" concept="9" trace="addSequence#(Ljetbrains/mps/project/Project;Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;ILjava/lang/String;)V" />
+      <node id="9008866792796723747" at="460,52,471,7" concept="5" />
+      <node id="4176612323166027630" at="484,39,495,13" concept="8" />
+      <node id="7538089231777682221" at="166,0,178,0" concept="9" trace="getData#(Ljava/lang/String;)Ljava/lang/Object;" />
+      <node id="7538089231777682907" at="329,0,341,0" concept="9" trace="addText#(Ljava/lang/String;)V" />
+      <node id="7538089231777683537" at="242,94,255,11" concept="8" />
+      <node id="4914591330906414829" at="286,0,299,0" concept="9" trace="getConsoleContext#()Ljetbrains/mps/console/tool/ConsoleContext;" />
+      <node id="7538089231777682973" at="311,88,324,5" concept="7" />
+      <node id="4176612323166022616" at="484,0,497,0" concept="9" trace="visit#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7538089231777682112" at="140,0,154,0" concept="9" trace="validateImports#()V" />
+      <node id="7538089231777682216" at="164,33,178,6" concept="5" />
+      <node id="7752629037608769343" at="460,0,474,0" concept="9" trace="selectNode#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="7538089231777682004" at="124,0,139,0" concept="9" trace="addBuiltInImports#()V" />
+      <node id="7538089231784120874" at="269,0,285,0" concept="9" trace="saveHistory#()Ljava/lang/String;" />
+      <node id="4914591330907522709" at="164,0,181,0" concept="9" trace="createEditor#()V" />
+      <node id="2893936025731234515" at="308,0,326,0" concept="9" trace="addNodeImports#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4176612323165894334" at="478,147,497,11" concept="5" />
+      <node id="7538089231777682881" at="437,7,457,8" concept="5" />
+      <node id="7538089231777682192" at="398,0,424,0" concept="9" trace="initConsoleTab#(Ljava/lang/String;)V" />
+      <node id="8251307538231340516" at="228,0,257,0" concept="9" trace="run#()V" />
+      <node id="8251307538231322534" at="226,66,257,9" concept="5" />
+      <node id="9056261439947806043" at="476,24,507,7" concept="17" />
+      <node id="7538089231777683473" at="226,0,259,0" concept="9" trace="performPaste#(Lcom/intellij/openapi/actionSystem/DataContext;)V" />
+      <node id="7538089231777683723" at="475,51,508,5" concept="8" />
+      <node id="2893936025730044886" at="425,0,459,0" concept="9" trace="execute#(Lorg/jetbrains/mps/openapi/model/SNode;Ljava/lang/Runnable;Ljava/lang/Runnable;)V" />
+      <node id="4176612323165356804" at="475,0,511,0" concept="9" trace="loadHistoryModel#(Ljava/lang/String;)Lorg/jetbrains/mps/openapi/model/SModel;" />
+      <node id="4914591330906818579" at="327,43,375,6" concept="11" />
+      <node id="4914591330906788048" at="327,0,377,0" concept="9" trace="getConsoleStream#()Ljetbrains/mps/console/tool/ConsoleStream;" />
+      <scope id="7538089231777683516" at="237,0,237,56">
         <var name="ignored" id="7538089231777683517" />
       </scope>
-      <scope id="7538089231777683519" at="226,56,226,56" />
-      <scope id="7538089231777683520" at="227,0,227,41">
+      <scope id="7538089231777683519" at="237,56,237,56" />
+      <scope id="7538089231777683520" at="238,0,238,41">
         <var name="ignored" id="7538089231777683521" />
       </scope>
-      <scope id="7538089231777683523" at="227,41,227,41" />
-      <scope id="8871522752922343333" at="93,28,94,22" />
-      <scope id="8971646171573043043" at="97,35,98,19" />
-      <scope id="773462683487697958" at="101,47,102,20" />
-      <scope id="773462683488968420" at="105,26,106,18" />
-      <scope id="3362819150777780946" at="109,39,110,18" />
-      <scope id="4214225063066306499" at="120,37,121,17" />
-      <scope id="7538089231777682116" at="131,137,132,41" />
-      <scope id="7538089231777682138" at="134,129,135,47" />
-      <scope id="7538089231777682160" at="137,185,138,65" />
-      <scope id="7538089231777682539" at="144,67,145,106" />
-      <scope id="7538089231777682230" at="158,51,159,30" />
-      <scope id="7538089231777682207" at="175,42,176,59" />
-      <scope id="5364202125454715310" at="182,25,183,24" />
-      <scope id="7538089231777682713" at="189,31,190,29" />
-      <scope id="7538089231777683433" at="199,35,200,31" />
-      <scope id="7538089231777683448" at="202,76,203,177" />
-      <scope id="7538089231777683462" at="211,64,212,52" />
-      <scope id="7538089231777683492" at="221,94,222,109" />
-      <scope id="7538089231777683562" at="236,47,237,40" />
-      <scope id="7538089231777683579" at="238,80,239,66" />
-      <scope id="7538089231777683611" at="242,18,243,75" />
-      <scope id="7538089231777683623" at="248,66,249,18" />
-      <scope id="7538089231777683632" at="251,65,252,18" />
-      <scope id="4914591330905910255" at="256,0,257,0">
+      <scope id="7538089231777683523" at="238,41,238,41" />
+      <scope id="8871522752922343333" at="99,28,100,22" />
+      <scope id="8971646171573043043" at="103,35,104,19" />
+      <scope id="773462683487697958" at="107,47,108,20" />
+      <scope id="773462683488968420" at="111,26,112,18" />
+      <scope id="3362819150777780946" at="115,39,116,18" />
+      <scope id="4214225063066306499" at="131,37,132,17" />
+      <scope id="7538089231777682116" at="142,137,143,41" />
+      <scope id="7538089231777682138" at="145,129,146,47" />
+      <scope id="7538089231777682160" at="148,185,149,65" />
+      <scope id="7538089231777682539" at="155,67,156,106" />
+      <scope id="7538089231777682230" at="169,51,170,30" />
+      <scope id="7538089231777682207" at="186,42,187,59" />
+      <scope id="5364202125454715310" at="193,25,194,24" />
+      <scope id="7538089231777682713" at="200,31,201,29" />
+      <scope id="7538089231777683433" at="210,35,211,31" />
+      <scope id="7538089231777683448" at="213,76,214,177" />
+      <scope id="7538089231777683462" at="222,64,223,52" />
+      <scope id="7538089231777683492" at="232,94,233,109" />
+      <scope id="7538089231777683562" at="247,47,248,40" />
+      <scope id="7538089231777683579" at="249,80,250,66" />
+      <scope id="7538089231777683611" at="253,18,254,75" />
+      <scope id="7538089231777683623" at="259,66,260,18" />
+      <scope id="7538089231777683632" at="262,65,263,18" />
+      <scope id="4914591330905910255" at="267,0,268,0">
         <var name="state" id="4914591330905910335" />
       </scope>
-      <scope id="7538089231784120888" at="263,13,264,117" />
-      <scope id="7538089231784120906" at="266,45,267,57" />
-      <scope id="7538089231777682891" at="277,35,278,63" />
-      <scope id="1471632565003333809" at="280,50,281,46" />
-      <scope id="7538089231777682900" at="283,45,284,35" />
-      <scope id="2893936025728641239" at="291,23,292,18" />
-      <scope id="7538089231777682994" at="303,56,304,48" />
-      <scope id="7538089231777682928" at="322,52,323,278" />
-      <scope id="7538089231777682943" at="325,80,326,378" />
-      <scope id="3976301908733823579" at="344,60,345,135" />
-      <scope id="8251307538230869630" at="351,29,352,88" />
-      <scope id="4176612323165936631" at="439,43,440,48" />
-      <scope id="4176612323166333114" at="446,50,447,105" />
-      <scope id="4176612323166310360" at="451,50,452,93" />
-      <scope id="1036187445124522569" at="459,44,460,113" />
-      <scope id="9056261439947958023" at="463,44,464,60" />
-      <scope id="2893936025727670284" at="473,36,474,47" />
-      <scope id="7538089231777683533" at="479,36,480,51" />
-      <scope id="7538089231777683601" at="485,36,486,62" />
-      <scope id="7538089231777683602" at="491,36,492,51" />
-      <scope id="3024471776889427731" at="497,36,498,46" />
-      <scope id="48168216978432693" at="504,230,505,152" />
-      <scope id="7538089231777682430" at="509,36,510,63" />
-      <scope id="2893936025732109408" at="515,36,516,30" />
-      <scope id="8251307538231050858" at="521,36,522,30" />
-      <scope id="3024471776891737930" at="526,76,527,47" />
-      <scope id="7538089231777682557" at="148,83,150,13" />
-      <scope id="7538089231777682238" at="161,54,163,122">
+      <scope id="7538089231784120888" at="274,13,275,117" />
+      <scope id="7538089231784120906" at="277,45,278,57" />
+      <scope id="7538089231777682891" at="288,35,289,63" />
+      <scope id="1471632565003333809" at="291,50,292,46" />
+      <scope id="4598452390224495823" at="294,47,295,35" />
+      <scope id="2893936025728641239" at="302,23,303,18" />
+      <scope id="7538089231777682994" at="314,56,315,48" />
+      <scope id="7538089231777682928" at="333,52,334,278" />
+      <scope id="7538089231777682943" at="336,80,337,378" />
+      <scope id="8627797991303072802" at="365,32,366,36" />
+      <scope id="328850564587494309" at="369,34,370,49" />
+      <scope id="3976301908733823579" at="385,60,386,135" />
+      <scope id="8251307538230869630" at="392,29,393,88" />
+      <scope id="4176612323165936631" at="480,43,481,48" />
+      <scope id="4176612323166333114" at="487,50,488,105" />
+      <scope id="4176612323166310360" at="492,50,493,93" />
+      <scope id="1036187445124522569" at="500,44,501,113" />
+      <scope id="9056261439947958023" at="504,44,505,60" />
+      <scope id="2893936025727670284" at="514,36,515,47" />
+      <scope id="7538089231777683533" at="520,36,521,51" />
+      <scope id="7538089231777683601" at="526,36,527,62" />
+      <scope id="7538089231777683602" at="532,36,533,51" />
+      <scope id="3024471776889427731" at="538,36,539,46" />
+      <scope id="48168216978432693" at="545,230,546,152" />
+      <scope id="7538089231777682430" at="550,36,551,63" />
+      <scope id="2893936025732109408" at="556,36,557,30" />
+      <scope id="8251307538231050858" at="562,36,563,30" />
+      <scope id="3024471776891737930" at="567,76,568,47" />
+      <scope id="4598452390224162845" at="119,26,121,37" />
+      <scope id="7538089231777682557" at="159,83,161,13" />
+      <scope id="7538089231777682238" at="172,54,174,122">
         <var name="parentPasteProvider" id="3024471776891595060" />
       </scope>
-      <scope id="7538089231777683039" at="308,89,310,133" />
-      <scope id="7538089231777682972" at="330,39,332,535" />
-      <scope id="8251307538231048900" at="410,29,412,58" />
-      <scope id="8871522752922343330" at="93,0,96,0" />
-      <scope id="8971646171573043040" at="97,0,100,0" />
-      <scope id="773462683487697955" at="101,0,104,0" />
-      <scope id="773462683488968419" at="105,0,108,0" />
-      <scope id="3362819150777780943" at="109,0,112,0" />
-      <scope id="7538089231777682114" at="130,60,133,5">
+      <scope id="7538089231777683039" at="319,89,321,133" />
+      <scope id="7538089231777682972" at="341,39,343,535" />
+      <scope id="8251307538231048900" at="451,29,453,58" />
+      <scope id="8871522752922343330" at="99,0,102,0" />
+      <scope id="8971646171573043040" at="103,0,106,0" />
+      <scope id="773462683487697955" at="107,0,110,0" />
+      <scope id="773462683488968419" at="111,0,114,0" />
+      <scope id="3362819150777780943" at="115,0,118,0" />
+      <scope id="7538089231777682114" at="141,60,144,5">
         <var name="devKit" id="7538089231777682115" />
       </scope>
-      <scope id="7538089231777682136" at="133,5,136,5">
+      <scope id="7538089231777682136" at="144,5,147,5">
         <var name="language" id="7538089231777682137" />
       </scope>
-      <scope id="7538089231777682158" at="136,5,139,5">
+      <scope id="7538089231777682158" at="147,5,150,5">
         <var name="model" id="7538089231777682159" />
       </scope>
-      <scope id="7538089231777682538" at="144,0,147,0">
+      <scope id="7538089231777682538" at="155,0,158,0">
         <var name="a" id="7538089231777682550" />
         <var name="key" id="7538089231777682552" />
       </scope>
-      <scope id="7538089231777682207" at="174,26,177,7" />
-      <scope id="5364202125454715304" at="182,0,185,0" />
-      <scope id="7538089231777683431" at="199,0,202,0" />
-      <scope id="7538089231777683439" at="202,0,205,0">
+      <scope id="7538089231777682207" at="185,26,188,7" />
+      <scope id="5364202125454715304" at="193,0,196,0" />
+      <scope id="7538089231777683431" at="210,0,213,0" />
+      <scope id="7538089231777683439" at="213,0,216,0">
         <var name="event" id="7538089231777683442" />
         <var name="map" id="7538089231777683444" />
       </scope>
-      <scope id="7538089231777683460" at="211,0,214,0">
+      <scope id="7538089231777683460" at="222,0,225,0">
         <var name="defaultPasteProvider" id="7538089231777683468" />
       </scope>
-      <scope id="7538089231777683617" at="248,0,251,0">
+      <scope id="7538089231777683617" at="259,0,262,0">
         <var name="context" id="7538089231777683620" />
       </scope>
-      <scope id="7538089231777683626" at="251,0,254,0">
+      <scope id="7538089231777683626" at="262,0,265,0">
         <var name="context" id="7538089231777683629" />
       </scope>
-      <scope id="7538089231784120902" at="265,0,268,11">
+      <scope id="7538089231784120902" at="276,0,279,11">
         <var name="e" id="7538089231784120903" />
       </scope>
-      <scope id="7538089231784120905" at="265,31,268,11" />
-      <scope id="7538089231784120906" at="265,31,268,11" />
-      <scope id="7538089231777682888" at="277,0,280,0" />
-      <scope id="1471632565003333804" at="280,0,283,0" />
-      <scope id="7538089231777682897" at="283,0,286,0" />
-      <scope id="4914591330907811235" at="338,83,341,28" />
-      <scope id="3976301908733823576" at="344,0,347,0">
+      <scope id="7538089231784120905" at="276,31,279,11" />
+      <scope id="7538089231784120906" at="276,31,279,11" />
+      <scope id="7538089231777682888" at="288,0,291,0" />
+      <scope id="1471632565003333804" at="291,0,294,0" />
+      <scope id="4598452390224495818" at="294,0,297,0" />
+      <scope id="4598452390225752493" at="345,44,348,22">
+        <var name="node" id="2348043250037290194" />
+      </scope>
+      <scope id="328850564587494307" at="369,0,372,0" />
+      <scope id="4914591330907811235" at="379,83,382,28" />
+      <scope id="3976301908733823576" at="385,0,388,0">
         <var name="group" id="3976301908733870443" />
       </scope>
-      <scope id="592665991632297314" at="390,30,393,378" />
-      <scope id="8251307538231043756" at="400,29,403,59" />
-      <scope id="9008866792797021917" at="423,29,426,91" />
-      <scope id="4176612323165936630" at="439,0,442,0">
+      <scope id="592665991632297314" at="431,30,434,378" />
+      <scope id="8251307538231043756" at="441,29,444,59" />
+      <scope id="9008866792797021917" at="464,29,467,91" />
+      <scope id="4176612323165936630" at="480,0,483,0">
         <var name="it" id="4176612323165936630" />
       </scope>
-      <scope id="4176612323166333114" at="445,247,448,15" />
-      <scope id="4176612323166310360" at="450,39,453,15" />
-      <scope id="1036187445124449077" at="458,0,461,9">
+      <scope id="4176612323166333114" at="486,247,489,15" />
+      <scope id="4176612323166310360" at="491,39,494,15" />
+      <scope id="1036187445124449077" at="499,0,502,9">
         <var name="e" id="1036187445124449079" />
       </scope>
-      <scope id="1036187445124449078" at="458,36,461,9" />
-      <scope id="1036187445124522569" at="458,36,461,9" />
-      <scope id="9056261439947806046" at="462,0,465,9">
+      <scope id="1036187445124449078" at="499,36,502,9" />
+      <scope id="1036187445124522569" at="499,36,502,9" />
+      <scope id="9056261439947806046" at="503,0,506,9">
         <var name="e" id="9056261439947806048" />
       </scope>
-      <scope id="9056261439947806052" at="462,29,465,9" />
-      <scope id="9056261439947958023" at="462,29,465,9" />
-      <scope id="3024471776891737930" at="526,0,529,0">
+      <scope id="9056261439947806052" at="503,29,506,9" />
+      <scope id="9056261439947958023" at="503,29,506,9" />
+      <scope id="3024471776891737930" at="567,0,570,0">
         <var name="o" id="3024471776891737930" />
         <var name="type" id="3024471776891737930" />
       </scope>
-      <scope id="7538089231777682556" at="148,0,152,0">
+      <scope id="4598452390224162839" at="119,0,123,0" />
+      <scope id="7538089231777682556" at="159,0,163,0">
         <var name="a" id="7538089231777682568" />
         <var name="shortcutSet" id="7538089231777682570" />
       </scope>
-      <scope id="7538089231777682206" at="174,26,178,13" />
-      <scope id="8251307538231257696" at="188,25,192,55" />
-      <scope id="7538089231777683490" at="220,90,224,20" />
-      <scope id="7538089231777682967" at="330,0,334,0">
+      <scope id="7538089231777682206" at="185,26,189,13" />
+      <scope id="8251307538231257696" at="199,25,203,55" />
+      <scope id="7538089231777683490" at="231,90,235,20" />
+      <scope id="7538089231777682967" at="341,0,345,0">
         <var name="node" id="7538089231777682970" />
       </scope>
-      <scope id="8251307538231048899" at="410,0,414,0" />
-      <scope id="4176612323166027631" at="444,233,448,15" />
-      <scope id="4176612323166042695" at="449,20,453,15" />
-      <scope id="2893936025727670284" at="472,80,476,16" />
-      <scope id="7538089231777683533" at="478,108,482,16" />
-      <scope id="7538089231777683601" at="484,104,488,17" />
-      <scope id="7538089231777683602" at="490,96,494,16" />
-      <scope id="3024471776889427731" at="496,107,500,0" />
-      <scope id="48168216978432693" at="502,83,506,14">
+      <scope id="4598452390225752510" at="358,79,362,33">
+        <var name="nodeWithClosure" id="7600370246423004421" />
+      </scope>
+      <scope id="8251307538231048899" at="451,0,455,0" />
+      <scope id="4176612323166027631" at="485,233,489,15" />
+      <scope id="4176612323166042695" at="490,20,494,15" />
+      <scope id="2893936025727670284" at="513,80,517,16" />
+      <scope id="7538089231777683533" at="519,108,523,16" />
+      <scope id="7538089231777683601" at="525,104,529,17" />
+      <scope id="7538089231777683602" at="531,96,535,16" />
+      <scope id="3024471776889427731" at="537,107,541,0" />
+      <scope id="48168216978432693" at="543,83,547,14">
         <var name="facade" id="48168216978432693" />
         <var name="n1" id="48168216978432693" />
       </scope>
-      <scope id="7538089231777682430" at="508,106,512,16" />
-      <scope id="2893936025732109408" at="514,83,518,0" />
-      <scope id="8251307538231050858" at="520,83,524,0" />
-      <scope id="2893936025728641225" at="289,36,294,516">
+      <scope id="7538089231777682430" at="549,106,553,16" />
+      <scope id="2893936025732109408" at="555,83,559,0" />
+      <scope id="8251307538231050858" at="561,83,565,0" />
+      <scope id="2893936025728641225" at="300,36,305,516">
         <var name="last" id="2893936025728641227" />
       </scope>
-      <scope id="7538089231777683031" at="306,92,311,9">
+      <scope id="7538089231777683031" at="317,92,322,9">
         <var name="usedModel" id="7538089231777683033" />
       </scope>
-      <scope id="4914591330907811233" at="338,0,343,0">
+      <scope id="4598452390225752486" at="345,0,350,0">
+        <var name="target" id="4598452390225752490" />
+      </scope>
+      <scope id="8627797991303082081" at="367,16,372,53" />
+      <scope id="4914591330907811233" at="379,0,384,0">
         <var name="history" id="3941329126770755125" />
         <var name="title" id="4914591330907811250" />
         <var name="tool" id="4914591330907811248" />
       </scope>
-      <scope id="8251307538230481487" at="349,40,354,22">
+      <scope id="8251307538230481487" at="390,40,395,22">
         <var name="mpsProject" id="8251307538230822039" />
       </scope>
-      <scope id="8251307538231026808" at="359,25,364,55" />
-      <scope id="8251307538231043755" at="400,0,405,0" />
-      <scope id="9008866792797021915" at="423,0,428,0" />
-      <scope id="8251307538231257695" at="188,0,194,0" />
-      <scope id="7538089231777683488" at="219,15,225,13" />
-      <scope id="7538089231777683489" at="219,15,225,13">
+      <scope id="8251307538231026808" at="400,25,405,55" />
+      <scope id="8251307538231043755" at="441,0,446,0" />
+      <scope id="9008866792797021915" at="464,0,469,0" />
+      <scope id="8251307538231257695" at="199,0,205,0" />
+      <scope id="7538089231777683488" at="230,15,236,13" />
+      <scope id="7538089231777683489" at="230,15,236,13">
         <var name="trf" id="7538089231777683511" />
       </scope>
-      <scope id="8251307538231034267" at="388,25,394,9" />
-      <scope id="7287617939140904245" at="408,25,414,11" />
-      <scope id="2893936025727670284" at="472,0,478,0">
+      <scope id="4598452390225752501" at="350,45,356,33">
+        <var name="exceptionHolder" id="6558068108108370772" />
+        <var name="writer" id="6558068108107683970" />
+      </scope>
+      <scope id="4598452390225752502" at="358,0,364,0">
+        <var name="closure" id="4598452390225752503" />
+        <var name="text" id="7600370246426662642" />
+      </scope>
+      <scope id="8251307538231034267" at="429,25,435,9" />
+      <scope id="7287617939140904245" at="449,25,455,11" />
+      <scope id="2893936025727670284" at="513,0,519,0">
         <var name="checkedDotOperand" id="2893936025727670284" />
       </scope>
-      <scope id="7538089231777683533" at="478,0,484,0">
+      <scope id="7538089231777683533" at="519,0,525,0">
         <var name="checkedDotOperand" id="7538089231777683533" />
         <var name="repository" id="7538089231777683533" />
       </scope>
-      <scope id="7538089231777683601" at="484,0,490,0">
+      <scope id="7538089231777683601" at="525,0,531,0">
         <var name="checkedDotOperand" id="7538089231777683601" />
         <var name="myModel" id="7538089231777683601" />
       </scope>
-      <scope id="7538089231777683602" at="490,0,496,0">
+      <scope id="7538089231777683602" at="531,0,537,0">
         <var name="checkedDotOperand" id="7538089231777683602" />
       </scope>
-      <scope id="3024471776889427731" at="496,0,502,0">
+      <scope id="3024471776889427731" at="537,0,543,0">
         <var name="checkedDotOperand" id="3024471776889427731" />
         <var name="context" id="3024471776889427731" />
       </scope>
-      <scope id="48168216978432693" at="502,0,508,0">
+      <scope id="48168216978432693" at="543,0,549,0">
         <var name="p0" id="48168216978432693" />
       </scope>
-      <scope id="7538089231777682430" at="508,0,514,0">
+      <scope id="7538089231777682430" at="549,0,555,0">
         <var name="checkedDotOperand" id="7538089231777682430" />
       </scope>
-      <scope id="2893936025732109408" at="514,0,520,0">
+      <scope id="2893936025732109408" at="555,0,561,0">
         <var name="checkedDotOperand" id="2893936025732109408" />
       </scope>
-      <scope id="8251307538231050858" at="520,0,526,0">
+      <scope id="8251307538231050858" at="561,0,567,0">
         <var name="checkedDotOperand" id="8251307538231050858" />
       </scope>
-      <scope id="7538089231777682020" at="117,78,124,105">
+      <scope id="7538089231777682020" at="128,78,135,105">
         <var name="sourceLangModule" id="4214225063066303902" />
       </scope>
-      <scope id="4914591330904584348" at="172,39,179,5" />
-      <scope id="7538089231784120886" at="262,25,269,9" />
-      <scope id="2893936025728641224" at="289,0,296,0" />
-      <scope id="7538089231777683026" at="305,7,312,7">
+      <scope id="4914591330904584348" at="183,39,190,5" />
+      <scope id="7538089231784120886" at="273,25,280,9" />
+      <scope id="2893936025728641224" at="300,0,307,0" />
+      <scope id="7538089231777683026" at="316,7,323,7">
         <var name="ref" id="7538089231777683027" />
       </scope>
-      <scope id="7538089231777682920" at="320,39,327,11">
+      <scope id="7538089231777682920" at="331,39,338,11">
         <var name="line" id="7538089231777682922" />
       </scope>
-      <scope id="8251307538231026807" at="359,0,366,0" />
-      <scope id="7287617939140817027" at="398,25,405,11" />
-      <scope id="9008866792796992721" at="421,25,428,11" />
-      <scope id="7538089231777682228" at="157,49,165,34" />
-      <scope id="8251307538230481484" at="348,0,356,0" />
-      <scope id="8251307538231034266" at="388,0,396,0" />
-      <scope id="7287617939140904241" at="408,0,416,0" />
-      <scope id="7538089231777682018" at="116,62,125,5">
+      <scope id="8251307538231026807" at="400,0,407,0" />
+      <scope id="7287617939140817027" at="439,25,446,11" />
+      <scope id="9008866792796992721" at="462,25,469,11" />
+      <scope id="7538089231777682228" at="168,49,176,34" />
+      <scope id="4598452390225752494" at="350,0,358,0">
+        <var name="t" id="4598452390225752498" />
+      </scope>
+      <scope id="8251307538230481484" at="389,0,397,0" />
+      <scope id="8251307538231034266" at="429,0,437,0" />
+      <scope id="7287617939140904241" at="449,0,457,0" />
+      <scope id="7538089231777682018" at="127,62,136,5">
         <var name="l" id="7538089231777682019" />
       </scope>
-      <scope id="4914591330904584345" at="172,0,181,0" />
-      <scope id="7538089231777682708" at="186,35,195,60" />
-      <scope id="7538089231777683538" at="232,156,241,69">
+      <scope id="4914591330904584345" at="183,0,192,0" />
+      <scope id="7538089231777682708" at="197,35,206,60" />
+      <scope id="7538089231777683538" at="243,156,252,69">
         <var name="paster" id="7538089231777683553" />
         <var name="refContainer" id="7538089231777683540" />
       </scope>
-      <scope id="7538089231784120885" at="262,0,271,0" />
-      <scope id="7287617939140817023" at="398,0,407,0" />
-      <scope id="9008866792796992719" at="421,0,430,0" />
-      <scope id="7538089231777682912" at="318,40,328,9">
+      <scope id="7538089231784120885" at="273,0,282,0" />
+      <scope id="9010839353952056872" at="364,167,373,9" />
+      <scope id="7287617939140817023" at="439,0,448,0" />
+      <scope id="9008866792796992719" at="462,0,471,0" />
+      <scope id="7538089231777682912" at="329,40,339,9">
         <var name="scanner" id="7538089231777682914" />
       </scope>
-      <scope id="7538089231777682705" at="186,0,197,0" />
-      <scope id="4914591330906414832" at="275,48,286,6" />
-      <scope id="7538089231777682979" at="301,129,312,7">
+      <scope id="7538089231777682705" at="197,0,208,0" />
+      <scope id="4914591330906414832" at="286,48,297,6" />
+      <scope id="7538089231777682979" at="312,129,323,7">
         <var name="usedLanguage" id="7538089231777682981" />
       </scope>
-      <scope id="4176612323166022617" at="443,39,454,13" />
-      <scope id="7538089231777682113" at="129,36,141,61">
+      <scope id="1768908716159899740" at="364,0,375,0">
+        <var name="project" id="9010839353952403934" />
+        <var name="resultDescription" id="9010839353952432657" />
+        <var name="results" id="9010839353952414816" />
+        <var name="resultsCount" id="9010839353952422879" />
+      </scope>
+      <scope id="4176612323166022617" at="484,39,495,13" />
+      <scope id="7538089231777682113" at="140,36,152,61">
         <var name="modelInternal" id="2971752488947143031" />
       </scope>
-      <scope id="7538089231777682221" at="155,0,167,0">
+      <scope id="7538089231777682221" at="166,0,178,0">
         <var name="key" id="7538089231777682224" />
       </scope>
-      <scope id="7538089231777682907" at="318,0,330,0">
+      <scope id="7538089231777682907" at="329,0,341,0">
         <var name="text" id="7538089231777682910" />
       </scope>
-      <scope id="7752629037608769346" at="419,52,431,27" />
-      <scope id="7538089231777682005" at="113,38,126,161">
+      <scope id="7752629037608769346" at="460,52,472,27" />
+      <scope id="7538089231777682005" at="124,38,137,161">
         <var name="base" id="7538089231777682007" />
         <var name="baseAndExtensions" id="7538089231777682011" />
         <var name="modelInternal" id="2971752488947190737" />
       </scope>
-      <scope id="7538089231784120878" at="259,31,272,24">
+      <scope id="7538089231784120878" at="270,31,283,24">
         <var name="result" id="7538089231784120880" />
       </scope>
-      <scope id="4914591330906414829" at="275,0,288,0" />
-      <scope id="7538089231777682973" at="300,88,313,5">
+      <scope id="4914591330906414829" at="286,0,299,0" />
+      <scope id="7538089231777682973" at="311,88,324,5">
         <var name="subNode" id="7538089231777682978" />
       </scope>
-      <scope id="4176612323166022616" at="443,0,456,0">
+      <scope id="4176612323166022616" at="484,0,497,0">
         <var name="it" id="4176612323166022616" />
       </scope>
-      <scope id="7538089231777682112" at="129,0,143,0" />
-      <scope id="7752629037608769343" at="419,0,433,0">
+      <scope id="7538089231777682112" at="140,0,154,0" />
+      <scope id="7752629037608769343" at="460,0,474,0">
         <var name="nodeToSelect" id="7752629037608824393" />
       </scope>
-      <scope id="7538089231777682004" at="113,0,128,0" />
-      <scope id="4914591330907522712" at="153,33,168,30" />
-      <scope id="7538089231784120874" at="258,0,274,0" />
-      <scope id="2893936025731234518" at="297,45,313,5">
+      <scope id="7538089231777682004" at="124,0,139,0" />
+      <scope id="4914591330907522712" at="164,33,179,30" />
+      <scope id="7538089231784120874" at="269,0,285,0" />
+      <scope id="2893936025731234518" at="308,45,324,5">
         <var name="importedLanguages" id="2971752488947196103" />
         <var name="modelInternal" id="2971752488947184069" />
         <var name="module" id="4214225063065875704" />
       </scope>
-      <scope id="4914591330907522709" at="153,0,170,0" />
-      <scope id="2893936025731234515" at="297,0,315,0">
+      <scope id="4914591330907522709" at="164,0,181,0" />
+      <scope id="2893936025731234515" at="308,0,326,0">
         <var name="node" id="2893936025731278819" />
       </scope>
-      <scope id="4914591330906788051" at="316,43,334,6" />
-      <scope id="4914591330906788048" at="316,0,336,0" />
-      <scope id="9056261439947806045" at="436,11,457,33">
+      <scope id="9056261439947806045" at="477,11,498,33">
         <var name="loadedModel" id="4176612323165699207" />
       </scope>
-      <scope id="7538089231777682195" at="357,65,381,57">
+      <scope id="7538089231777682195" at="398,65,422,57">
         <var name="group" id="3976301908733039980" />
         <var name="toolbar" id="3976301908733040030" />
         <var name="toolbarComponent" id="3976301908733040040" />
       </scope>
-      <scope id="7538089231777682192" at="357,0,383,0">
+      <scope id="7538089231777682192" at="398,0,424,0">
         <var name="history" id="3941329126770699274" />
       </scope>
-      <scope id="8251307538231340517" at="217,27,244,11">
+      <scope id="8251307538231340517" at="228,27,255,11">
         <var name="currentCell" id="7538089231777683525" />
         <var name="pastingNodeReference" id="7538089231777683484" />
         <var name="referenceTarget" id="7538089231777683531" />
         <var name="repository" id="8251307538231395335" />
       </scope>
-      <scope id="8251307538231340516" at="217,0,246,0" />
-      <scope id="7538089231777683479" at="215,66,246,9" />
-      <scope id="7538089231777683724" at="435,24,466,7" />
-      <scope id="2893936025730044889" at="384,133,416,8">
+      <scope id="8251307538231340516" at="228,0,257,0" />
+      <scope id="7538089231777683479" at="226,66,257,9" />
+      <scope id="7538089231777683724" at="476,24,507,7" />
+      <scope id="2893936025730044889" at="425,133,457,8">
         <var name="typedCommand" id="592665991632343036" />
       </scope>
-      <scope id="7538089231777683473" at="215,0,248,0">
+      <scope id="7538089231777683473" at="226,0,259,0">
         <var name="context" id="7538089231777683476" />
       </scope>
-      <scope id="2893936025730044886" at="384,0,418,0">
+      <scope id="2893936025730044886" at="425,0,459,0">
         <var name="command" id="2893936025730100112" />
         <var name="executeAfter" id="2893936025730248286" />
         <var name="executeBefore" id="2893936025731679578" />
       </scope>
-      <scope id="4176612323165356807" at="434,51,468,16" />
-      <scope id="4176612323165356804" at="434,0,470,0">
+      <scope id="4176612323165356807" at="475,51,509,16" />
+      <scope id="4176612323165356804" at="475,0,511,0">
         <var name="state" id="4176612323165363405" />
       </scope>
-      <unit id="4176612323165936630" at="438,89,442,9" name="jetbrains.mps.console.tool.BaseConsoleTab$11" />
-      <unit id="8251307538231048899" at="409,57,414,9" name="jetbrains.mps.console.tool.BaseConsoleTab$10" />
-      <unit id="8251307538231043755" at="399,57,405,9" name="jetbrains.mps.console.tool.BaseConsoleTab$9" />
-      <unit id="9008866792797021915" at="422,72,428,9" name="jetbrains.mps.console.tool.BaseConsoleTab$11" />
-      <unit id="8251307538231257695" at="187,53,194,5" name="jetbrains.mps.console.tool.BaseConsoleTab$2" />
-      <unit id="7538089231777683430" at="198,0,206,0" name="jetbrains.mps.console.tool.BaseConsoleTab$ExecuteClosureAction" />
-      <unit id="8251307538231026807" at="358,53,366,5" name="jetbrains.mps.console.tool.BaseConsoleTab$6" />
-      <unit id="8251307538231034266" at="387,53,396,5" name="jetbrains.mps.console.tool.BaseConsoleTab$7" />
-      <unit id="7287617939140904239" at="407,11,416,5" name="jetbrains.mps.console.tool.BaseConsoleTab$9" />
-      <unit id="7538089231784120885" at="261,68,271,5" name="jetbrains.mps.console.tool.BaseConsoleTab$3" />
-      <unit id="7538089231777682886" at="276,15,286,5" name="jetbrains.mps.console.tool.BaseConsoleTab$4" />
-      <unit id="7287617939140817021" at="397,480,407,5" name="jetbrains.mps.console.tool.BaseConsoleTab$8" />
-      <unit id="9008866792796992719" at="420,40,430,5" name="jetbrains.mps.console.tool.BaseConsoleTab$10" />
-      <unit id="7538089231777682220" at="154,24,167,5" name="jetbrains.mps.console.tool.BaseConsoleTab$1" />
-      <unit id="4176612323166022616" at="442,24,456,9" name="jetbrains.mps.console.tool.BaseConsoleTab$12" />
-      <unit id="7538089231777682905" at="317,15,334,5" name="jetbrains.mps.console.tool.BaseConsoleTab$5" />
-      <unit id="8251307538231340516" at="216,55,246,7" name="jetbrains.mps.console.tool.BaseConsoleTab$1" />
-      <unit id="7538089231777683454" at="207,0,255,0" name="jetbrains.mps.console.tool.BaseConsoleTab$MyPasteProvider" />
-      <unit id="4914591330900787311" at="84,0,530,0" name="jetbrains.mps.console.tool.BaseConsoleTab" />
+      <scope id="4914591330906788051" at="327,43,375,6" />
+      <scope id="4914591330906788048" at="327,0,377,0" />
+      <unit id="328850564587494307" at="368,25,372,11" name="jetbrains.mps.console.tool.BaseConsoleTab$6" />
+      <unit id="4176612323165936630" at="479,89,483,9" name="jetbrains.mps.console.tool.BaseConsoleTab$11" />
+      <unit id="8251307538231048899" at="450,57,455,9" name="jetbrains.mps.console.tool.BaseConsoleTab$10" />
+      <unit id="8251307538231043755" at="440,57,446,9" name="jetbrains.mps.console.tool.BaseConsoleTab$9" />
+      <unit id="9008866792797021915" at="463,72,469,9" name="jetbrains.mps.console.tool.BaseConsoleTab$11" />
+      <unit id="8251307538231257695" at="198,53,205,5" name="jetbrains.mps.console.tool.BaseConsoleTab$2" />
+      <unit id="7538089231777683430" at="209,0,217,0" name="jetbrains.mps.console.tool.BaseConsoleTab$ExecuteClosureAction" />
+      <unit id="8251307538231026807" at="399,53,407,5" name="jetbrains.mps.console.tool.BaseConsoleTab$6" />
+      <unit id="8251307538231034266" at="428,53,437,5" name="jetbrains.mps.console.tool.BaseConsoleTab$7" />
+      <unit id="7287617939140904239" at="448,11,457,5" name="jetbrains.mps.console.tool.BaseConsoleTab$9" />
+      <unit id="7538089231784120885" at="272,68,282,5" name="jetbrains.mps.console.tool.BaseConsoleTab$3" />
+      <unit id="7538089231777682886" at="287,15,297,5" name="jetbrains.mps.console.tool.BaseConsoleTab$4" />
+      <unit id="7287617939140817021" at="438,480,448,5" name="jetbrains.mps.console.tool.BaseConsoleTab$8" />
+      <unit id="9008866792796992719" at="461,40,471,5" name="jetbrains.mps.console.tool.BaseConsoleTab$10" />
+      <unit id="7538089231777682220" at="165,24,178,5" name="jetbrains.mps.console.tool.BaseConsoleTab$1" />
+      <unit id="4176612323166022616" at="483,24,497,9" name="jetbrains.mps.console.tool.BaseConsoleTab$12" />
+      <unit id="8251307538231340516" at="227,55,257,7" name="jetbrains.mps.console.tool.BaseConsoleTab$1" />
+      <unit id="7538089231777682905" at="328,15,375,5" name="jetbrains.mps.console.tool.BaseConsoleTab$5" />
+      <unit id="7538089231777683454" at="218,0,266,0" name="jetbrains.mps.console.tool.BaseConsoleTab$MyPasteProvider" />
+      <unit id="4914591330900787311" at="90,0,571,0" name="jetbrains.mps.console.tool.BaseConsoleTab" />
     </file>
   </root>
   <root nodeRef="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)/6852607286009617748">
     <file name="ConsoleStream.java">
-      <node id="6852607286009618216" at="8,0,9,0" concept="9" trace="addText#(Ljava/lang/String;)V" />
-      <node id="8927119896327929255" at="9,0,10,0" concept="9" trace="addNode#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
-      <scope id="6852607286009618216" at="8,0,9,0">
+      <node id="6852607286009618216" at="11,0,12,0" concept="9" trace="addText#(Ljava/lang/String;)V" />
+      <node id="8927119896327929255" at="12,0,13,0" concept="9" trace="addNode#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4598452390225737169" at="13,0,14,0" concept="9" trace="addNodeRef#(Lorg/jetbrains/mps/openapi/model/SNode;)V" />
+      <node id="4598452390225734979" at="14,0,15,0" concept="9" trace="addException#(Ljava/lang/Throwable;)V" />
+      <node id="4598452390225735166" at="15,0,16,0" concept="9" trace="addClosure#(Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_void_P0_E0;Ljava/lang/String;)V" />
+      <node id="1768908716159921418" at="16,0,17,0" concept="9" trace="addSequence#(Ljetbrains/mps/project/Project;Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;ILjava/lang/String;)V" />
+      <scope id="6852607286009618216" at="11,0,12,0">
         <var name="text" id="6852607286009731683" />
       </scope>
-      <scope id="8927119896327929255" at="9,0,10,0">
+      <scope id="8927119896327929255" at="12,0,13,0">
         <var name="node" id="8927119896327929259" />
       </scope>
-      <unit id="6852607286009617748" at="7,0,11,0" name="jetbrains.mps.console.tool.ConsoleStream" />
+      <scope id="4598452390225737169" at="13,0,14,0">
+        <var name="node" id="4598452390225737173" />
+      </scope>
+      <scope id="4598452390225734979" at="14,0,15,0">
+        <var name="t" id="4598452390225734983" />
+      </scope>
+      <scope id="4598452390225735166" at="15,0,16,0">
+        <var name="closure" id="7600370246426637725" />
+        <var name="text" id="1768908716159494734" />
+      </scope>
+      <scope id="1768908716159921418" at="16,0,17,0">
+        <var name="project" id="1768908716159921750" />
+        <var name="resultDescription" id="1768908716159921757" />
+        <var name="results" id="1768908716159921752" />
+        <var name="resultsCount" id="1768908716159921755" />
+      </scope>
+      <unit id="6852607286009617748" at="10,0,18,0" name="jetbrains.mps.console.tool.ConsoleStream" />
     </file>
   </root>
   <root nodeRef="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)/7538089231777628716">
@@ -1396,77 +1474,98 @@
   </root>
   <root nodeRef="r:de40a5a4-f08c-4c67-ac43-e1f5c384f7d6(jetbrains.mps.console.tool)/8704812547333227493">
     <file name="ConsoleUtil.java">
-      <node id="5211727872447036873" at="31,70,32,78" concept="11" />
-      <node id="7455880135461708252" at="37,42,38,49" concept="5" />
-      <node id="7289758734946012671" at="39,7,40,19" concept="11" />
-      <node id="7289758734946012332" at="41,5,42,0" concept="12" />
-      <node id="1757086175614073320" at="42,0,43,411" concept="10" />
-      <node id="1757086175614073375" at="46,64,47,37" concept="11" />
-      <node id="1757086175614073420" at="49,31,50,0" concept="12" />
-      <node id="9131283282785176522" at="50,0,51,78" concept="10" />
-      <node id="9131283282785209451" at="51,78,52,51" concept="10" />
-      <node id="1783333098371256301" at="52,51,53,75" concept="5" />
-      <node id="4816973514251650430" at="53,75,54,71" concept="5" />
-      <node id="1757086175614073421" at="54,71,55,91" concept="10" />
-      <node id="1757086175614073431" at="56,62,57,158" concept="10" />
-      <node id="4107795503521854903" at="58,11,59,42" concept="11" />
-      <node id="7455880135461829018" at="61,44,62,58" concept="5" />
-      <node id="7455880135461752008" at="65,44,66,58" concept="5" />
-      <node id="4107795503521873549" at="69,5,70,17" concept="11" />
-      <node id="8704812547333227493" at="73,0,74,0" concept="13" trace="LOG" />
-      <node id="8704812547333613349" at="31,0,34,0" concept="14" trace="getGeneratedModelName#(Ljetbrains/mps/console/tool/ConsoleContext;)Ljava/lang/String;" />
-      <node id="7455880135461708252" at="36,49,39,7" concept="0" />
-      <node id="7455880135461708252" at="36,49,39,7" concept="8" />
-      <node id="7455880135461829018" at="60,40,63,9" concept="0" />
-      <node id="7455880135461829018" at="60,40,63,9" concept="8" />
-      <node id="7455880135461752008" at="64,38,67,9" concept="0" />
-      <node id="7455880135461752008" at="64,38,67,9" concept="8" />
-      <node id="1757086175614073366" at="45,0,49,0" concept="9" trace="relayQuery#(Ljetbrains/mps/make/script/IQuery;)null" />
-      <node id="7289758734946002821" at="35,73,41,5" concept="8" />
-      <node id="1757086175614073356" at="43,411,49,31" concept="10" />
-      <node id="4107795503521898641" at="57,158,68,7" concept="17" />
-      <node id="1757086175614073429" at="55,91,69,5" concept="8" />
-      <node id="4047697989688541365" at="35,0,72,0" concept="14" trace="make#(Ljetbrains/mps/project/Project;Lorg/jetbrains/mps/openapi/model/SModel;)Z" />
-      <scope id="8704812547333228555" at="31,70,32,78" />
-      <scope id="7455880135461708252" at="37,42,38,49" />
-      <scope id="1757086175614073374" at="46,64,47,37" />
-      <scope id="4107795503521898643" at="58,11,59,42" />
-      <scope id="7455880135461829018" at="61,44,62,58" />
-      <scope id="7455880135461752008" at="65,44,66,58" />
-      <scope id="8704812547333613349" at="31,0,34,0">
-        <var name="context" id="8704812547333231235" />
-      </scope>
-      <scope id="7455880135461708252" at="36,49,39,7" />
-      <scope id="4107795503521898644" at="60,0,63,9">
+      <node id="7455880135461708252" at="36,42,37,49" concept="5" />
+      <node id="7289758734946012671" at="38,7,39,19" concept="11" />
+      <node id="7289758734946012332" at="40,5,41,0" concept="12" />
+      <node id="1757086175614073320" at="41,0,42,411" concept="10" />
+      <node id="1757086175614073375" at="45,64,46,37" concept="11" />
+      <node id="1757086175614073420" at="48,31,49,0" concept="12" />
+      <node id="9131283282785176522" at="49,0,50,78" concept="10" />
+      <node id="9131283282785209451" at="50,78,51,51" concept="10" />
+      <node id="1783333098371256301" at="51,51,52,75" concept="5" />
+      <node id="4816973514251650430" at="52,75,53,71" concept="5" />
+      <node id="1757086175614073421" at="53,71,54,91" concept="10" />
+      <node id="1757086175614073431" at="55,62,56,158" concept="10" />
+      <node id="4107795503521854903" at="57,11,58,42" concept="11" />
+      <node id="7455880135461829018" at="60,44,61,58" concept="5" />
+      <node id="7455880135461752008" at="64,44,65,58" concept="5" />
+      <node id="4107795503521873549" at="68,5,69,17" concept="11" />
+      <node id="1125969196844503718" at="73,9,74,104" concept="5" />
+      <node id="7820875636627963753" at="76,41,77,66" concept="5" />
+      <node id="8704812547333227493" at="81,0,82,0" concept="13" trace="LOG" />
+      <node id="8655184070256908283" at="83,36,84,66" concept="11" />
+      <node id="8655184070256908283" at="85,5,86,16" concept="11" />
+      <node id="7455880135461708252" at="35,49,38,7" concept="0" />
+      <node id="7455880135461708252" at="35,49,38,7" concept="8" />
+      <node id="7455880135461829018" at="59,40,62,9" concept="0" />
+      <node id="7455880135461829018" at="59,40,62,9" concept="8" />
+      <node id="7455880135461752008" at="63,38,66,9" concept="0" />
+      <node id="7455880135461752008" at="63,38,66,9" concept="8" />
+      <node id="7820875636627963753" at="75,27,78,7" concept="0" />
+      <node id="7820875636627963753" at="75,27,78,7" concept="8" />
+      <node id="8655184070256908283" at="82,110,85,5" concept="8" />
+      <node id="1757086175614073366" at="44,0,48,0" concept="9" trace="relayQuery#(Ljetbrains/mps/make/script/IQuery;)null" />
+      <node id="7289758734946002821" at="34,73,40,5" concept="8" />
+      <node id="1757086175614073356" at="42,411,48,31" concept="10" />
+      <node id="8655184070256908283" at="82,0,88,0" concept="14" trace="check_xg48a4_a0a0a0c#(Lcom/intellij/openapi/project/Project;)Ljetbrains/mps/ide/findusages/view/UsagesViewTool;" />
+      <node id="7820875636627959262" at="72,101,79,5" concept="17" />
+      <node id="1125969196844614696" at="72,0,81,0" concept="14" trace="show#(Ljetbrains/mps/project/Project;Ljetbrains/mps/baseLanguage/closures/runtime/_FunctionTypes/_return_P0_E0;)V" />
+      <node id="4107795503521898641" at="56,158,67,7" concept="17" />
+      <node id="1757086175614073429" at="54,91,68,5" concept="8" />
+      <node id="4047697989688541365" at="34,0,71,0" concept="14" trace="make#(Ljetbrains/mps/project/Project;Lorg/jetbrains/mps/openapi/model/SModel;)Z" />
+      <scope id="7455880135461708252" at="36,42,37,49" />
+      <scope id="1757086175614073374" at="45,64,46,37" />
+      <scope id="4107795503521898643" at="57,11,58,42" />
+      <scope id="7455880135461829018" at="60,44,61,58" />
+      <scope id="7455880135461752008" at="64,44,65,58" />
+      <scope id="7820875636627959264" at="73,9,74,104" />
+      <scope id="7820875636627963753" at="76,41,77,66" />
+      <scope id="8655184070256908283" at="83,36,84,66" />
+      <scope id="7455880135461708252" at="35,49,38,7" />
+      <scope id="4107795503521898644" at="59,0,62,9">
         <var name="e" id="4107795503521898646" />
       </scope>
-      <scope id="4107795503521898650" at="60,40,63,9" />
-      <scope id="7455880135461829018" at="60,40,63,9" />
-      <scope id="4107795503521919624" at="64,0,67,9">
+      <scope id="4107795503521898650" at="59,40,62,9" />
+      <scope id="7455880135461829018" at="59,40,62,9" />
+      <scope id="4107795503521919624" at="63,0,66,9">
         <var name="e" id="4107795503521919625" />
       </scope>
-      <scope id="4107795503521919627" at="64,38,67,9" />
-      <scope id="7455880135461752008" at="64,38,67,9" />
-      <scope id="7289758734946002824" at="36,49,40,19" />
-      <scope id="1757086175614073366" at="45,0,49,0">
+      <scope id="4107795503521919627" at="63,38,66,9" />
+      <scope id="7455880135461752008" at="63,38,66,9" />
+      <scope id="7820875636627959265" at="75,0,78,7">
+        <var name="e" id="7820875636627959267" />
+      </scope>
+      <scope id="7820875636627959271" at="75,27,78,7" />
+      <scope id="7820875636627963753" at="75,27,78,7" />
+      <scope id="7289758734946002824" at="35,49,39,19" />
+      <scope id="1757086175614073366" at="44,0,48,0">
         <var name="query" id="1757086175614073367" />
       </scope>
-      <scope id="1757086175614073430" at="56,62,68,7">
+      <scope id="8655184070256908283" at="82,110,86,16" />
+      <scope id="8655184070256908283" at="82,0,88,0">
+        <var name="checkedDotOperand" id="8655184070256908283" />
+      </scope>
+      <scope id="1125969196844503566" at="72,101,79,5" />
+      <scope id="1125969196844614696" at="72,0,81,0">
+        <var name="p" id="1125969196844503638" />
+        <var name="results" id="1125969196844503650" />
+      </scope>
+      <scope id="1757086175614073430" at="55,62,67,7">
         <var name="future" id="1757086175614073432" />
       </scope>
-      <scope id="4047697989688541368" at="35,73,70,17">
+      <scope id="4047697989688541368" at="34,73,69,17">
         <var name="ctl" id="1757086175614073357" />
         <var name="messagesListName" id="9131283282785209454" />
         <var name="mvt" id="9131283282785176523" />
         <var name="scr" id="1757086175614073321" />
         <var name="session" id="1757086175614073422" />
       </scope>
-      <scope id="4047697989688541365" at="35,0,72,0">
+      <scope id="4047697989688541365" at="34,0,71,0">
         <var name="model" id="4047697989688753912" />
         <var name="project" id="4047697989688653034" />
       </scope>
-      <unit id="1757086175614073364" at="44,59,49,5" name="jetbrains.mps.console.tool.ConsoleUtil$1" />
-      <unit id="8704812547333227493" at="29,0,75,0" name="jetbrains.mps.console.tool.ConsoleUtil" />
+      <unit id="1757086175614073364" at="43,59,48,5" name="jetbrains.mps.console.tool.ConsoleUtil$1" />
+      <unit id="8704812547333227493" at="33,0,89,0" name="jetbrains.mps.console.tool.ConsoleUtil" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/languages/build.mps/jetbrains.mps.build.mps.mpl b/plugins/mps-build/languages/build.mps/jetbrains.mps.build.mps.mpl
index 64ed7f756577..b7f870e35f57 100644
--- a/plugins/mps-build/languages/build.mps/jetbrains.mps.build.mps.mpl
+++ b/plugins/mps-build/languages/build.mps/jetbrains.mps.build.mps.mpl
@@ -124,7 +124,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="698a8d22-a104-47a0-ba8d-10e3ec237f13" fqName="jetbrains.mps.build.workflow" version="-1" />
diff --git a/plugins/mps-build/languages/build.mps/languageModels/migration.mps b/plugins/mps-build/languages/build.mps/languageModels/migration.mps
index 73d244173990..b62854d40c9b 100644
--- a/plugins/mps-build/languages/build.mps/languageModels/migration.mps
+++ b/plugins/mps-build/languages/build.mps/languageModels/migration.mps
@@ -5,7 +5,7 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="-1" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -115,9 +115,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -155,9 +152,6 @@
       </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">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -198,9 +192,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="BuildJavaVersionMigration" />
     <node concept="3Tm1VV" id="6wglnuBf_2y" role="1B3o_S" />
-    <node concept="30mAcN" id="6wglnuBf_2z" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="6wglnuBf_2$" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated b/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated
index c36e617e503d..1528d0c1f7ba 100644
--- a/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated
+++ b/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="48s33f5b2j1dodg304j47ecbl83afos" />
+<dependencies version="2" modelHash="-dk4jew4ehq4wcy62zm1kh8w2xcsga3g" />
 
diff --git a/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/migration/generated b/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/migration/generated
index 00a768f6da0a..3ecba085aa86 100644
--- a/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/migration/generated
+++ b/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="amirv4iawvfyqsf97rgavllufxlqi9c" />
+<dependencies version="2" modelHash="-1l5xe1w9vj0oq1wvttej4rm1cpc1qzz" />
 
diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps
index 07b2d6265580..2270f99fc01b 100644
--- a/plugins/mps-build/solutions/mpsBuild/models/build.mps
+++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps
@@ -4313,6 +4313,12 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4Lv24c$DIVX" role="3bR37C">
+          <node concept="3bR9La" id="4Lv24c$DIVY" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6Lfd" resolve="jetbrains.mps.findUsages.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="3dkXFAFlpj8" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -16990,114 +16996,6 @@
         <ref role="nCB5Y" node="2eDSGe9d1oD" resolve="mps-workbench" />
       </node>
     </node>
-    <node concept="1E1JtA" id="6g2V7OQGaBC" role="3989C9">
-      <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="jetbrains.mps.console.blCommand.runtime" />
-      <property role="3LESm3" value="7726760c-95f5-4242-b36a-e069417e9d94" />
-      <property role="2GAjPV" value="false" />
-      <node concept="398BVA" id="6g2V7OQGaId" role="3LF7KH">
-        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
-        <node concept="2Ry0Ak" id="6g2V7OQGaIf" role="iGT6I">
-          <property role="2Ry0Am" value="plugins" />
-          <node concept="2Ry0Ak" id="6g2V7OQGaIh" role="2Ry0An">
-            <property role="2Ry0Am" value="console" />
-            <node concept="2Ry0Ak" id="6g2V7OQGaIj" role="2Ry0An">
-              <property role="2Ry0Am" value="lang" />
-              <node concept="2Ry0Ak" id="6g2V7OQGaIl" role="2Ry0An">
-                <property role="2Ry0Am" value="blCommandRuntime" />
-                <node concept="2Ry0Ak" id="6g2V7OQGaIn" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.console.blCommand.runtime.msd" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6g2V7OQGaIp" role="3bR37C">
-        <node concept="3bR9La" id="6g2V7OQGaIq" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1H905DlDUSw" resolve="MPS.OpenAPI" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6H$fNdM1W0B" role="3bR37C">
-        <node concept="3bR9La" id="6H$fNdM1W0C" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="2eDSGe9d1q1" resolve="MPS.Workbench" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6H$fNdM1W0D" role="3bR37C">
-        <node concept="3bR9La" id="6H$fNdM1W0E" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6H$fNdM1W0F" role="3bR37C">
-        <node concept="3bR9La" id="6H$fNdM1W0G" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1ia2VB5guYy" resolve="MPS.IDEA" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6H$fNdM1W0H" role="3bR37C">
-        <node concept="3bR9La" id="6H$fNdM1W0I" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6Lfd" resolve="jetbrains.mps.findUsages.runtime" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="2LKZD1vujd_" role="3bR37C">
-        <node concept="3bR9La" id="2LKZD1vujdA" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6zVPjtHjiFr" role="3bR37C">
-        <node concept="3bR9La" id="6zVPjtHjiFs" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="44LXwdzyvTi" resolve="Annotations" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6zVPjtHjiFt" role="3bR37C">
-        <node concept="3bR9La" id="6zVPjtHjiFu" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5sf_VS_raxe" role="3bR37C">
-        <node concept="3bR9La" id="5sf_VS_raxf" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5sf_VS_raxg" role="3bR37C">
-        <node concept="3bR9La" id="5sf_VS_raxh" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="2eDSGe9d1qi" resolve="jetbrains.mps.ide" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5sf_VS_raxi" role="3bR37C">
-        <node concept="3bR9La" id="5sf_VS_raxj" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="mXGwHwhVPj" resolve="JDK" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5G2W3aWDZmp" role="3bR37C">
-        <node concept="3bR9La" id="5G2W3aWDZmq" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7sij" resolve="jetbrains.mps.console.blCommand" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="1YN7ozXL8su" role="3bR37C">
-        <node concept="3bR9La" id="1YN7ozXL8sv" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="2__YwwoiqHd" role="3bR37C">
-        <node concept="3bR9La" id="2__YwwoiqHe" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
-        </node>
-      </node>
-    </node>
     <node concept="1E1JtD" id="7gQEwkA7rZZ" role="3989C9">
       <property role="BnDLt" value="true" />
       <property role="TrG5h" value="jetbrains.mps.console.base" />
@@ -17175,6 +17073,60 @@
             <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
           </node>
         </node>
+        <node concept="1SiIV0" id="3ZgZ1njY_KE" role="3bR37C">
+          <node concept="3bR9La" id="3ZgZ1njY_KF" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3ZgZ1njY_KG" role="3bR37C">
+          <node concept="3bR9La" id="3ZgZ1njY_KH" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlpe" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlpf" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6L0C" resolve="collections.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlpg" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlph" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlpi" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlpj" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlpk" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlpl" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlpo" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlpp" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlpq" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlpr" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="3ZgZ1njKuG9" resolve="jetbrains.mps.lang.smodel.query#5336086527852811409" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlps" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlpt" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
       </node>
       <node concept="1SiIV0" id="6bxzCAfre6O" role="3bR37C">
         <node concept="3bR9La" id="6bxzCAfre6P" role="1SiIV1">
@@ -17195,7 +17147,7 @@
       </node>
       <node concept="1SiIV0" id="54jax8WNF8$" role="3bR37C">
         <node concept="3bR9La" id="54jax8WNF8_" role="1SiIV1">
-          <property role="3bR36h" value="false" />
+          <property role="3bR36h" value="true" />
           <ref role="3bR37D" node="7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
         </node>
       </node>
@@ -17222,248 +17174,329 @@
           <ref role="3bR37D" node="4Hc8TwAmyoE" resolve="jetbrains.mps.tool.builder" />
         </node>
       </node>
+      <node concept="1SiIV0" id="WMsS6mDlpc" role="3bR37C">
+        <node concept="1Busua" id="WMsS6mDlpd" role="1SiIV1">
+          <ref role="1Busuk" node="3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
+        </node>
+      </node>
     </node>
-    <node concept="1E1JtD" id="7gQEwkA7sij" role="3989C9">
+    <node concept="1E1JtA" id="5Ve$VbUJDaP" role="3989C9">
       <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="jetbrains.mps.console.blCommand" />
-      <property role="3LESm3" value="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" />
+      <property role="TrG5h" value="jetbrains.mps.console.scripts.runtime" />
+      <property role="3LESm3" value="ebc06ad9-00ca-47ed-b5c6-bde710ea8f4d" />
       <property role="2GAjPV" value="false" />
-      <node concept="398BVA" id="7gQEwkA7sik" role="3LF7KH">
+      <node concept="398BVA" id="5Ve$VbUJGCK" role="3LF7KH">
         <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
-        <node concept="2Ry0Ak" id="7gQEwkA7sil" role="iGT6I">
+        <node concept="2Ry0Ak" id="5Ve$VbUJGJ6" role="iGT6I">
           <property role="2Ry0Am" value="plugins" />
-          <node concept="2Ry0Ak" id="7gQEwkA7sim" role="2Ry0An">
+          <node concept="2Ry0Ak" id="5Ve$VbUJH24" role="2Ry0An">
             <property role="2Ry0Am" value="console" />
-            <node concept="2Ry0Ak" id="7gQEwkA7sin" role="2Ry0An">
+            <node concept="2Ry0Ak" id="5Ve$VbUJHLs" role="2Ry0An">
               <property role="2Ry0Am" value="lang" />
-              <node concept="2Ry0Ak" id="7gQEwkA7sio" role="2Ry0An">
-                <property role="2Ry0Am" value="blCommand" />
-                <node concept="2Ry0Ak" id="7gQEwkA7sip" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.console.blCommand.mpl" />
+              <node concept="2Ry0Ak" id="5Ve$VbUJHLu" role="2Ry0An">
+                <property role="2Ry0Am" value="scriptsRuntime" />
+                <node concept="2Ry0Ak" id="5Ve$VbUJHLw" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.console.scripts.runtime.msd" />
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDs" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uDt" role="1SiIV1">
+      <node concept="1SiIV0" id="5Ve$VbUJHLy" role="3bR37C">
+        <node concept="3bR9La" id="5Ve$VbUJHLz" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
+          <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDu" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uDv" role="1SiIV1">
+      <node concept="1SiIV0" id="5Ve$VbUJHL$" role="3bR37C">
+        <node concept="3bR9La" id="5Ve$VbUJHL_" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDw" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uDx" role="1SiIV1">
+      <node concept="1SiIV0" id="5Ve$VbUJHLA" role="3bR37C">
+        <node concept="3bR9La" id="5Ve$VbUJHLB" role="1SiIV1">
           <property role="3bR36h" value="false" />
           <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uD$" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uD_" role="1SiIV1">
+      <node concept="1SiIV0" id="5Ve$VbUJHLC" role="3bR37C">
+        <node concept="3bR9La" id="5Ve$VbUJHLD" role="1SiIV1">
           <property role="3bR36h" value="false" />
           <ref role="3bR37D" node="1ia2VB5guYy" resolve="MPS.IDEA" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDA" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uDB" role="1SiIV1">
+      <node concept="1SiIV0" id="5Ve$VbUJHLE" role="3bR37C">
+        <node concept="3bR9La" id="5Ve$VbUJHLF" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1H905DlDUSw" resolve="MPS.OpenAPI" />
+          <ref role="3bR37D" node="6g2V7OQGaVw" resolve="jetbrains.mps.console.scripts" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDC" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uDD" role="1SiIV1">
+      <node concept="1SiIV0" id="5Ve$VbUJHLG" role="3bR37C">
+        <node concept="3bR9La" id="5Ve$VbUJHLH" role="1SiIV1">
           <property role="3bR36h" value="false" />
           <ref role="3bR37D" node="mXGwHwhVPj" resolve="JDK" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDE" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uDF" role="1SiIV1">
+      <node concept="1SiIV0" id="2rpbYG7qBbA" role="3bR37C">
+        <node concept="3bR9La" id="2rpbYG7qBbB" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+          <ref role="3bR37D" node="1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
         </node>
       </node>
-      <node concept="1E0d5M" id="7gQEwkA7uDG" role="1E1XAP">
-        <ref role="1E0d5P" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
-      </node>
-      <node concept="1E0d5M" id="6g2V7OQGb7o" role="1E1XAP">
-        <ref role="1E0d5P" node="6g2V7OQGaBC" resolve="jetbrains.mps.console.blCommand.runtime" />
+      <node concept="1SiIV0" id="2rpbYG7qBbC" role="3bR37C">
+        <node concept="3bR9La" id="2rpbYG7qBbD" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="7Kfy9QB6Lfd" resolve="jetbrains.mps.findUsages.runtime" />
+        </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDH" role="3bR37C">
-        <node concept="1Busua" id="7gQEwkA7uDI" role="1SiIV1">
-          <ref role="1Busuk" node="7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
+      <node concept="1SiIV0" id="5KpVuOe67NP" role="3bR37C">
+        <node concept="3bR9La" id="5KpVuOe67NQ" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="2eDSGe9d1qi" resolve="jetbrains.mps.ide" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDJ" role="3bR37C">
-        <node concept="1Busua" id="7gQEwkA7uDK" role="1SiIV1">
+    </node>
+    <node concept="1E1JtD" id="6g2V7OQGaVw" role="3989C9">
+      <property role="BnDLt" value="true" />
+      <property role="TrG5h" value="jetbrains.mps.console.scripts" />
+      <property role="3LESm3" value="f26691d2-0def-4c06-aec6-2cb90c4af0a4" />
+      <property role="2GAjPV" value="false" />
+      <node concept="1SiIV0" id="5Ve$VbUJHSN" role="3bR37C">
+        <node concept="1Busua" id="5Ve$VbUJHSO" role="1SiIV1">
           <ref role="1Busuk" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7gQEwkA7uDL" role="3bR37C">
-        <node concept="1Busua" id="7gQEwkA7uDM" role="1SiIV1">
-          <ref role="1Busuk" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+      <node concept="1SiIV0" id="2rpbYG7q$VA" role="3bR37C">
+        <node concept="3bR9La" id="2rpbYG7q$VB" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
         </node>
       </node>
-      <node concept="1yeLz9" id="7gQEwkA7uDN" role="1TViLv">
-        <property role="TrG5h" value="jetbrains.mps.console.blCommand#5336086527852811409" />
-        <property role="3LESm3" value="504d7390-81ca-4422-8018-f7290efa217f" />
-        <property role="2GAjPV" value="false" />
-        <node concept="1SiIV0" id="7gQEwkA7uDO" role="3bR37C">
-          <node concept="3bR9La" id="7gQEwkA7uDP" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
-          </node>
+      <node concept="1SiIV0" id="2rpbYG7q$VC" role="3bR37C">
+        <node concept="3bR9La" id="2rpbYG7q$VD" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
         </node>
-        <node concept="1SiIV0" id="7gQEwkA7uDQ" role="3bR37C">
-          <node concept="3bR9La" id="7gQEwkA7uDR" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="mXGwHwhVPj" resolve="JDK" />
+      </node>
+      <node concept="398BVA" id="6g2V7OQGaVx" role="3LF7KH">
+        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
+        <node concept="2Ry0Ak" id="6g2V7OQGaVy" role="iGT6I">
+          <property role="2Ry0Am" value="plugins" />
+          <node concept="2Ry0Ak" id="6g2V7OQGaVz" role="2Ry0An">
+            <property role="2Ry0Am" value="console" />
+            <node concept="2Ry0Ak" id="6g2V7OQGaV$" role="2Ry0An">
+              <property role="2Ry0Am" value="lang" />
+              <node concept="2Ry0Ak" id="6g2V7OQGaV_" role="2Ry0An">
+                <property role="2Ry0Am" value="scripts" />
+                <node concept="2Ry0Ak" id="5Ve$VbUJ$rf" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.console.scripts.mpl" />
+                </node>
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7gQEwkA7uDS" role="3bR37C">
-          <node concept="3bR9La" id="7gQEwkA7uDT" role="1SiIV1">
+      </node>
+      <node concept="1E0d5M" id="6g2V7OQGaVX" role="1E1XAP">
+        <ref role="1E0d5P" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
+      </node>
+      <node concept="1E0d5M" id="5Ve$VbUJHSM" role="1E1XAP">
+        <ref role="1E0d5P" node="5Ve$VbUJDaP" resolve="jetbrains.mps.console.scripts.runtime" />
+      </node>
+      <node concept="1yeLz9" id="6g2V7OQGaW4" role="1TViLv">
+        <property role="TrG5h" value="jetbrains.mps.console.scripts#1734392475490224704" />
+        <property role="3LESm3" value="b372f31d-dc58-46b6-ad0b-2e1b2e187b9d" />
+        <property role="2GAjPV" value="false" />
+        <node concept="1SiIV0" id="WMsS6mDlHW" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlHX" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7gQEwkA7sij" resolve="jetbrains.mps.console.blCommand" />
+            <ref role="3bR37D" node="3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7gQEwkA7uDU" role="3bR37C">
-          <node concept="3bR9La" id="7gQEwkA7uDV" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="WMsS6mDlHS" role="3bR37C">
+        <node concept="1Busua" id="WMsS6mDlHT" role="1SiIV1">
+          <ref role="1Busuk" node="3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
         </node>
-        <node concept="1SiIV0" id="6g2V7OQGb7p" role="3bR37C">
-          <node concept="3bR9La" id="6g2V7OQGb7q" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="6g2V7OQGaBC" resolve="jetbrains.mps.console.blCommand.runtime" />
+      </node>
+    </node>
+    <node concept="1E1JtA" id="7gQEwkA7nSV" role="3989C9">
+      <property role="BnDLt" value="true" />
+      <property role="TrG5h" value="jetbrains.mps.console" />
+      <property role="3LESm3" value="a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd" />
+      <property role="2GAjPV" value="true" />
+      <node concept="1E1SXE" id="1KUoCioUeUO" role="3bR37C">
+        <property role="1E1SXH" value="true" />
+        <ref role="1E1SXG" node="7gQEwkA7l8u" resolve="consoleTool" />
+      </node>
+      <node concept="398BVA" id="7gQEwkA7nXq" role="3LF7KH">
+        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
+        <node concept="2Ry0Ak" id="7gQEwkA7nY4" role="iGT6I">
+          <property role="2Ry0Am" value="plugins" />
+          <node concept="2Ry0Ak" id="7gQEwkA7nZY" role="2Ry0An">
+            <property role="2Ry0Am" value="console" />
+            <node concept="2Ry0Ak" id="5uhXTXon6Ov" role="2Ry0An">
+              <property role="2Ry0Am" value="jetbrains.mps.console.msd" />
+            </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6H$fNdM1Y6$" role="3bR37C">
-          <node concept="3bR9La" id="6H$fNdM1Y6_" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="7gQEwkA7o1k" role="3bR37C">
+        <node concept="3bR9La" id="7gQEwkA7o1l" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="2eDSGe9d1q1" resolve="MPS.Workbench" />
         </node>
-        <node concept="1SiIV0" id="5sf_VS_rcJL" role="3bR37C">
-          <node concept="3bR9La" id="5sf_VS_rcJM" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="7gQEwkA7o1m" role="3bR37C">
+        <node concept="3bR9La" id="7gQEwkA7o1n" role="1SiIV1">
+          <property role="3bR36h" value="true" />
+          <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
         </node>
-        <node concept="1SiIV0" id="5sf_VS_rcJN" role="3bR37C">
-          <node concept="3bR9La" id="5sf_VS_rcJO" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="1ia2VB5guYy" resolve="MPS.IDEA" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="7gQEwkA7uqQ" role="3bR37C">
+        <node concept="3bR9La" id="7gQEwkA7uqR" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
         </node>
-        <node concept="1SiIV0" id="5sf_VS_rcJP" role="3bR37C">
-          <node concept="3bR9La" id="5sf_VS_rcJQ" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="2eDSGe9d1qi" resolve="jetbrains.mps.ide" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="7gQEwkA7uqS" role="3bR37C">
+        <node concept="3bR9La" id="7gQEwkA7uqT" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="1ia2VB5guYy" resolve="MPS.IDEA" />
         </node>
-        <node concept="1SiIV0" id="3J6h25R9f7R" role="3bR37C">
-          <node concept="3bR9La" id="3J6h25R9f7S" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="7gQEwkA7uqU" role="3bR37C">
+        <node concept="3bR9La" id="7gQEwkA7uqV" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="mXGwHwhVPj" resolve="JDK" />
         </node>
-        <node concept="1SiIV0" id="1YN7ozXLa$L" role="3bR37C">
-          <node concept="3bR9La" id="1YN7ozXLa$M" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="FOuAeXcnsV" role="3bR37C">
+        <node concept="3bR9La" id="FOuAeXcnsW" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="44LXwdzyvTi" resolve="Annotations" />
         </node>
-        <node concept="1SiIV0" id="1YN7ozXLa$N" role="3bR37C">
-          <node concept="3bR9La" id="1YN7ozXLa$O" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="1un6sGuDXL6" role="3bR37C">
+        <node concept="3bR9La" id="1un6sGuDXL7" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="1jjYQYSj2TY" resolve="Ant" />
         </node>
-        <node concept="1SiIV0" id="igjXyugZvX" role="3bR37C">
-          <node concept="3bR9La" id="igjXyugZvY" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Kfy9QB6L0C" resolve="collections.runtime" />
-          </node>
+      </node>
+      <node concept="1SiIV0" id="7ZhY47zay8g" role="3bR37C">
+        <node concept="3bR9La" id="7ZhY47zay8h" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
         </node>
       </node>
-      <node concept="1SiIV0" id="7Wr$QiqWxu$" role="3bR37C">
-        <node concept="3bR9La" id="7Wr$QiqWxu_" role="1SiIV1">
+      <node concept="1SiIV0" id="6bxzCAfrge6" role="3bR37C">
+        <node concept="3bR9La" id="6bxzCAfrge7" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
+          <ref role="3bR37D" node="1TaHNgiIbIZ" resolve="MPS.Editor" />
         </node>
       </node>
-      <node concept="1SiIV0" id="6g2V7OQGb7k" role="3bR37C">
-        <node concept="3bR9La" id="6g2V7OQGb7l" role="1SiIV1">
+      <node concept="1SiIV0" id="7Jzw3XJN4Mb" role="3bR37C">
+        <node concept="3bR9La" id="7Jzw3XJN4Mc" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
+          <ref role="3bR37D" node="1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
         </node>
       </node>
-      <node concept="1SiIV0" id="6g2V7OQGb7m" role="3bR37C">
-        <node concept="3bR9La" id="6g2V7OQGb7n" role="1SiIV1">
+      <node concept="1SiIV0" id="7Jzw3XJN4Md" role="3bR37C">
+        <node concept="3bR9La" id="7Jzw3XJN4Me" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          <ref role="3bR37D" node="7Kfy9QB6L2l" resolve="jetbrains.mps.baseLanguage.logging" />
         </node>
       </node>
-      <node concept="1SiIV0" id="2LKZD1vujjF" role="3bR37C">
-        <node concept="3bR9La" id="2LKZD1vujjG" role="1SiIV1">
+      <node concept="1SiIV0" id="6NdQLvrt0BK" role="3bR37C">
+        <node concept="3bR9La" id="6NdQLvrt0BL" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="6g2V7OQGaBC" resolve="jetbrains.mps.console.blCommand.runtime" />
+          <ref role="3bR37D" node="7Kfy9QB6Lg2" resolve="jetbrains.mps.smodel.resources" />
         </node>
       </node>
-      <node concept="1SiIV0" id="6M9lfhDABKk" role="3bR37C">
-        <node concept="3bR9La" id="6M9lfhDABKl" role="1SiIV1">
+      <node concept="1SiIV0" id="6NdQLvrt0BM" role="3bR37C">
+        <node concept="3bR9La" id="6NdQLvrt0BN" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
+          <ref role="3bR37D" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
         </node>
       </node>
-      <node concept="1E0d5M" id="5sf_VS_rcJJ" role="1E1XAP">
-        <ref role="1E0d5P" node="2eDSGe9d1qi" resolve="jetbrains.mps.ide" />
+      <node concept="1SiIV0" id="6NdQLvrt0BO" role="3bR37C">
+        <node concept="3bR9La" id="6NdQLvrt0BP" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="1ZViq9oppal" resolve="jetbrains.mps.make.facets" />
+        </node>
       </node>
-      <node concept="1E0d5M" id="5sf_VS_rcJK" role="1E1XAP">
-        <ref role="1E0d5P" node="1TaHNgiIbJb" resolve="MPS.Platform" />
+      <node concept="1SiIV0" id="6NdQLvrt0BQ" role="3bR37C">
+        <node concept="3bR9La" id="6NdQLvrt0BR" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+        </node>
       </node>
-      <node concept="1SiIV0" id="5G2W3aWDXdG" role="3bR37C">
-        <node concept="3bR9La" id="5G2W3aWDXdH" role="1SiIV1">
+      <node concept="1SiIV0" id="6NdQLvrt0BS" role="3bR37C">
+        <node concept="3bR9La" id="6NdQLvrt0BT" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="2eDSGe9d1qi" resolve="jetbrains.mps.ide" />
+          <ref role="3bR37D" node="7Kfy9QB6LgV" resolve="jetbrains.mps.make.runtime" />
         </node>
       </node>
-      <node concept="1SiIV0" id="5G2W3aWDXdI" role="3bR37C">
-        <node concept="1Busua" id="5G2W3aWDXdJ" role="1SiIV1">
-          <ref role="1Busuk" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+    </node>
+    <node concept="1E1JtA" id="5kU0oYlfvWH" role="3989C9">
+      <property role="BnDLt" value="true" />
+      <property role="TrG5h" value="jetbrains.mps.console.actions" />
+      <property role="3LESm3" value="95b39faf-7eaf-4ae3-bd92-fbd3cc28bfab" />
+      <property role="2GAjPV" value="false" />
+      <node concept="398BVA" id="5kU0oYlfy5Q" role="3LF7KH">
+        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
+        <node concept="2Ry0Ak" id="5kU0oYlfyb$" role="iGT6I">
+          <property role="2Ry0Am" value="plugins" />
+          <node concept="2Ry0Ak" id="5kU0oYlfyC4" role="2Ry0An">
+            <property role="2Ry0Am" value="console" />
+            <node concept="2Ry0Ak" id="5kU0oYlfyNu" role="2Ry0An">
+              <property role="2Ry0Am" value="jetbrains.mps.console.actions.msd" />
+            </node>
+          </node>
         </node>
       </node>
-      <node concept="1SiIV0" id="3J6h25R9f7N" role="3bR37C">
-        <node concept="3bR9La" id="3J6h25R9f7O" role="1SiIV1">
+      <node concept="1SiIV0" id="5kU0oYlfBeF" role="3bR37C">
+        <node concept="3bR9La" id="5kU0oYlfBeG" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbIZ" resolve="MPS.Editor" />
+          <ref role="3bR37D" node="6g2V7OQGaJT" resolve="jetbrains.mps.console.ideCommands" />
         </node>
       </node>
-      <node concept="1SiIV0" id="1YN7ozXLa$H" role="3bR37C">
-        <node concept="3bR9La" id="1YN7ozXLa$I" role="1SiIV1">
+      <node concept="1SiIV0" id="5kU0oYlfBeJ" role="3bR37C">
+        <node concept="3bR9La" id="5kU0oYlfBeK" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1d41uYMTVPB" resolve="jetbrains.mps.lang.scopes.runtime" />
+          <ref role="3bR37D" node="7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
         </node>
       </node>
-      <node concept="1SiIV0" id="1YN7ozXLa$J" role="3bR37C">
-        <node concept="3bR9La" id="1YN7ozXLa$K" role="1SiIV1">
+      <node concept="1SiIV0" id="5kU0oYlfBeL" role="3bR37C">
+        <node concept="3bR9La" id="5kU0oYlfBeM" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
+          <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
         </node>
       </node>
-      <node concept="1SiIV0" id="6CzTsxz0Byv" role="3bR37C">
-        <node concept="1Busua" id="6CzTsxz0Byw" role="1SiIV1">
-          <ref role="1Busuk" node="7Kfy9QB6L2F" resolve="jetbrains.mps.baseLanguage.tuples" />
+      <node concept="1SiIV0" id="5kU0oYlfBeN" role="3bR37C">
+        <node concept="3bR9La" id="5kU0oYlfBeO" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
         </node>
       </node>
-      <node concept="1E0d5M" id="1rWLXuUj2ZP" role="1E1XAP">
-        <ref role="1E0d5P" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+      <node concept="1SiIV0" id="5kU0oYlfBeP" role="3bR37C">
+        <node concept="3bR9La" id="5kU0oYlfBeQ" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
+        </node>
+      </node>
+      <node concept="1SiIV0" id="5kU0oYlfBeR" role="3bR37C">
+        <node concept="3bR9La" id="5kU0oYlfBeS" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="1ia2VB5guYy" resolve="MPS.IDEA" />
+        </node>
+      </node>
+      <node concept="1SiIV0" id="71aLKqdKHv2" role="3bR37C">
+        <node concept="3bR9La" id="71aLKqdKHv3" role="1SiIV1">
+          <property role="3bR36h" value="false" />
+          <ref role="3bR37D" node="71aLKqdKvPp" resolve="jetbrains.mps.ide.make" />
+        </node>
       </node>
     </node>
     <node concept="1E1JtA" id="1whNchE_L1C" role="3989C9">
@@ -17630,6 +17663,24 @@
             <ref role="3bR37D" node="1whNchE_L1C" resolve="jetbrains.mps.console.ideCommands.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="3ZgZ1njY_MA" role="3bR37C">
+          <node concept="3bR9La" id="3ZgZ1njY_MB" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlZy" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlZz" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDlZA" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDlZB" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
       </node>
       <node concept="1SiIV0" id="6g2V7OQGaKA" role="3bR37C">
         <node concept="3bR9La" id="6g2V7OQGaKB" role="1SiIV1">
@@ -17672,479 +17723,160 @@
           <ref role="3bR37D" node="1TaHNgiIbIZ" resolve="MPS.Editor" />
         </node>
       </node>
-      <node concept="1SiIV0" id="1whNchE_I0B" role="3bR37C">
-        <node concept="3bR9La" id="1whNchE_I0C" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="1whNchE_I0D" role="3bR37C">
-        <node concept="3bR9La" id="1whNchE_I0E" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1d41uYMTVPB" resolve="jetbrains.mps.lang.scopes.runtime" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="1whNchE_PFA" role="3bR37C">
-        <node concept="1Busua" id="1whNchE_PFB" role="1SiIV1">
-          <ref role="1Busuk" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="1whNchE_PFC" role="3bR37C">
-        <node concept="1Busua" id="1whNchE_PFD" role="1SiIV1">
-          <ref role="1Busuk" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="1whNchE_PFE" role="3bR37C">
-        <node concept="1Busua" id="1whNchE_PFF" role="1SiIV1">
-          <ref role="1Busuk" node="7gQEwkA7sij" resolve="jetbrains.mps.console.blCommand" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="1whNchEFJ$z" role="3bR37C">
-        <node concept="3bR9La" id="1whNchEFJ$$" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1whNchE_L1C" resolve="jetbrains.mps.console.ideCommands.runtime" />
-        </node>
-      </node>
-    </node>
-    <node concept="1E1JtA" id="5xAm1dXBy5N" role="3989C9">
-      <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="jetbrains.mps.console.internalCommands.runtime" />
-      <property role="3LESm3" value="1a497c57-0f1a-4016-8042-2ff7591fe612" />
-      <property role="2GAjPV" value="false" />
-      <node concept="398BVA" id="5xAm1dXB_lh" role="3LF7KH">
-        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
-        <node concept="2Ry0Ak" id="5xAm1dXB_rF" role="iGT6I">
-          <property role="2Ry0Am" value="plugins" />
-          <node concept="2Ry0Ak" id="5xAm1dXBA8l" role="2Ry0An">
-            <property role="2Ry0Am" value="console" />
-            <node concept="2Ry0Ak" id="5xAm1dXBAxR" role="2Ry0An">
-              <property role="2Ry0Am" value="lang" />
-              <node concept="2Ry0Ak" id="5xAm1dXBB1L" role="2Ry0An">
-                <property role="2Ry0Am" value="internalCommandsRuntime" />
-                <node concept="2Ry0Ak" id="5xAm1dXBBrj" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.console.internalCommands.runtime.msd" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5xAm1dXBBC5" role="3bR37C">
-        <node concept="3bR9La" id="5xAm1dXBBC6" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
-        </node>
-      </node>
-    </node>
-    <node concept="1E1JtD" id="6g2V7OQGaPX" role="3989C9">
-      <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="jetbrains.mps.console.internalCommands" />
-      <property role="3LESm3" value="995a7394-7f76-4b8b-a929-c53448708106" />
-      <property role="2GAjPV" value="false" />
-      <node concept="398BVA" id="6g2V7OQGaPY" role="3LF7KH">
-        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
-        <node concept="2Ry0Ak" id="6g2V7OQGaPZ" role="iGT6I">
-          <property role="2Ry0Am" value="plugins" />
-          <node concept="2Ry0Ak" id="6g2V7OQGaQ0" role="2Ry0An">
-            <property role="2Ry0Am" value="console" />
-            <node concept="2Ry0Ak" id="6g2V7OQGaQ1" role="2Ry0An">
-              <property role="2Ry0Am" value="lang" />
-              <node concept="2Ry0Ak" id="6g2V7OQGaQ2" role="2Ry0An">
-                <property role="2Ry0Am" value="internalCommands" />
-                <node concept="2Ry0Ak" id="6g2V7OQGaQ3" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.console.internalCommands.mpl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6g2V7OQGaQo" role="3bR37C">
-        <node concept="3bR9La" id="6g2V7OQGaQp" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
-        </node>
-      </node>
-      <node concept="1E0d5M" id="6g2V7OQGaQq" role="1E1XAP">
-        <ref role="1E0d5P" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
-      </node>
-      <node concept="1E0d5M" id="5xAm1dXBBJ7" role="1E1XAP">
-        <ref role="1E0d5P" node="5xAm1dXBy5N" resolve="jetbrains.mps.console.internalCommands.runtime" />
-      </node>
-      <node concept="1SiIV0" id="6g2V7OQGaQt" role="3bR37C">
-        <node concept="1Busua" id="6g2V7OQGaQu" role="1SiIV1">
-          <ref role="1Busuk" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
-        </node>
-      </node>
-      <node concept="1yeLz9" id="6g2V7OQGaQx" role="1TViLv">
-        <property role="TrG5h" value="jetbrains.mps.console.internalCommands#8483375838963160298" />
-        <property role="3LESm3" value="617a0779-e3b2-43a9-8c87-970aed8e6992" />
-        <property role="2GAjPV" value="false" />
-        <node concept="1SiIV0" id="5xAm1dXBBJ8" role="3bR37C">
-          <node concept="3bR9La" id="5xAm1dXBBJ9" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="5xAm1dXBy5N" resolve="jetbrains.mps.console.internalCommands.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5xAm1dXBBJa" role="3bR37C">
-          <node concept="3bR9La" id="5xAm1dXBBJb" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="I5thv1fet1" role="3bR37C">
-          <node concept="3bR9La" id="I5thv1fet2" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="I5thv1fet3" role="3bR37C">
-          <node concept="3bR9La" id="I5thv1fet4" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="I5thv1fet5" role="3bR37C">
-          <node concept="3bR9La" id="I5thv1fet6" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="6g2V7OQGaPX" resolve="jetbrains.mps.console.internalCommands" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="I5thv1fet7" role="3bR37C">
-          <node concept="3bR9La" id="I5thv1fet8" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7gQEwkA7sij" resolve="jetbrains.mps.console.blCommand" />
-          </node>
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6g2V7OQGb60" role="3bR37C">
-        <node concept="3bR9La" id="6g2V7OQGb61" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="k39Sx_$Oc2" role="3bR37C">
-        <node concept="1Busua" id="k39Sx_$Oc3" role="1SiIV1">
-          <ref role="1Busuk" node="7gQEwkA7sij" resolve="jetbrains.mps.console.blCommand" />
-        </node>
-      </node>
-    </node>
-    <node concept="1E1JtA" id="5Ve$VbUJDaP" role="3989C9">
-      <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="jetbrains.mps.console.scripts.runtime" />
-      <property role="3LESm3" value="ebc06ad9-00ca-47ed-b5c6-bde710ea8f4d" />
-      <property role="2GAjPV" value="false" />
-      <node concept="398BVA" id="5Ve$VbUJGCK" role="3LF7KH">
-        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
-        <node concept="2Ry0Ak" id="5Ve$VbUJGJ6" role="iGT6I">
-          <property role="2Ry0Am" value="plugins" />
-          <node concept="2Ry0Ak" id="5Ve$VbUJH24" role="2Ry0An">
-            <property role="2Ry0Am" value="console" />
-            <node concept="2Ry0Ak" id="5Ve$VbUJHLs" role="2Ry0An">
-              <property role="2Ry0Am" value="lang" />
-              <node concept="2Ry0Ak" id="5Ve$VbUJHLu" role="2Ry0An">
-                <property role="2Ry0Am" value="scriptsRuntime" />
-                <node concept="2Ry0Ak" id="5Ve$VbUJHLw" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.console.scripts.runtime.msd" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5Ve$VbUJHLy" role="3bR37C">
-        <node concept="3bR9La" id="5Ve$VbUJHLz" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5Ve$VbUJHL$" role="3bR37C">
-        <node concept="3bR9La" id="5Ve$VbUJHL_" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5Ve$VbUJHLA" role="3bR37C">
-        <node concept="3bR9La" id="5Ve$VbUJHLB" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5Ve$VbUJHLC" role="3bR37C">
-        <node concept="3bR9La" id="5Ve$VbUJHLD" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1ia2VB5guYy" resolve="MPS.IDEA" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5Ve$VbUJHLE" role="3bR37C">
-        <node concept="3bR9La" id="5Ve$VbUJHLF" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="6g2V7OQGaVw" resolve="jetbrains.mps.console.scripts" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5Ve$VbUJHLG" role="3bR37C">
-        <node concept="3bR9La" id="5Ve$VbUJHLH" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="mXGwHwhVPj" resolve="JDK" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="2rpbYG7qBbA" role="3bR37C">
-        <node concept="3bR9La" id="2rpbYG7qBbB" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="2rpbYG7qBbC" role="3bR37C">
-        <node concept="3bR9La" id="2rpbYG7qBbD" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6Lfd" resolve="jetbrains.mps.findUsages.runtime" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="5KpVuOe67NP" role="3bR37C">
-        <node concept="3bR9La" id="5KpVuOe67NQ" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="2eDSGe9d1qi" resolve="jetbrains.mps.ide" />
-        </node>
-      </node>
-    </node>
-    <node concept="1E1JtD" id="6g2V7OQGaVw" role="3989C9">
-      <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="jetbrains.mps.console.scripts" />
-      <property role="3LESm3" value="f26691d2-0def-4c06-aec6-2cb90c4af0a4" />
-      <property role="2GAjPV" value="false" />
-      <node concept="1SiIV0" id="5Ve$VbUJHSN" role="3bR37C">
-        <node concept="1Busua" id="5Ve$VbUJHSO" role="1SiIV1">
-          <ref role="1Busuk" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="2rpbYG7q$VA" role="3bR37C">
-        <node concept="3bR9La" id="2rpbYG7q$VB" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="2rpbYG7q$VC" role="3bR37C">
-        <node concept="3bR9La" id="2rpbYG7q$VD" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-        </node>
-      </node>
-      <node concept="398BVA" id="6g2V7OQGaVx" role="3LF7KH">
-        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
-        <node concept="2Ry0Ak" id="6g2V7OQGaVy" role="iGT6I">
-          <property role="2Ry0Am" value="plugins" />
-          <node concept="2Ry0Ak" id="6g2V7OQGaVz" role="2Ry0An">
-            <property role="2Ry0Am" value="console" />
-            <node concept="2Ry0Ak" id="6g2V7OQGaV$" role="2Ry0An">
-              <property role="2Ry0Am" value="lang" />
-              <node concept="2Ry0Ak" id="6g2V7OQGaV_" role="2Ry0An">
-                <property role="2Ry0Am" value="scripts" />
-                <node concept="2Ry0Ak" id="5Ve$VbUJ$rf" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.console.scripts.mpl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1E0d5M" id="6g2V7OQGaVX" role="1E1XAP">
-        <ref role="1E0d5P" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
-      </node>
-      <node concept="1E0d5M" id="5Ve$VbUJHSM" role="1E1XAP">
-        <ref role="1E0d5P" node="5Ve$VbUJDaP" resolve="jetbrains.mps.console.scripts.runtime" />
-      </node>
-      <node concept="1yeLz9" id="6g2V7OQGaW4" role="1TViLv">
-        <property role="TrG5h" value="jetbrains.mps.console.scripts#1734392475490224704" />
-        <property role="3LESm3" value="b372f31d-dc58-46b6-ad0b-2e1b2e187b9d" />
-        <property role="2GAjPV" value="false" />
-        <node concept="1SiIV0" id="2rpbYG7q$VE" role="3bR37C">
-          <node concept="3bR9La" id="2rpbYG7q$VF" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7gQEwkA7sij" resolve="jetbrains.mps.console.blCommand" />
-          </node>
-        </node>
-      </node>
-      <node concept="1SiIV0" id="2jRIeHQ2ZBV" role="3bR37C">
-        <node concept="1Busua" id="2jRIeHQ2ZBW" role="1SiIV1">
-          <ref role="1Busuk" node="7gQEwkA7sij" resolve="jetbrains.mps.console.blCommand" />
-        </node>
-      </node>
-    </node>
-    <node concept="1E1JtA" id="7gQEwkA7nSV" role="3989C9">
-      <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="jetbrains.mps.console" />
-      <property role="3LESm3" value="a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd" />
-      <property role="2GAjPV" value="true" />
-      <node concept="1E1SXE" id="1KUoCioUeUO" role="3bR37C">
-        <property role="1E1SXH" value="true" />
-        <ref role="1E1SXG" node="7gQEwkA7l8u" resolve="consoleTool" />
-      </node>
-      <node concept="398BVA" id="7gQEwkA7nXq" role="3LF7KH">
-        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
-        <node concept="2Ry0Ak" id="7gQEwkA7nY4" role="iGT6I">
-          <property role="2Ry0Am" value="plugins" />
-          <node concept="2Ry0Ak" id="7gQEwkA7nZY" role="2Ry0An">
-            <property role="2Ry0Am" value="console" />
-            <node concept="2Ry0Ak" id="5uhXTXon6Ov" role="2Ry0An">
-              <property role="2Ry0Am" value="jetbrains.mps.console.msd" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1SiIV0" id="7gQEwkA7o1k" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7o1l" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="2eDSGe9d1q1" resolve="MPS.Workbench" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="7gQEwkA7o1m" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7o1n" role="1SiIV1">
-          <property role="3bR36h" value="true" />
-          <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="7gQEwkA7uqQ" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uqR" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="7gQEwkA7uqS" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uqT" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1ia2VB5guYy" resolve="MPS.IDEA" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="7gQEwkA7uqU" role="3bR37C">
-        <node concept="3bR9La" id="7gQEwkA7uqV" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="mXGwHwhVPj" resolve="JDK" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="FOuAeXcnsV" role="3bR37C">
-        <node concept="3bR9La" id="FOuAeXcnsW" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="44LXwdzyvTi" resolve="Annotations" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="1un6sGuDXL6" role="3bR37C">
-        <node concept="3bR9La" id="1un6sGuDXL7" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1jjYQYSj2TY" resolve="Ant" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="7ZhY47zay8g" role="3bR37C">
-        <node concept="3bR9La" id="7ZhY47zay8h" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6bxzCAfrge6" role="3bR37C">
-        <node concept="3bR9La" id="6bxzCAfrge7" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbIZ" resolve="MPS.Editor" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="7Jzw3XJN4Mb" role="3bR37C">
-        <node concept="3bR9La" id="7Jzw3XJN4Mc" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="7Jzw3XJN4Md" role="3bR37C">
-        <node concept="3bR9La" id="7Jzw3XJN4Me" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6L2l" resolve="jetbrains.mps.baseLanguage.logging" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6NdQLvrt0BK" role="3bR37C">
-        <node concept="3bR9La" id="6NdQLvrt0BL" role="1SiIV1">
+      <node concept="1SiIV0" id="1whNchE_I0B" role="3bR37C">
+        <node concept="3bR9La" id="1whNchE_I0C" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6Lg2" resolve="jetbrains.mps.smodel.resources" />
+          <ref role="3bR37D" node="7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
         </node>
       </node>
-      <node concept="1SiIV0" id="6NdQLvrt0BM" role="3bR37C">
-        <node concept="3bR9La" id="6NdQLvrt0BN" role="1SiIV1">
+      <node concept="1SiIV0" id="1whNchE_I0D" role="3bR37C">
+        <node concept="3bR9La" id="1whNchE_I0E" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          <ref role="3bR37D" node="1d41uYMTVPB" resolve="jetbrains.mps.lang.scopes.runtime" />
         </node>
       </node>
-      <node concept="1SiIV0" id="6NdQLvrt0BO" role="3bR37C">
-        <node concept="3bR9La" id="6NdQLvrt0BP" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1ZViq9oppal" resolve="jetbrains.mps.make.facets" />
+      <node concept="1SiIV0" id="1whNchE_PFA" role="3bR37C">
+        <node concept="1Busua" id="1whNchE_PFB" role="1SiIV1">
+          <ref role="1Busuk" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
         </node>
       </node>
-      <node concept="1SiIV0" id="6NdQLvrt0BQ" role="3bR37C">
-        <node concept="3bR9La" id="6NdQLvrt0BR" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+      <node concept="1SiIV0" id="1whNchE_PFC" role="3bR37C">
+        <node concept="1Busua" id="1whNchE_PFD" role="1SiIV1">
+          <ref role="1Busuk" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
         </node>
       </node>
-      <node concept="1SiIV0" id="6NdQLvrt0BS" role="3bR37C">
-        <node concept="3bR9La" id="6NdQLvrt0BT" role="1SiIV1">
+      <node concept="1SiIV0" id="WMsS6mDlZu" role="3bR37C">
+        <node concept="3bR9La" id="WMsS6mDlZv" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6LgV" resolve="jetbrains.mps.make.runtime" />
+          <ref role="3bR37D" node="1whNchE_L1C" resolve="jetbrains.mps.console.ideCommands.runtime" />
+        </node>
+      </node>
+      <node concept="1SiIV0" id="WMsS6mDlZw" role="3bR37C">
+        <node concept="1Busua" id="WMsS6mDlZx" role="1SiIV1">
+          <ref role="1Busuk" node="3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
         </node>
       </node>
     </node>
-    <node concept="1E1JtA" id="5kU0oYlfvWH" role="3989C9">
+    <node concept="1E1JtA" id="5xAm1dXBy5N" role="3989C9">
       <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="jetbrains.mps.console.actions" />
-      <property role="3LESm3" value="95b39faf-7eaf-4ae3-bd92-fbd3cc28bfab" />
+      <property role="TrG5h" value="jetbrains.mps.console.internalCommands.runtime" />
+      <property role="3LESm3" value="1a497c57-0f1a-4016-8042-2ff7591fe612" />
       <property role="2GAjPV" value="false" />
-      <node concept="398BVA" id="5kU0oYlfy5Q" role="3LF7KH">
+      <node concept="398BVA" id="5xAm1dXB_lh" role="3LF7KH">
         <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
-        <node concept="2Ry0Ak" id="5kU0oYlfyb$" role="iGT6I">
+        <node concept="2Ry0Ak" id="5xAm1dXB_rF" role="iGT6I">
           <property role="2Ry0Am" value="plugins" />
-          <node concept="2Ry0Ak" id="5kU0oYlfyC4" role="2Ry0An">
+          <node concept="2Ry0Ak" id="5xAm1dXBA8l" role="2Ry0An">
             <property role="2Ry0Am" value="console" />
-            <node concept="2Ry0Ak" id="5kU0oYlfyNu" role="2Ry0An">
-              <property role="2Ry0Am" value="jetbrains.mps.console.actions.msd" />
+            <node concept="2Ry0Ak" id="5xAm1dXBAxR" role="2Ry0An">
+              <property role="2Ry0Am" value="lang" />
+              <node concept="2Ry0Ak" id="5xAm1dXBB1L" role="2Ry0An">
+                <property role="2Ry0Am" value="internalCommandsRuntime" />
+                <node concept="2Ry0Ak" id="5xAm1dXBBrj" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.console.internalCommands.runtime.msd" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="1SiIV0" id="5kU0oYlfBeF" role="3bR37C">
-        <node concept="3bR9La" id="5kU0oYlfBeG" role="1SiIV1">
+      <node concept="1SiIV0" id="5xAm1dXBBC5" role="3bR37C">
+        <node concept="3bR9La" id="5xAm1dXBBC6" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="6g2V7OQGaJT" resolve="jetbrains.mps.console.ideCommands" />
+          <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
         </node>
       </node>
-      <node concept="1SiIV0" id="5kU0oYlfBeJ" role="3bR37C">
-        <node concept="3bR9La" id="5kU0oYlfBeK" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+    </node>
+    <node concept="1E1JtD" id="6g2V7OQGaPX" role="3989C9">
+      <property role="BnDLt" value="true" />
+      <property role="TrG5h" value="jetbrains.mps.console.internalCommands" />
+      <property role="3LESm3" value="995a7394-7f76-4b8b-a929-c53448708106" />
+      <property role="2GAjPV" value="false" />
+      <node concept="398BVA" id="6g2V7OQGaPY" role="3LF7KH">
+        <ref role="398BVh" node="5yMuYWFN8P8" resolve="mps_home" />
+        <node concept="2Ry0Ak" id="6g2V7OQGaPZ" role="iGT6I">
+          <property role="2Ry0Am" value="plugins" />
+          <node concept="2Ry0Ak" id="6g2V7OQGaQ0" role="2Ry0An">
+            <property role="2Ry0Am" value="console" />
+            <node concept="2Ry0Ak" id="6g2V7OQGaQ1" role="2Ry0An">
+              <property role="2Ry0Am" value="lang" />
+              <node concept="2Ry0Ak" id="6g2V7OQGaQ2" role="2Ry0An">
+                <property role="2Ry0Am" value="internalCommands" />
+                <node concept="2Ry0Ak" id="6g2V7OQGaQ3" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.console.internalCommands.mpl" />
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
-      <node concept="1SiIV0" id="5kU0oYlfBeL" role="3bR37C">
-        <node concept="3bR9La" id="5kU0oYlfBeM" role="1SiIV1">
+      <node concept="1SiIV0" id="6g2V7OQGaQo" role="3bR37C">
+        <node concept="3bR9La" id="6g2V7OQGaQp" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1TaHNgiIbJb" resolve="MPS.Platform" />
+          <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
         </node>
       </node>
-      <node concept="1SiIV0" id="5kU0oYlfBeN" role="3bR37C">
-        <node concept="3bR9La" id="5kU0oYlfBeO" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
+      <node concept="1E0d5M" id="6g2V7OQGaQq" role="1E1XAP">
+        <ref role="1E0d5P" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
+      </node>
+      <node concept="1E0d5M" id="5xAm1dXBBJ7" role="1E1XAP">
+        <ref role="1E0d5P" node="5xAm1dXBy5N" resolve="jetbrains.mps.console.internalCommands.runtime" />
+      </node>
+      <node concept="1SiIV0" id="6g2V7OQGaQt" role="3bR37C">
+        <node concept="1Busua" id="6g2V7OQGaQu" role="1SiIV1">
+          <ref role="1Busuk" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
         </node>
       </node>
-      <node concept="1SiIV0" id="5kU0oYlfBeP" role="3bR37C">
-        <node concept="3bR9La" id="5kU0oYlfBeQ" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
+      <node concept="1yeLz9" id="6g2V7OQGaQx" role="1TViLv">
+        <property role="TrG5h" value="jetbrains.mps.console.internalCommands#8483375838963160298" />
+        <property role="3LESm3" value="617a0779-e3b2-43a9-8c87-970aed8e6992" />
+        <property role="2GAjPV" value="false" />
+        <node concept="1SiIV0" id="5xAm1dXBBJ8" role="3bR37C">
+          <node concept="3bR9La" id="5xAm1dXBBJ9" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="5xAm1dXBy5N" resolve="jetbrains.mps.console.internalCommands.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5xAm1dXBBJa" role="3bR37C">
+          <node concept="3bR9La" id="5xAm1dXBBJb" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="I5thv1fet1" role="3bR37C">
+          <node concept="3bR9La" id="I5thv1fet2" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7gQEwkA7nSV" resolve="jetbrains.mps.console" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="I5thv1fet3" role="3bR37C">
+          <node concept="3bR9La" id="I5thv1fet4" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="I5thv1fet5" role="3bR37C">
+          <node concept="3bR9La" id="I5thv1fet6" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="6g2V7OQGaPX" resolve="jetbrains.mps.console.internalCommands" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDmao" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDmap" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
+          </node>
         </node>
       </node>
-      <node concept="1SiIV0" id="5kU0oYlfBeR" role="3bR37C">
-        <node concept="3bR9La" id="5kU0oYlfBeS" role="1SiIV1">
+      <node concept="1SiIV0" id="6g2V7OQGb60" role="3bR37C">
+        <node concept="3bR9La" id="6g2V7OQGb61" role="1SiIV1">
           <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="1ia2VB5guYy" resolve="MPS.IDEA" />
+          <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
         </node>
       </node>
-      <node concept="1SiIV0" id="71aLKqdKHv2" role="3bR37C">
-        <node concept="3bR9La" id="71aLKqdKHv3" role="1SiIV1">
-          <property role="3bR36h" value="false" />
-          <ref role="3bR37D" node="71aLKqdKvPp" resolve="jetbrains.mps.ide.make" />
+      <node concept="1SiIV0" id="WMsS6mDmak" role="3bR37C">
+        <node concept="1Busua" id="WMsS6mDmal" role="1SiIV1">
+          <ref role="1Busuk" node="3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
         </node>
       </node>
     </node>
@@ -18409,32 +18141,26 @@
           <node concept="L2wRC" id="7gQEwkA7x93" role="39821P">
             <ref role="L2wRA" node="7gQEwkA7rZZ" resolve="jetbrains.mps.console.base" />
           </node>
-          <node concept="L2wRC" id="7gQEwkA7xeB" role="39821P">
-            <ref role="L2wRA" node="7gQEwkA7sij" resolve="jetbrains.mps.console.blCommand" />
-          </node>
-          <node concept="L2wRC" id="6g2V7OQGfpE" role="39821P">
-            <ref role="L2wRA" node="6g2V7OQGaJT" resolve="jetbrains.mps.console.ideCommands" />
-          </node>
-          <node concept="L2wRC" id="6g2V7OQGfpJ" role="39821P">
-            <ref role="L2wRA" node="6g2V7OQGaPX" resolve="jetbrains.mps.console.internalCommands" />
-          </node>
           <node concept="L2wRC" id="6g2V7OQGfpP" role="39821P">
             <ref role="L2wRA" node="6g2V7OQGaVw" resolve="jetbrains.mps.console.scripts" />
           </node>
-          <node concept="L2wRC" id="6g2V7OQGfOI" role="39821P">
-            <ref role="L2wRA" node="6g2V7OQGaBC" resolve="jetbrains.mps.console.blCommand.runtime" />
+          <node concept="L2wRC" id="64VftqEaZUi" role="39821P">
+            <ref role="L2wRA" node="5Ve$VbUJDaP" resolve="jetbrains.mps.console.scripts.runtime" />
           </node>
-          <node concept="L2wRC" id="6CzTsxz42y7" role="39821P">
-            <ref role="L2wRA" node="5xAm1dXBy5N" resolve="jetbrains.mps.console.internalCommands.runtime" />
+          <node concept="L2wRC" id="6CzTsxzCAvh" role="39821P">
+            <ref role="L2wRA" node="5kU0oYlfvWH" resolve="jetbrains.mps.console.actions" />
+          </node>
+          <node concept="L2wRC" id="6g2V7OQGfpE" role="39821P">
+            <ref role="L2wRA" node="6g2V7OQGaJT" resolve="jetbrains.mps.console.ideCommands" />
           </node>
           <node concept="L2wRC" id="64VftqEaZ$$" role="39821P">
             <ref role="L2wRA" node="1whNchE_L1C" resolve="jetbrains.mps.console.ideCommands.runtime" />
           </node>
-          <node concept="L2wRC" id="64VftqEaZUi" role="39821P">
-            <ref role="L2wRA" node="5Ve$VbUJDaP" resolve="jetbrains.mps.console.scripts.runtime" />
+          <node concept="L2wRC" id="6g2V7OQGfpJ" role="39821P">
+            <ref role="L2wRA" node="6g2V7OQGaPX" resolve="jetbrains.mps.console.internalCommands" />
           </node>
-          <node concept="L2wRC" id="6CzTsxzCAvh" role="39821P">
-            <ref role="L2wRA" node="5kU0oYlfvWH" resolve="jetbrains.mps.console.actions" />
+          <node concept="L2wRC" id="6CzTsxz42y7" role="39821P">
+            <ref role="L2wRA" node="5xAm1dXBy5N" resolve="jetbrains.mps.console.internalCommands.runtime" />
           </node>
           <node concept="3_J27D" id="1KUoCioOWap" role="Nbhlr">
             <node concept="3Mxwew" id="1KUoCioOWaw" role="3MwsjC">
@@ -23425,6 +23151,9 @@
             <node concept="L2wRC" id="1Z_UwmPdNDQ" role="39821P">
               <ref role="L2wRA" node="568PkTlOK6f" resolve="jetbrains.mps.core.properties" />
             </node>
+            <node concept="L2wRC" id="7gQEwkA7xeB" role="39821P">
+              <ref role="L2wRA" node="3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
+            </node>
             <node concept="3_J27D" id="1nhbZIIufVu" role="Nbhlr">
               <node concept="3Mxwew" id="1nhbZIIufVO" role="3MwsjC">
                 <property role="3MwjfP" value="util" />
@@ -23717,6 +23446,133 @@
         </node>
       </node>
     </node>
+    <node concept="2G$12M" id="7sYmXdME_dH" role="3989C9">
+      <property role="TrG5h" value="commands" />
+      <node concept="1E1JtD" id="3ZgZ1njKuFL" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.lang.smodel.query" />
+        <property role="3LESm3" value="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" />
+        <property role="2GAjPV" value="false" />
+        <node concept="1SiIV0" id="3ZgZ1njKuG7" role="3bR37C">
+          <node concept="1Busua" id="3ZgZ1njKuG8" role="1SiIV1">
+            <ref role="1Busuk" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="3ZgZ1njKuG9" role="1TViLv">
+          <property role="TrG5h" value="jetbrains.mps.lang.smodel.query#5336086527852811409" />
+          <property role="3LESm3" value="504d7390-81ca-4422-8018-f7290efa217f" />
+          <property role="2GAjPV" value="false" />
+          <node concept="1SiIV0" id="WMsS6mDl7x" role="3bR37C">
+            <node concept="3bR9La" id="WMsS6mDl7y" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="7Kfy9QB6L0C" resolve="collections.runtime" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="WMsS6mDl7z" role="3bR37C">
+            <node concept="3bR9La" id="WMsS6mDl7$" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="WMsS6mDl7_" role="3bR37C">
+            <node concept="3bR9La" id="WMsS6mDl7A" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="1H905DlDUSw" resolve="MPS.OpenAPI" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="WMsS6mDl7B" role="3bR37C">
+            <node concept="3bR9La" id="WMsS6mDl7C" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="mXGwHwhVPj" resolve="JDK" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="WMsS6mDl7H" role="3bR37C">
+            <node concept="3bR9La" id="WMsS6mDl7I" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="WMsS6mDl7J" role="3bR37C">
+            <node concept="3bR9La" id="WMsS6mDl7K" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="4Lv24c$DFf1" role="3bR37C">
+            <node concept="3bR9La" id="4Lv24c$DFf2" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="4Lv24c$DFf3" role="3bR37C">
+            <node concept="3bR9La" id="4Lv24c$DFf4" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
+            </node>
+          </node>
+        </node>
+        <node concept="1E0d5M" id="3ZgZ1njKuGA" role="1E1XAP">
+          <ref role="1E0d5P" node="1TaHNgiIbJb" resolve="MPS.Platform" />
+        </node>
+        <node concept="1E0d5M" id="3ZgZ1njKuGL" role="1E1XAP">
+          <ref role="1E0d5P" node="1TaHNgiIbIQ" resolve="MPS.Core" />
+        </node>
+        <node concept="398BVA" id="WMsS6mDkSn" role="3LF7KH">
+          <ref role="398BVh" node="5D1dJ7xWere" resolve="mps_home" />
+          <node concept="2Ry0Ak" id="WMsS6mDkSo" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="WMsS6mDkSp" role="2Ry0An">
+              <property role="2Ry0Am" value="languageDesign" />
+              <node concept="2Ry0Ak" id="WMsS6mDkSq" role="2Ry0An">
+                <property role="2Ry0Am" value="smodel.query" />
+                <node concept="2Ry0Ak" id="WMsS6mDkSr" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.lang.smodel.query.mpl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDkZi" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDkZj" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDkZk" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDkZl" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDkZm" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDkZn" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDkZq" role="3bR37C">
+          <node concept="3bR9La" id="WMsS6mDkZr" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDkZs" role="3bR37C">
+          <node concept="1Busua" id="WMsS6mDkZt" role="1SiIV1">
+            <ref role="1Busuk" node="7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDkZu" role="3bR37C">
+          <node concept="1Busua" id="WMsS6mDkZv" role="1SiIV1">
+            <ref role="1Busuk" node="7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="WMsS6mDkZw" role="3bR37C">
+          <node concept="1Busua" id="WMsS6mDkZx" role="1SiIV1">
+            <ref role="1Busuk" node="7Kfy9QB6L2F" resolve="jetbrains.mps.baseLanguage.tuples" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="10PD9b" id="6T1MFuXjUqN" role="10PD9s" />
     <node concept="3b7kt6" id="6T1MFuXjUqP" role="10PD9s" />
   </node>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
index 965b5a66ee3f..f9b7d2d05b41 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-2cvbc211nzuvi3wjezg39ssp0alga4q" />
+<dependencies version="2" modelHash="b74ahq8ykjfo6hv07fr1nyrk8tz7gmf" />
 
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml
index aa46818b4fe5..b56b5f5e3499 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml
@@ -166,6 +166,54 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-mps-core-languages-core.properties-languageAccessories" prefix="module/languageAccessories" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-mps-core-languages-core.properties-languageModels" prefix="module/languageModels" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.query.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.query.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.smodel.query.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.smodel.query" type="language" uuid="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
+          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="jetbrains.mps.lang.smodel.query-src.jar" descriptor="jetbrains.mps.lang.smodel.query.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query" />
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.query.jar" />
+    </jar>
+    <jar destfile="${build.layout}/mps-core/languages/util/jetbrains.mps.lang.smodel.query-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query#5336086527852811409" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-languageDesign-smodel.query-generator-template">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-languageDesign-smodel.query-languageModels">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/mps-core/languages/util/jetbrains.mps.lang.smodel.query-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <zipfileset file="${mps_home}/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-languageDesign-smodel.query-generator-template" prefix="module/generator/template" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-languageDesign-smodel.query-languageModels" prefix="module/languageModels" />
+    </jar>
     <echo file="${build.layout}/build.properties">mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
   </target>
   
@@ -182,7 +230,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.lang.editor.table, java.compile.jetbrains.mps.lang.editor.table#4677325677876405344, java.compile.jetbrains.mps.lang.editor.table.runtime, java.compile.jetbrains.mps.core.properties" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.lang.editor.table, java.compile.jetbrains.mps.lang.editor.table#4677325677876405344, java.compile.jetbrains.mps.lang.editor.table.runtime, java.compile.jetbrains.mps.core.properties, java.compile.jetbrains.mps.lang.smodel.query, java.compile.jetbrains.mps.lang.smodel.query#5336086527852811409" />
   
   <target name="processResources" />
   
@@ -265,6 +313,7 @@
         <module file="${mps_home}/plugins/mps-core/languages/core.properties/jetbrains.mps.core.properties.mpl" />
         <module file="${mps_home}/plugins/mps-core/languages/languageDesign/table/jetbrains.mps.lang.editor.table.mpl" />
         <module file="${mps_home}/plugins/mps-core/languages/languageDesign/table/runtime/jetbrains.mps.lang.editor.table.runtime.msd" />
+        <module file="${mps_home}/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl" />
       </chunk>
       <chunk />
       <jvmargs>
@@ -477,10 +526,109 @@
     </copy>
   </target>
   
+  <target name="java.compile.jetbrains.mps.lang.smodel.query" depends="fetchDependencies">
+    <mkdir dir="${mps_home}/languages/languageDesign/smodel.query/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps_home}/languages/languageDesign/smodel.query/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
+        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
+        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
+        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
+        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
+        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <path refid="path.jdk.classpath" />
+      </classpath>
+    </javac2>
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    </copy>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.lang.smodel.query#5336086527852811409" depends="java.compile.jetbrains.mps.lang.smodel.query, fetchDependencies">
+    <mkdir dir="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query#5336086527852811409" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query#5336086527852811409" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query" />
+        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
+        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
+        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
+        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
+        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
+        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
+        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <path refid="path.jdk.classpath" />
+      </classpath>
+    </javac2>
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.query#5336086527852811409">
+      <fileset dir="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    </copy>
+  </target>
+  
   <target name="cleanSources">
     <delete dir="${mps_home}/plugins/mps-core/languages/core.properties/source_gen" />
     <delete dir="${mps_home}/plugins/mps-core/languages/languageDesign/table/source_gen" />
     <delete dir="${mps_home}/plugins/mps-core/languages/languageDesign/table/runtime/source_gen" />
+    <delete dir="${mps_home}/languages/languageDesign/smodel.query/source_gen" />
     <delete dir="${mps_home}/plugins/mps-core/languages/languageDesign/table/generator/source_gen" />
+    <delete dir="${mps_home}/languages/languageDesign/smodel.query/generator/source_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml
index 36d10d019df3..b8d567bd9e71 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml
@@ -153,10 +153,10 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-base-languageAccessories" prefix="module/languageAccessories" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-base-languageModels" prefix="module/languageModels" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.blCommand.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.blCommand.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.blCommand.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.blCommand" type="language" uuid="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a">
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.console.scripts.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.console.scripts" type="language" uuid="f26691d2-0def-4c06-aec6-2cb90c4af0a4">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
@@ -170,36 +170,112 @@
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
-        <sources jar="jetbrains.mps.console.blCommand-src.jar" descriptor="jetbrains.mps.console.blCommand.mpl" />
+        <sources jar="jetbrains.mps.console.scripts-src.jar" descriptor="jetbrains.mps.console.scripts.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.blCommand.jar" />
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
+      <fileset dir="${mps_home}/plugins/console/lang/scripts" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar" />
     </jar>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand-generator.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand#5336086527852811409" />
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommand-generator-template">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-generator-template">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommand-languageModels">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-languageModels">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/generator/source_gen">
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
       </fileset>
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/source_gen">
+      <zipfileset file="${mps_home}/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-generator-template" prefix="module/generator/template" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-languageModels" prefix="module/languageModels" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.console.scripts.runtime" type="solution" uuid="ebc06ad9-00ca-47ed-b5c6-bde710ea8f4d">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="jetbrains.mps.console.scripts.runtime-src.jar" descriptor="jetbrains.mps.console.scripts.runtime.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.runtime.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" />
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scriptsRuntime-models">
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.runtime-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <zipfileset file="${mps_home}/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scriptsRuntime-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.actions.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.actions.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.console.actions.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.console.actions" type="solution" uuid="95b39faf-7eaf-4ae3-bd92-fbd3cc28bfab">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" />
+          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)" />
+          <module ref="c7567052-205c-4a15-80b0-7a32b32a9656(jetbrains.mps.console.ideCommands.runtime)" />
+          <module ref="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="jetbrains.mps.console.actions-src.jar" descriptor="jetbrains.mps.console.actions.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.actions.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.actions" />
+      <fileset dir="${mps_home}/plugins/console" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/plugins/console/actions/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.console.actions.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-actions-models">
+      <fileset dir="${mps_home}/plugins/console/actions/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.actions-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/plugins/console/actions/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
       </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommand-generator-template" prefix="module/generator/template" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommand-languageModels" prefix="module/languageModels" />
+      <zipfileset file="${mps_home}/plugins/console/jetbrains.mps.console.actions.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-actions-models" prefix="module/actions/models" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.jar/META-INF" />
@@ -255,6 +331,41 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommands-languageAccessories" prefix="module/languageAccessories" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommands-languageModels" prefix="module/languageModels" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.console.ideCommands.runtime" type="solution" uuid="c7567052-205c-4a15-80b0-7a32b32a9656">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <sources jar="jetbrains.mps.console.ideCommands.runtime-src.jar" descriptor="jetbrains.mps.console.ideCommands.runtime.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.ideCommands.runtime.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime" includes="icons/**, resources/**" />
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" includes="**/trace.info, **/exports" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommandsRuntime-models">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.ideCommands.runtime-src.jar" duplicate="preserve">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+      </fileset>
+      <zipfileset file="${mps_home}/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommandsRuntime-models" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.internalCommands.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.internalCommands.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.console.internalCommands.jar/META-INF/module.xml">
@@ -303,90 +414,6 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-internalCommands-generator-template" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-internalCommands-languageModels" prefix="module/languageModels" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.scripts.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.scripts" type="language" uuid="f26691d2-0def-4c06-aec6-2cb90c4af0a4">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.scripts-src.jar" descriptor="jetbrains.mps.console.scripts.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
-      <fileset dir="${mps_home}/plugins/console/lang/scripts" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.scripts.jar" />
-    </jar>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts-generator.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-generator-template">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-languageModels">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-generator-template" prefix="module/generator/template" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scripts-languageModels" prefix="module/languageModels" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.blCommand.runtime.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.blCommand.runtime.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.blCommand.runtime.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.blCommand.runtime" type="solution" uuid="7726760c-95f5-4242-b36a-e069417e9d94">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.blCommand.runtime-src.jar" descriptor="jetbrains.mps.console.blCommand.runtime.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand.runtime.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.blCommand.runtime.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommandRuntime-models">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.blCommand.runtime-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-blCommandRuntime-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.internalCommands.runtime.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.console.internalCommands.runtime.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.console.internalCommands.runtime.jar/META-INF/module.xml">
@@ -422,117 +449,6 @@
       <zipfileset file="${mps_home}/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-internalCommandsRuntime-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.ideCommands.runtime" type="solution" uuid="c7567052-205c-4a15-80b0-7a32b32a9656">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.ideCommands.runtime-src.jar" descriptor="jetbrains.mps.console.ideCommands.runtime.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.ideCommands.runtime.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.ideCommands.runtime.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommandsRuntime-models">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.ideCommands.runtime-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-ideCommandsRuntime-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.scripts.runtime" type="solution" uuid="ebc06ad9-00ca-47ed-b5c6-bde710ea8f4d">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.scripts.runtime-src.jar" descriptor="jetbrains.mps.console.scripts.runtime.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.runtime.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" />
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.scripts.runtime.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scriptsRuntime-models">
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.scripts.runtime-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-lang-scriptsRuntime-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.actions.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.console.actions.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.console.actions.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.console.actions" type="solution" uuid="95b39faf-7eaf-4ae3-bd92-fbd3cc28bfab">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" />
-          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console)" />
-          <module ref="7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime)" />
-          <module ref="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" />
-          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <sources jar="jetbrains.mps.console.actions-src.jar" descriptor="jetbrains.mps.console.actions.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.actions.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.console.actions" />
-      <fileset dir="${mps_home}/plugins/console" includes="icons/**, resources/**" />
-      <fileset dir="${mps_home}/plugins/console/actions/source_gen" includes="**/trace.info, **/exports" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.console.actions.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/plugins-console-actions-models">
-      <fileset dir="${mps_home}/plugins/console/actions/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mps-console/lang/jetbrains.mps.console.actions-src.jar" duplicate="preserve">
-      <fileset dir="${mps_home}/plugins/console/actions/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-      </fileset>
-      <zipfileset file="${mps_home}/plugins/console/jetbrains.mps.console.actions.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/plugins-console-actions-models" prefix="module/actions/models" />
-    </jar>
     <jar destfile="${build.layout}/migrationAssistant.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/migrationAssistant" />
       <zipfileset file="${mps_home}/plugins/migrationAssistant/META-INF/plugin.xml" prefix="META-INF" />
@@ -583,7 +499,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.ideaIntegration, java.compile.migrationAssistant, java.compile.modelchecker, java.compile.mps-java, java.compile.consoleTool, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.console.blCommand.runtime, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.base#5336086527852717844, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.blCommand#5336086527852811409, java.compile.jetbrains.mps.console.ideCommands.runtime, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands#7935955022005272663, java.compile.jetbrains.mps.console.internalCommands.runtime, java.compile.jetbrains.mps.console.internalCommands, java.compile.jetbrains.mps.console.internalCommands#8483375838963160298, java.compile.jetbrains.mps.console.scripts.runtime, java.compile.jetbrains.mps.console.scripts, java.compile.jetbrains.mps.console.scripts#1734392475490224704, java.compile.jetbrains.mps.console.actions, java.compile.samples, java.compile.mpsmigration" />
+  <target name="compileJava" depends="java.compile.ideaIntegration, java.compile.migrationAssistant, java.compile.modelchecker, java.compile.mps-java, java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.base#5336086527852717844, java.compile.jetbrains.mps.console.scripts.runtime, java.compile.jetbrains.mps.console.scripts, java.compile.jetbrains.mps.console.scripts#1734392475490224704, java.compile.jetbrains.mps.console.actions, java.compile.jetbrains.mps.console.ideCommands.runtime, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands#7935955022005272663, java.compile.jetbrains.mps.console.internalCommands.runtime, java.compile.jetbrains.mps.console.internalCommands, java.compile.jetbrains.mps.console.internalCommands#8483375838963160298, java.compile.samples, java.compile.mpsmigration" />
   
   <target name="processResources" />
   
@@ -662,6 +578,8 @@
       <library file="${artifacts.mpsBootstrapCore}/lib/mps-test.jar" />
       <library file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
       <library file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
+      <library file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query-generator.jar" />
+      <library file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
       <library file="${artifacts.mpsJava}/lib/mps-java-common.jar" />
       <library file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
       <library file="${artifacts.mpsWorkbench}/languages/workbench/jetbrains.mps.lang.plugin.standalone.jar" />
@@ -669,17 +587,13 @@
       <chunk>
         <module file="${mps_home}/plugins/console/jetbrains.mps.console.msd" />
         <module file="${mps_home}/plugins/console/lang/base/jetbrains.mps.console.base.mpl" />
-        <module file="${mps_home}/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" />
-        <module file="${mps_home}/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd" />
-        <module file="${mps_home}/plugins/mpsjava/workbench/jetbrains.mps.ide.java.msd" />
-      </chunk>
-      <chunk>
-        <module file="${mps_home}/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl" />
-        <module file="${mps_home}/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd" />
         <module file="${mps_home}/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl" />
+        <module file="${mps_home}/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd" />
         <module file="${mps_home}/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl" />
+        <module file="${mps_home}/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd" />
         <module file="${mps_home}/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl" />
         <module file="${mps_home}/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd" />
+        <module file="${mps_home}/plugins/mpsjava/workbench/jetbrains.mps.ide.java.msd" />
       </chunk>
       <chunk>
         <module file="${mps_home}/plugins/console/jetbrains.mps.console.actions.msd" />
@@ -932,119 +846,6 @@
     </copy>
   </target>
   
-  <target name="java.compile.java.modules.cycle.1" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.1" />
-    <javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" memorymaximumsize="1024m" nowarn="true" includeantruntime="false">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" />
-        <path location="${mps_home}/plugins/console/lang/blCommand/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
-        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
-        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
-        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.console.blCommand.runtime" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.java.modules.cycle.1, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" />
-      </src>
-      <classpath>
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
-        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
-        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
-        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
-        <path refid="path.jdk.classpath" />
-      </classpath>
-    </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
-    </copy>
-  </target>
-  
   <target name="java.compile.jetbrains.mps.console.base" depends="java.compile.consoleTool, fetchDependencies">
     <mkdir dir="${mps_home}/plugins/console/lang/base/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.base" />
@@ -1083,80 +884,29 @@
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.base">
-      <fileset dir="${mps_home}/plugins/console/lang/base/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.console.base#5336086527852717844" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/base/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps_home}/plugins/console/lang/base/generator/source_gen" />
-      </src>
-      <classpath>
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
-        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
-        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
-        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <path refid="path.jdk.classpath" />
-      </classpath>
-    </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844">
-      <fileset dir="${mps_home}/plugins/console/lang/base/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.base">
+      <fileset dir="${mps_home}/plugins/console/lang/base/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.blCommand" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.java.modules.cycle.1, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/blCommand/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.blCommand" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.base#5336086527852717844" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/base/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/blCommand/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/base/generator/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1186,36 +936,33 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query-generator.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.blCommand">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.base#5336086527852717844">
+      <fileset dir="${mps_home}/plugins/console/lang/base/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.blCommand#5336086527852811409" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.blCommand.runtime, java.compile.jetbrains.mps.console.ideCommands.runtime, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/blCommand/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.blCommand#5336086527852811409" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.blCommand#5336086527852811409" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.scripts.runtime" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.scripts, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/blCommand/generator/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1233,11 +980,7 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
-        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1250,37 +993,35 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.blCommand#5336086527852811409">
-      <fileset dir="${mps_home}/plugins/console/lang/blCommand/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime">
+      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.ideCommands.runtime" depends="fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.scripts" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/scripts/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/scripts/source_gen" />
       </src>
       <classpath>
+        <pathelement path="${build.tmp}/java/out/consoleTool" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
@@ -1289,9 +1030,12 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1301,37 +1045,35 @@
         <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
         <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
+        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.ideCommands" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.scripts#1734392475490224704" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.scripts, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1349,9 +1091,7 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1364,35 +1104,32 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704">
+      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.ideCommands#7935955022005272663" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.blCommand.runtime, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.actions" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/actions/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.actions" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.actions" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
+        <path location="${mps_home}/plugins/console/actions/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1410,8 +1147,6 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
         <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
@@ -1435,56 +1170,26 @@
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663">
-      <fileset dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.console.internalCommands.runtime" depends="fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
-        <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
-        <fileset file="${artifacts.IDEA}/lib/ecj-4.4.jar" />
-        <fileset file="${artifacts.IDEA}/lib/trove4j.jar" />
-        <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
-        <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <path refid="path.jdk.classpath" />
-      </classpath>
-    </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime">
-      <fileset dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.actions">
+      <fileset dir="${mps_home}/plugins/console/actions/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.internalCommands" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.ideCommands.runtime" depends="fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
       </src>
       <classpath>
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
@@ -1493,14 +1198,9 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1510,15 +1210,18 @@
         <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
         <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
@@ -1526,18 +1229,18 @@
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands">
-      <fileset dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.internalCommands#8483375838963160298" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.internalCommands, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.ideCommands" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1555,9 +1258,8 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
+        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1570,31 +1272,36 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298">
-      <fileset dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.scripts.runtime" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.scripts, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.ideCommands#7935955022005272663" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.ideCommands, java.compile.jetbrains.mps.console.ideCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1612,8 +1319,9 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
+        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1626,49 +1334,43 @@
         <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts.runtime">
-      <fileset dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.ideCommands#7935955022005272663">
+      <fileset dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.scripts" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/scripts/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.internalCommands.runtime" depends="fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/scripts/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
       </src>
       <classpath>
-        <pathelement path="${build.tmp}/java/out/consoleTool" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-tool.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1677,35 +1379,21 @@
         <fileset file="${artifacts.IDEA}/lib/xstream-1.4.3.jar" />
         <fileset file="${artifacts.IDEA}/lib/asm-all.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/lib/diffutils-1.2.1.jar" />
-        <fileset dir="${artifacts.IDEA}/lib" includes="*.jar" />
-        <fileset dir="${artifacts.IDEA}/lib/ant/lib" includes="*.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime">
+      <fileset dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.scripts#1734392475490224704" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.scripts, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.internalCommands" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1723,8 +1411,7 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.scripts" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1745,23 +1432,24 @@
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.scripts#1734392475490224704">
-      <fileset dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands">
+      <fileset dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.console.actions" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.blCommand, java.compile.jetbrains.mps.console.blCommand.runtime, java.compile.jetbrains.mps.console.ideCommands, fetchDependencies">
-    <mkdir dir="${mps_home}/plugins/console/actions/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.actions" />
-    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.actions" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
+  <target name="java.compile.jetbrains.mps.console.internalCommands#8483375838963160298" depends="java.compile.consoleTool, java.compile.jetbrains.mps.console.base, java.compile.jetbrains.mps.console.internalCommands, java.compile.jetbrains.mps.console.internalCommands.runtime, fetchDependencies">
+    <mkdir dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298" />
+    <javac2 destdir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298" fork="false" includeantruntime="false" debug="true" source="1.6" target="1.6">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps_home}/plugins/console/actions/source_gen" />
+        <path location="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/consoleTool" />
@@ -1779,10 +1467,8 @@
         <fileset file="${artifacts.mpsBootstrapCore}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mpsWorkbench}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.base" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.blCommand.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.ideCommands" />
-        <fileset file="${artifacts.mpsMakePlugin}/mps-make/lib/mps-make.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.console.internalCommands.runtime" />
         <fileset file="${artifacts.IDEA}/lib/log4j.jar" />
         <fileset file="${artifacts.IDEA}/lib/annotations.jar" />
         <fileset file="${artifacts.IDEA}/lib/jdom.jar" />
@@ -1803,13 +1489,14 @@
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mpsCore}/mps-core/languages/util/jetbrains.mps.lang.smodel.query.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mpsBootstrapCore}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <path refid="path.jdk.classpath" />
       </classpath>
     </javac2>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.actions">
-      <fileset dir="${mps_home}/plugins/console/actions/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.console.internalCommands#8483375838963160298">
+      <fileset dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" includes="**/*.properties, **/*.xml, **/*.html, **/*.png, **/*.txt, **/*.ico, **/*.zip, **/*.info" />
     </copy>
   </target>
   
@@ -1895,20 +1582,17 @@
   <target name="cleanSources">
     <delete dir="${mps_home}/plugins/console/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/base/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/base/generator/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
-    <delete dir="${mps_home}/plugins/mpsjava/workbench/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/blCommand/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/blCommandRuntime/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/ideCommands/source_gen" />
+    <delete dir="${mps_home}/plugins/console/lang/ideCommandsRuntime/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/internalCommands/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/internalCommands/generator/source_gen" />
+    <delete dir="${mps_home}/plugins/console/lang/internalCommandsRuntime/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/scripts/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/scripts/generator/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/scriptsRuntime/source_gen" />
+    <delete dir="${mps_home}/plugins/mpsjava/workbench/source_gen" />
     <delete dir="${mps_home}/plugins/console/actions/source_gen" />
-    <delete dir="${mps_home}/plugins/console/lang/blCommand/generator/source_gen" />
+    <delete dir="${mps_home}/plugins/console/lang/base/generator/source_gen" />
     <delete dir="${mps_home}/plugins/console/lang/ideCommands/generator/source_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
index 57f601c37f52..5ba3a04a6e8c 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
@@ -77,12 +77,12 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6391307088354381121">
     <file name="mpsPlugins.xml">
-      <unit id="6391307088354381121" at="1,0,1914,10" name="jetbrains.mps.ide.build.mpsPlugins" />
+      <unit id="6391307088354381121" at="1,0,1598,10" name="jetbrains.mps.ide.build.mpsPlugins" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6503539749405386437">
     <file name="mpsCore.xml">
-      <unit id="6503539749405386437" at="1,0,486,10" name="jetbrains.mps.ide.build.mpsCore" />
+      <unit id="6503539749405386437" at="1,0,634,10" name="jetbrains.mps.ide.build.mpsCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6977615362525216882">
diff --git a/plugins/mps-testing/languages/languageDesign/test/jetbrains.mps.lang.test.mpl b/plugins/mps-testing/languages/languageDesign/test/jetbrains.mps.lang.test.mpl
index 3c30d6c9a24a..25ff2c056a22 100644
--- a/plugins/mps-testing/languages/languageDesign/test/jetbrains.mps.lang.test.mpl
+++ b/plugins/mps-testing/languages/languageDesign/test/jetbrains.mps.lang.test.mpl
@@ -104,7 +104,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
diff --git a/plugins/mps-testing/languages/languageDesign/test/languageModels/migration.mps b/plugins/mps-testing/languages/languageDesign/test/languageModels/migration.mps
index 7cc6aa55f202..714e02ad9b1c 100644
--- a/plugins/mps-testing/languages/languageDesign/test/languageModels/migration.mps
+++ b/plugins/mps-testing/languages/languageDesign/test/languageModels/migration.mps
@@ -4,8 +4,8 @@
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="-1" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -87,9 +87,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -110,9 +107,6 @@
       </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">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -132,9 +126,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="RemoveUITestPropertyFromTestInfo" />
     <node concept="3Tm1VV" id="2BKoAeu0XMz" role="1B3o_S" />
-    <node concept="30mAcN" id="2BKoAeu0XM$" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="2BKoAeu0XM_" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/plugins/mps-testing/languages/languageDesign/test/solutions/pluginSolution/jetbrains.mps.lang.test.pluginSolution.msd b/plugins/mps-testing/languages/languageDesign/test/solutions/pluginSolution/jetbrains.mps.lang.test.pluginSolution.msd
index 4273312e4652..a8f3ae79eb9a 100644
--- a/plugins/mps-testing/languages/languageDesign/test/solutions/pluginSolution/jetbrains.mps.lang.test.pluginSolution.msd
+++ b/plugins/mps-testing/languages/languageDesign/test/solutions/pluginSolution/jetbrains.mps.lang.test.pluginSolution.msd
@@ -19,7 +19,7 @@
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
diff --git a/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/generated b/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/generated
index e6a573feb829..24e2e6ba1c69 100644
--- a/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/generated
+++ b/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="ajitqsuz5iobvve07x6s7ldxpmh6ku8" />
+<dependencies version="2" modelHash="-6yfsntdbn6vxgyhadj1h36rqtbzsbds" />
 
diff --git a/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/migration/generated b/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/migration/generated
index 0203d1bce433..72983798f45f 100644
--- a/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/migration/generated
+++ b/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="8v6fr3hrt06gs32j4hifv2ellde2wud" />
+<dependencies version="2" modelHash="bxbqry1k41kqazijnj6xfsloikvng7n" />
 
diff --git a/plugins/mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd b/plugins/mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd
index 9d4c6b887b11..aa729b0f83d3 100644
--- a/plugins/mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd
+++ b/plugins/mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd
@@ -44,7 +44,7 @@
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" fqName="jetbrains.mps.baseLanguage.regexp" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.migration/jetbrains.mps.lang.migration.pluginSolution.msd b/plugins/mpsdevkit/languages/pluginSolutions/lang.migration/jetbrains.mps.lang.migration.pluginSolution.msd
index ac92f3d6437e..e14549b37780 100644
--- a/plugins/mpsdevkit/languages/pluginSolutions/lang.migration/jetbrains.mps.lang.migration.pluginSolution.msd
+++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.migration/jetbrains.mps.lang.migration.pluginSolution.msd
@@ -22,7 +22,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/jetbrains.mps.lang.structure.pluginSolution.msd b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/jetbrains.mps.lang.structure.pluginSolution.msd
index 5667d165ffe3..3d792a12ab01 100644
--- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/jetbrains.mps.lang.structure.pluginSolution.msd
+++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/jetbrains.mps.lang.structure.pluginSolution.msd
@@ -34,7 +34,7 @@
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps
index 05b2d42a64d8..1e27c7ebee6b 100644
--- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps
+++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps
@@ -15,7 +15,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
   </languages>
   <imports>
@@ -55,7 +55,6 @@
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)" />
     <import index="g4jo" ref="r:d98d04fb-4a60-4106-81cf-6cb40b67de4d(jetbrains.mps.ide.findusages.model)" />
-    <import index="8w31" ref="r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)" />
     <import index="pjrh" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter(MPS.Core/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="yctd" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.findUsages(MPS.Core/)" />
@@ -412,9 +411,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </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" />
@@ -4292,9 +4288,6 @@
       <property role="TrG5h" value="MoveConcepts_extension" />
       <ref role="1lYe$Y" to="lfzw:1F5g4zQqSPo" resolve="MoveNodes" />
       <node concept="3Tm1VV" id="6gEjUfBB2Qs" role="1B3o_S" />
-      <node concept="30mAcN" id="6gEjUfBB2Qt" role="lGtFl">
-        <ref role="30mx6e" to="90d:3zLwYDe0svo" resolve="Extension" />
-      </node>
       <node concept="q3mfD" id="6gEjUfBB2Qu" role="jymVt">
         <property role="TrG5h" value="get" />
         <ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
@@ -8408,9 +8401,6 @@
       <property role="TrG5h" value="MovePropertyUp_extension" />
       <ref role="1lYe$Y" to="lfzw:1F5g4zQqSPo" resolve="MoveNodes" />
       <node concept="3Tm1VV" id="6gEjUfBtl6E" role="1B3o_S" />
-      <node concept="30mAcN" id="6gEjUfBtl6F" role="lGtFl">
-        <ref role="30mx6e" to="90d:3zLwYDe0svo" resolve="Extension" />
-      </node>
       <node concept="q3mfD" id="6gEjUfBtl6G" role="jymVt">
         <property role="TrG5h" value="get" />
         <ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
@@ -9358,9 +9348,6 @@
       <property role="TrG5h" value="MoveContainmentLinkUp_extension" />
       <ref role="1lYe$Y" to="lfzw:1F5g4zQqSPo" resolve="MoveNodes" />
       <node concept="3Tm1VV" id="6gEjUfBsA_s" role="1B3o_S" />
-      <node concept="30mAcN" id="6gEjUfBsA_t" role="lGtFl">
-        <ref role="30mx6e" to="90d:3zLwYDe0svo" resolve="Extension" />
-      </node>
       <node concept="q3mfD" id="6gEjUfBsA_y" role="jymVt">
         <property role="TrG5h" value="get" />
         <ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
@@ -9922,9 +9909,6 @@
       <property role="TrG5h" value="MoveReferenceLinkUp_extension" />
       <ref role="1lYe$Y" to="lfzw:1F5g4zQqSPo" resolve="MoveNodes" />
       <node concept="3Tm1VV" id="6gEjUfBtl7V" role="1B3o_S" />
-      <node concept="30mAcN" id="6gEjUfBtl7W" role="lGtFl">
-        <ref role="30mx6e" to="90d:3zLwYDe0svo" resolve="Extension" />
-      </node>
       <node concept="q3mfD" id="6gEjUfBtl7X" role="jymVt">
         <property role="TrG5h" value="get" />
         <ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated
index 2090a4d3c56a..fd1e455e7ca9 100644
--- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated
+++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="6mm12nq0p8pely6sej5szh82lb76mt" />
+<dependencies version="2" modelHash="a12vlmifkqzkic1isdb9255lurdbkts" />
 
diff --git a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/jetbrains.mps.samples.LightweightDSL.sandbox.msd b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/jetbrains.mps.samples.LightweightDSL.sandbox.msd
index 0734e8391b53..ac474a8ee38a 100644
--- a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/jetbrains.mps.samples.LightweightDSL.sandbox.msd
+++ b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/jetbrains.mps.samples.LightweightDSL.sandbox.msd
@@ -16,7 +16,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="b4dbff0c-8c31-4a79-a45a-98e5fd0530e7" fqName="jetbrains.mps.samples.SwingBuilder" version="-1" />
diff --git a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/models/jetbrains/mps/samples/LightweightDSL/sandbox.mps b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/models/jetbrains/mps/samples/LightweightDSL/sandbox.mps
index a73e0de7be31..08832aa3b05d 100644
--- a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/models/jetbrains/mps/samples/LightweightDSL/sandbox.mps
+++ b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/models/jetbrains/mps/samples/LightweightDSL/sandbox.mps
@@ -4,10 +4,10 @@
   <languages>
     <use id="b4dbff0c-8c31-4a79-a45a-98e5fd0530e7" name="jetbrains.mps.samples.SwingBuilder" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <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="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
   </languages>
   <imports>
     <import index="x6sq" ref="r:5e58216d-cd0e-4073-b07e-f427da07ae93(jetbrains.mps.samples.LightweightDSL.plugin.definitions)" />
@@ -358,9 +358,6 @@
     <property role="3GE5qa" value="transform" />
     <property role="TrG5h" value="BigValues" />
     <node concept="3Tm1VV" id="OfqpBCfBfJ" role="1B3o_S" />
-    <node concept="30mAcN" id="OfqpBCfBfK" role="lGtFl">
-      <ref role="30mx6e" to="x6sq:OfqpBCexnp" resolve="FilterElement" />
-    </node>
     <node concept="q3mfD" id="OfqpBCfBfL" role="jymVt">
       <property role="TrG5h" value="accept" />
       <ref role="2VtyIY" to="x6sq:OfqpBCexnP" resolve="accept" />
@@ -389,9 +386,6 @@
     <property role="3GE5qa" value="transform" />
     <property role="TrG5h" value="Duplicate" />
     <node concept="3Tm1VV" id="OfqpBCfGpG" role="1B3o_S" />
-    <node concept="30mAcN" id="OfqpBCfGpH" role="lGtFl">
-      <ref role="30mx6e" to="x6sq:OfqpBCexPD" resolve="MapElement" />
-    </node>
     <node concept="q3mfD" id="OfqpBCfGpI" role="jymVt">
       <property role="TrG5h" value="map" />
       <ref role="2VtyIY" to="x6sq:OfqpBCexPE" resolve="map" />
@@ -420,9 +414,6 @@
     <property role="3GE5qa" value="transform" />
     <property role="TrG5h" value="Square" />
     <node concept="3Tm1VV" id="OfqpBCfGUY" role="1B3o_S" />
-    <node concept="30mAcN" id="OfqpBCfGUZ" role="lGtFl">
-      <ref role="30mx6e" to="x6sq:OfqpBCexPD" resolve="MapElement" />
-    </node>
     <node concept="q3mfD" id="OfqpBCfGV0" role="jymVt">
       <property role="TrG5h" value="map" />
       <ref role="2VtyIY" to="x6sq:OfqpBCexPE" resolve="map" />
@@ -451,9 +442,6 @@
     <property role="3GE5qa" value="transform" />
     <property role="TrG5h" value="Demo" />
     <node concept="3Tm1VV" id="OfqpBCge_m" role="1B3o_S" />
-    <node concept="30mAcN" id="OfqpBCge_n" role="lGtFl">
-      <ref role="30mx6e" to="x6sq:OfqpBCexTs" resolve="DataSource" />
-    </node>
     <node concept="q3mfD" id="OfqpBCge_o" role="jymVt">
       <property role="TrG5h" value="getData" />
       <ref role="2VtyIY" to="x6sq:OfqpBCexTv" resolve="getData" />
@@ -524,9 +512,6 @@
     <property role="3GE5qa" value="dependentDataType" />
     <property role="TrG5h" value="MyConverter" />
     <node concept="3Tm1VV" id="4PvwzwVapSf" role="1B3o_S" />
-    <node concept="30mAcN" id="4PvwzwVapSg" role="lGtFl">
-      <ref role="30mx6e" to="x6sq:4PvwzwV9QDq" resolve="Translator" />
-    </node>
     <node concept="1QueTy" id="4PvwzwVapSh" role="jymVt">
       <node concept="10P_77" id="4PvwzwVapWn" role="1QueTz" />
     </node>
diff --git a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen.caches/jetbrains/mps/samples/SwingBuilder/sandbox/generated b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen.caches/jetbrains/mps/samples/SwingBuilder/sandbox/generated
index b7fc3d3dcb72..2a8eb73c0efb 100644
--- a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen.caches/jetbrains/mps/samples/SwingBuilder/sandbox/generated
+++ b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen.caches/jetbrains/mps/samples/SwingBuilder/sandbox/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="ed0ozfg1rwzpg0v73c4elimleqmhsg4" />
+<dependencies version="2" modelHash="bjwmp8bb9pddtcaypyfewvfd7h1qtlu" />
 
diff --git a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/jetbrains.mps.samples.LightweightDSL.plugin.msd b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/jetbrains.mps.samples.LightweightDSL.plugin.msd
index e3232c0b5351..2add2dfb98c6 100644
--- a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/jetbrains.mps.samples.LightweightDSL.plugin.msd
+++ b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/jetbrains.mps.samples.LightweightDSL.plugin.msd
@@ -18,7 +18,7 @@
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="1" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
diff --git a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/models/jetbrains/mps/samples/LightweightDSL/plugin/definitions.mps b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/models/jetbrains/mps/samples/LightweightDSL/plugin/definitions.mps
index ee9ffb54af2c..3d7027997db1 100644
--- a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/models/jetbrains/mps/samples/LightweightDSL/plugin/definitions.mps
+++ b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/models/jetbrains/mps/samples/LightweightDSL/plugin/definitions.mps
@@ -2,11 +2,11 @@
 <model ref="r:5e58216d-cd0e-4073-b07e-f427da07ae93(jetbrains.mps.samples.LightweightDSL.plugin.definitions)">
   <persistence version="9" />
   <languages>
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
     <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="1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
   </languages>
   <imports>
     <import index="6j0q" ref="d43affd0-e5f9-482c-adc1-9400b73f2a8d/r:b2267b28-bfcc-40f1-8447-02c15480f0d2(jetbrains.mps.lang.classLike.pluginSolution/jetbrains.mps.baseLanguage.lightweightdsl.pluginSolution.plugin)" />
diff --git a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen.caches/jetbrains/mps/samples/LightweightDSL/plugin/definitions/generated b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen.caches/jetbrains/mps/samples/LightweightDSL/plugin/definitions/generated
index d21cbb8670bc..57eef5d39c40 100644
--- a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen.caches/jetbrains/mps/samples/LightweightDSL/plugin/definitions/generated
+++ b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen.caches/jetbrains/mps/samples/LightweightDSL/plugin/definitions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-7plf7ex8ede921s6jo4a4rywd6efsht" />
+<dependencies version="2" modelHash="-4p7gjbsqshe5kestj6o85j73mc98snw" />
 
diff --git a/samples/migrations/languages/decl/decl.mpl b/samples/migrations/languages/decl/decl.mpl
index efeda2ccc261..e33861085b2e 100755
--- a/samples/migrations/languages/decl/decl.mpl
+++ b/samples/migrations/languages/decl/decl.mpl
@@ -55,7 +55,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/samples/migrations/languages/decl/languageModels/migration.mps b/samples/migrations/languages/decl/languageModels/migration.mps
index d1dd02f5a422..40487d5bd9d7 100755
--- a/samples/migrations/languages/decl/languageModels/migration.mps
+++ b/samples/migrations/languages/decl/languageModels/migration.mps
@@ -2,11 +2,11 @@
 <model ref="r:95faf3fd-a89c-4a10-a7cd-04dccacd63bd(decl.migration)">
   <persistence version="9" />
   <languages>
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="9de7c5ce-ea6f-4fb4-a7ba-45e62b53cbad" name="decl" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -116,9 +116,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -217,9 +214,6 @@
     <property role="qMTe8" value="1" />
     <property role="TrG5h" value="SampleDeclMigration" />
     <node concept="3Tm1VV" id="1Ij79tqp16y" role="1B3o_S" />
-    <node concept="30mAcN" id="1Ij79tqp1g$" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="1Ij79tqp1g_" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/samples/migrations/languages/decl/source_gen.caches/decl/generated b/samples/migrations/languages/decl/source_gen.caches/decl/generated
index 42a23e7ebfd2..ba05435b658b 100644
--- a/samples/migrations/languages/decl/source_gen.caches/decl/generated
+++ b/samples/migrations/languages/decl/source_gen.caches/decl/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-e42m7fwqogsa7bwl3g6imru78cgyd6t" />
+<dependencies version="2" modelHash="-5wkl615x6s8t39xd56jdy7f69f8tgj" />
 
diff --git a/samples/migrations/languages/decl/source_gen.caches/decl/migration/generated b/samples/migrations/languages/decl/source_gen.caches/decl/migration/generated
index 6e905ddb758c..2a6f585aec84 100644
--- a/samples/migrations/languages/decl/source_gen.caches/decl/migration/generated
+++ b/samples/migrations/languages/decl/source_gen.caches/decl/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="dt5a08ypnueynpdf0rsgq36j0dnjnty" />
+<dependencies version="2" modelHash="61bco36qs6sjeux0zdhkjg5lo8dme1q" />
 
diff --git a/samples/migrations/languages/declarations/declarations.mpl b/samples/migrations/languages/declarations/declarations.mpl
index 2589b8ef5c80..4c5dd97b0c55 100644
--- a/samples/migrations/languages/declarations/declarations.mpl
+++ b/samples/migrations/languages/declarations/declarations.mpl
@@ -52,7 +52,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/samples/migrations/languages/declarations/languageModels/migration.mps b/samples/migrations/languages/declarations/languageModels/migration.mps
index b98e64935c4e..420cdc8f88e7 100644
--- a/samples/migrations/languages/declarations/languageModels/migration.mps
+++ b/samples/migrations/languages/declarations/languageModels/migration.mps
@@ -5,8 +5,8 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="1d2b03a4-7404-4a1e-939c-9c1c316327e7" name="declarations" version="1" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -92,9 +92,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -168,9 +165,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="MigrateDeclarations" />
     <node concept="3Tm1VV" id="14sMr$jSWoQ" role="1B3o_S" />
-    <node concept="30mAcN" id="14sMr$jSWoR" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="14sMr$jSWoS" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/samples/migrations/languages/declarations/source_gen.caches/declarations/generated b/samples/migrations/languages/declarations/source_gen.caches/declarations/generated
index 0bd5f1489fbd..b91358a08691 100644
--- a/samples/migrations/languages/declarations/source_gen.caches/declarations/generated
+++ b/samples/migrations/languages/declarations/source_gen.caches/declarations/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-65rcw6sblurh4slk6ltxwbobsdhf2ze" />
+<dependencies version="2" modelHash="-b3y1wl8zz7dhg1uosf9gh49zvr98iv6" />
 
diff --git a/samples/migrations/languages/declarations/source_gen.caches/declarations/migration/generated b/samples/migrations/languages/declarations/source_gen.caches/declarations/migration/generated
index c8a262f5e004..a2ffc4835f32 100644
--- a/samples/migrations/languages/declarations/source_gen.caches/declarations/migration/generated
+++ b/samples/migrations/languages/declarations/source_gen.caches/declarations/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="2hxsthym5nv4v4rrbvpczfyndpbysav" />
+<dependencies version="2" modelHash="e2viuwqya63g8dl9mbcwo5d2d5qbgmy" />
 
diff --git a/samples/migrations/languages/ref/languageModels/migration.mps b/samples/migrations/languages/ref/languageModels/migration.mps
index 12e981f5a59d..97f2012a6707 100755
--- a/samples/migrations/languages/ref/languageModels/migration.mps
+++ b/samples/migrations/languages/ref/languageModels/migration.mps
@@ -2,12 +2,12 @@
 <model ref="r:893e63ab-ca81-4830-b78a-ae600c57fa5d(ref.migration)">
   <persistence version="9" />
   <languages>
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="9de7c5ce-ea6f-4fb4-a7ba-45e62b53cbad" name="decl" version="2" />
     <use id="d3d2b6e3-a4b3-43d5-bb29-420d39fa86ab" name="ref" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -116,9 +116,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -167,9 +164,6 @@
       </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">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -217,9 +211,6 @@
     <property role="qMTe8" value="1" />
     <property role="TrG5h" value="SampleRefMigration" />
     <node concept="3Tm1VV" id="1Ij79tquYl8" role="1B3o_S" />
-    <node concept="30mAcN" id="1Ij79tquYl9" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="1Ij79tquYla" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/samples/migrations/languages/ref/ref.mpl b/samples/migrations/languages/ref/ref.mpl
index 5b4d1c62466c..dd1568bc2ad9 100755
--- a/samples/migrations/languages/ref/ref.mpl
+++ b/samples/migrations/languages/ref/ref.mpl
@@ -56,7 +56,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/samples/migrations/languages/ref/source_gen.caches/ref/generated b/samples/migrations/languages/ref/source_gen.caches/ref/generated
index 9b5b6a17508c..5f3fd9fbab8a 100644
--- a/samples/migrations/languages/ref/source_gen.caches/ref/generated
+++ b/samples/migrations/languages/ref/source_gen.caches/ref/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="emyz0304t3tm7vnw8wnvw7ebqjwhwlg" />
+<dependencies version="2" modelHash="awbmrmkf3q3s9bki5ti2femb0ivuaim" />
 
diff --git a/samples/migrations/languages/ref/source_gen.caches/ref/migration/generated b/samples/migrations/languages/ref/source_gen.caches/ref/migration/generated
index 916ecdaef941..00eb935fdad7 100644
--- a/samples/migrations/languages/ref/source_gen.caches/ref/migration/generated
+++ b/samples/migrations/languages/ref/source_gen.caches/ref/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-9kctid9kzvgncwf954zu526opeypveu" />
+<dependencies version="2" modelHash="-7g9k2pbrbhrbmu5gjoelpz35jil9a9u" />
 
diff --git a/samples/migrations/languages/references/languageModels/migration.mps b/samples/migrations/languages/references/languageModels/migration.mps
index 9500a3161142..23f039bd992f 100644
--- a/samples/migrations/languages/references/languageModels/migration.mps
+++ b/samples/migrations/languages/references/languageModels/migration.mps
@@ -5,10 +5,10 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="1d2b03a4-7404-4a1e-939c-9c1c316327e7" name="declarations" version="1" />
     <use id="16100485-31ac-4899-9112-2289e22843dd" name="references" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -91,9 +91,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
         <reference id="8585153554445465961" name="decl" index="25KYV2" />
       </concept>
@@ -163,9 +160,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="MigrateReferences" />
     <node concept="3Tm1VV" id="14sMr$jTewM" role="1B3o_S" />
-    <node concept="30mAcN" id="14sMr$jTewN" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="1QxfsK" id="14sMr$jTeA3" role="jymVt">
       <node concept="1QyHxe" id="14sMr$jTeBi" role="1QyHIp">
         <ref role="1QyHxf" to="14xd:14sMr$jSWoP" resolve="MigrateDeclarations" />
diff --git a/samples/migrations/languages/references/references.mpl b/samples/migrations/languages/references/references.mpl
index 1ddcbae559a7..93a24b5746f7 100644
--- a/samples/migrations/languages/references/references.mpl
+++ b/samples/migrations/languages/references/references.mpl
@@ -54,7 +54,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/samples/migrations/languages/references/source_gen.caches/references/generated b/samples/migrations/languages/references/source_gen.caches/references/generated
index aff6e08c392b..5793138ba553 100644
--- a/samples/migrations/languages/references/source_gen.caches/references/generated
+++ b/samples/migrations/languages/references/source_gen.caches/references/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-d565xdea6e081tsbub4ltbutzgngjvb" />
+<dependencies version="2" modelHash="-7m9ecyjgysocf4dztyxfb3a9e7ng7iu" />
 
diff --git a/samples/migrations/languages/references/source_gen.caches/references/migration/generated b/samples/migrations/languages/references/source_gen.caches/references/migration/generated
index 6a8f130d54d2..881af482a05c 100644
--- a/samples/migrations/languages/references/source_gen.caches/references/migration/generated
+++ b/samples/migrations/languages/references/source_gen.caches/references/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="3nw0dro3hzx8qkr933w1csg0xvmywz4" />
+<dependencies version="2" modelHash="-9esjof9nwiyukxfa6ogca7hmiakrfc1" />
 
diff --git a/testbench/modules/migrationAssistant/languages/updatedLanguage/languageModels/migration.mps b/testbench/modules/migrationAssistant/languages/updatedLanguage/languageModels/migration.mps
index 39b7a447afc0..f4d81e60da26 100644
--- a/testbench/modules/migrationAssistant/languages/updatedLanguage/languageModels/migration.mps
+++ b/testbench/modules/migrationAssistant/languages/updatedLanguage/languageModels/migration.mps
@@ -5,11 +5,11 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="a59395ba-5d94-4758-a87c-b11e086d5491" name="updatedLanguage" version="1" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -84,9 +84,6 @@
       <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
         <reference id="19209059688387895" name="decl" index="2VtyIY" />
       </concept>
-      <concept id="3571587574961713354" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation" flags="ng" index="30mAcN">
-        <reference id="3571587574961717879" name="descriptor" index="30mx6e" />
-      </concept>
       <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
         <property id="6478870542308703667" name="caption" index="3tTeZt" />
         <reference id="6478870542308703669" name="decl" index="3tTeZr" />
@@ -104,9 +101,6 @@
       </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">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -126,9 +120,6 @@
     <property role="qMTe8" value="0" />
     <property role="TrG5h" value="TestMigration" />
     <node concept="3Tm1VV" id="gwqcHBJ5j3" role="1B3o_S" />
-    <node concept="30mAcN" id="gwqcHBJ5j4" role="lGtFl">
-      <ref role="30mx6e" to="slm6:1XvrRm0ZjiE" resolve="Migration" />
-    </node>
     <node concept="3tTeZs" id="gwqcHBJ5nw" role="jymVt">
       <property role="3tTeZt" value="&lt;no execute after&gt;" />
       <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
diff --git a/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/generated b/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/generated
index 966851c8ebd3..dd15e87532a1 100644
--- a/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/generated
+++ b/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-d463gxni0s7fob0jg2ddqe71zv9psl4" />
+<dependencies version="2" modelHash="dpmau2gw3w80i0eumytnd1l34zyclaj" />
 
diff --git a/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/migration/generated b/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/migration/generated
index f98d1d8bd1f7..73ec39c69716 100644
--- a/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/migration/generated
+++ b/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/migration/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="an34pyyzze5zjno9sw9flkvwzom8lhg" />
+<dependencies version="2" modelHash="-3fzlmnto9imrbm6c1o7cz9x7buxewxk" />
 
diff --git a/testbench/modules/migrationAssistant/languages/updatedLanguage/updatedLanguage.mpl b/testbench/modules/migrationAssistant/languages/updatedLanguage/updatedLanguage.mpl
index 9b11394c51fb..d67d05cab1fa 100644
--- a/testbench/modules/migrationAssistant/languages/updatedLanguage/updatedLanguage.mpl
+++ b/testbench/modules/migrationAssistant/languages/updatedLanguage/updatedLanguage.mpl
@@ -22,7 +22,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
diff --git a/testbench/testsolutions/extension.test/jetbrains.mps.lang.extension.tests.msd b/testbench/testsolutions/extension.test/jetbrains.mps.lang.extension.tests.msd
index 794b6aadbe7b..fb31b654902d 100644
--- a/testbench/testsolutions/extension.test/jetbrains.mps.lang.extension.tests.msd
+++ b/testbench/testsolutions/extension.test/jetbrains.mps.lang.extension.tests.msd
@@ -18,7 +18,7 @@
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" fqName="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="c0080a47-7e37-4558-bee9-9ae18e690549" fqName="jetbrains.mps.lang.extension" version="0" />
diff --git a/tools/gensources/gensources.iml b/tools/gensources/gensources.iml
index 855022674ef7..480ae2e4115b 100644
--- a/tools/gensources/gensources.iml
+++ b/tools/gensources/gensources.iml
@@ -132,6 +132,8 @@
       <sourceFolder url="file://$MODULE_DIR$/../../languages/languageDesign/script/generator/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../languages/languageDesign/sharedConcepts/generator/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../languages/languageDesign/sharedConcepts/source_gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel.query/generator/source_gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel.query/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel/generator/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel/solutions/samples/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel/source_gen" isTestSource="false" />
@@ -289,6 +291,8 @@
       <excludeFolder url="file://$MODULE_DIR$/../../languages/languageDesign/script/generator/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../languages/languageDesign/sharedConcepts/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../languages/languageDesign/sharedConcepts/generator/classes_gen" />
+      <excludeFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel.query/classes_gen" />
+      <excludeFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel.query/generator/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel/generator/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../languages/languageDesign/smodel/solutions/samples/classes_gen" />
@@ -324,9 +328,6 @@
     <content url="file://$MODULE_DIR$/../../plugins/console/lang">
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/base/generator/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/base/source_gen" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/blCommand/generator/source_gen" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/blCommand/source_gen" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/blCommandRuntime/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/ideCommands/generator/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/ideCommands/source_gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/ideCommandsRuntime/source_gen" isTestSource="false" />
@@ -338,9 +339,6 @@
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/console/lang/scriptsRuntime/source_gen" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/../../plugins/console/lang/base/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../plugins/console/lang/base/generator/classes_gen" />
-      <excludeFolder url="file://$MODULE_DIR$/../../plugins/console/lang/blCommand/classes_gen" />
-      <excludeFolder url="file://$MODULE_DIR$/../../plugins/console/lang/blCommand/generator/classes_gen" />
-      <excludeFolder url="file://$MODULE_DIR$/../../plugins/console/lang/blCommandRuntime/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../plugins/console/lang/ideCommands/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../plugins/console/lang/ideCommands/generator/classes_gen" />
       <excludeFolder url="file://$MODULE_DIR$/../../plugins/console/lang/ideCommandsRuntime/classes_gen" />
diff --git a/workbench/mps-platform/jetbrains.mps.ide.platform.msd b/workbench/mps-platform/jetbrains.mps.ide.platform.msd
index 537b0ecdf665..cb64d01df51f 100644
--- a/workbench/mps-platform/jetbrains.mps.ide.platform.msd
+++ b/workbench/mps-platform/jetbrains.mps.ide.platform.msd
@@ -43,7 +43,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
diff --git a/workbench/mps-platform/models/jetbrains/mps/ide/platform/actions/core.mps b/workbench/mps-platform/models/jetbrains/mps/ide/platform/actions/core.mps
index 2b93f44f57c0..c715b3a6eb70 100644
--- a/workbench/mps-platform/models/jetbrains/mps/ide/platform/actions/core.mps
+++ b/workbench/mps-platform/models/jetbrains/mps/ide/platform/actions/core.mps
@@ -13,8 +13,8 @@
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="1" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
   </languages>
   <imports>
     <import index="u42p" ref="r:986938bb-bdb1-4307-b062-e4647a4db0f9(jetbrains.mps.ide.platform.refactoring)" />
@@ -38,8 +38,8 @@
     <import index="g4jo" ref="r:d98d04fb-4a60-4106-81cf-6cb40b67de4d(jetbrains.mps.ide.findusages.model)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="bmr5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.structure(MPS.Core/)" />
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
+    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" implicit="true" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
diff --git a/workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated b/workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated
index 7377e8efc2a3..e366a6fe748e 100644
--- a/workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated
+++ b/workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="89wiacgdcx165oyry8xn0humfmyf0vs" />
+<dependencies version="2" modelHash="b92d7pji32jtzntd00sqp3vgc4am87b" />
 
diff --git a/workbench/mps-workbench/jetbrains.mps.ide/jetbrains.mps.ide.msd b/workbench/mps-workbench/jetbrains.mps.ide/jetbrains.mps.ide.msd
index a86b2345d9b8..77d6b03fc340 100644
--- a/workbench/mps-workbench/jetbrains.mps.ide/jetbrains.mps.ide.msd
+++ b/workbench/mps-workbench/jetbrains.mps.ide/jetbrains.mps.ide.msd
@@ -55,7 +55,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
diff --git a/workbench/mps-workbench/pluginSolutions/lang.core/jetbrains.mps.lang.core.pluginSolution.msd b/workbench/mps-workbench/pluginSolutions/lang.core/jetbrains.mps.lang.core.pluginSolution.msd
index 534c16bd810f..b8794988af85 100644
--- a/workbench/mps-workbench/pluginSolutions/lang.core/jetbrains.mps.lang.core.pluginSolution.msd
+++ b/workbench/mps-workbench/pluginSolutions/lang.core/jetbrains.mps.lang.core.pluginSolution.msd
@@ -17,7 +17,7 @@
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" fqName="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="0" />
+    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />