diff --git a/IdeaPlugin/mpsEditorTestsPlugin.xml b/IdeaPlugin/mpsEditorTestsPlugin.xml
index 26f8dd387e8b..912bab2f2d92 100644
--- a/IdeaPlugin/mpsEditorTestsPlugin.xml
+++ b/IdeaPlugin/mpsEditorTestsPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsEditorTestsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorTestsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorTestsPlugin" />
   <property name="mps_home" location="${basedir}" />
@@ -65,6 +68,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsIdeaMigration.xml b/IdeaPlugin/mpsIdeaMigration.xml
index b5b05dbc8388..e285fc1381dd 100644
--- a/IdeaPlugin/mpsIdeaMigration.xml
+++ b/IdeaPlugin/mpsIdeaMigration.xml
@@ -1,6 +1,9 @@
 <project name="mpsIdeaMigration" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsIdeaMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsIdeaMigration" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -89,6 +92,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsIdeaVcs.xml b/IdeaPlugin/mpsIdeaVcs.xml
index 285a8cb6aeb2..1e83398086b0 100644
--- a/IdeaPlugin/mpsIdeaVcs.xml
+++ b/IdeaPlugin/mpsIdeaVcs.xml
@@ -1,6 +1,9 @@
 <project name="mpsIdeaVcs" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsIdeaVcs" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsIdeaVcs" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -101,6 +104,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsJavaIdeaPlugin.xml b/IdeaPlugin/mpsJavaIdeaPlugin.xml
index 9ec9d9a36578..ff02ab5ae5aa 100644
--- a/IdeaPlugin/mpsJavaIdeaPlugin.xml
+++ b/IdeaPlugin/mpsJavaIdeaPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsJavaIdeaPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaIdeaPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaIdeaPlugin" />
   <property name="mps_home" location="${basedir}" />
@@ -87,6 +90,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsJpsIdea.xml b/IdeaPlugin/mpsJpsIdea.xml
index 8f6d7c64ab3e..4fdd65bbfd79 100644
--- a/IdeaPlugin/mpsJpsIdea.xml
+++ b/IdeaPlugin/mpsJpsIdea.xml
@@ -1,6 +1,9 @@
 <project name="mpsJpsIdea" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJpsIdea" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJpsIdea" />
   <property name="mps_home" location="${basedir}" />
@@ -70,6 +73,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml b/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml
index 1dabb3d191fe..e22818888888 100644
--- a/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml
+++ b/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml
@@ -1,6 +1,9 @@
 <project name="mpsJpsIdeaJ8Compatibility" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJpsIdeaJ8Compatibility" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJpsIdeaJ8Compatibility" />
   <property name="mps_home" location="${basedir}" />
@@ -74,6 +77,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsPlugin.xml b/IdeaPlugin/mpsPlugin.xml
index dae9c0a27b0b..8cb5a56e8871 100644
--- a/IdeaPlugin/mpsPlugin.xml
+++ b/IdeaPlugin/mpsPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPlugin" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -96,6 +99,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsPluginTests.xml b/IdeaPlugin/mpsPluginTests.xml
index a26a1aa01f2e..9cab9ff983c8 100644
--- a/IdeaPlugin/mpsPluginTests.xml
+++ b/IdeaPlugin/mpsPluginTests.xml
@@ -1,6 +1,9 @@
 <project name="mpsPluginTests" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPluginTests" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPluginTests" />
   <property name="idea_home" location="" />
@@ -127,6 +130,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/build/jetpad.xml b/build/jetpad.xml
index 5eeab9c4cd01..76e7fbff2ae3 100644
--- a/build/jetpad.xml
+++ b/build/jetpad.xml
@@ -1,6 +1,9 @@
 <project name="jetpad" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/jetpad" />
   <property name="build.layout" location="${build.dir}/artifacts/jetpad" />
   <property name="idea_home" location="" />
@@ -91,6 +94,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -120,6 +125,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsAntToolsPlugin.xml b/build/mpsAntToolsPlugin.xml
index a61adecdeb9d..4e3f11d1337c 100644
--- a/build/mpsAntToolsPlugin.xml
+++ b/build/mpsAntToolsPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsAntToolsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsAntToolsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsAntToolsPlugin" />
   <property name="idea_home" location="" />
@@ -103,6 +106,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -231,6 +236,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsBootstrapCore.xml b/build/mpsBootstrapCore.xml
index ad195c9cf466..57ad2901b148 100644
--- a/build/mpsBootstrapCore.xml
+++ b/build/mpsBootstrapCore.xml
@@ -1,6 +1,9 @@
 <project name="mpsBootstrapCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBootstrapCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBootstrapCore" />
   <property name="version.major" value="2023" />
@@ -16486,6 +16489,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -16689,6 +16694,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsBuild.xml b/build/mpsBuild.xml
index bba0233bee41..7e4b079c4651 100644
--- a/build/mpsBuild.xml
+++ b/build/mpsBuild.xml
@@ -1,6 +1,9 @@
 <project name="mpsBuild" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuild" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuild" />
   <property name="idea_home" location="" />
@@ -1592,6 +1595,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1766,6 +1771,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsBuildUI.xml b/build/mpsBuildUI.xml
index 04bf6c6574b2..6405e369e638 100644
--- a/build/mpsBuildUI.xml
+++ b/build/mpsBuildUI.xml
@@ -1,6 +1,9 @@
 <project name="mpsBuildUI" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuildUI" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuildUI" />
   <property name="idea_home" location="" />
@@ -334,6 +337,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -484,6 +489,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsConsolePlugin.xml b/build/mpsConsolePlugin.xml
index 619b053143e9..3939403869d2 100644
--- a/build/mpsConsolePlugin.xml
+++ b/build/mpsConsolePlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsConsolePlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsConsolePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsConsolePlugin" />
   <property name="idea_home" location="" />
@@ -1101,6 +1104,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1273,6 +1278,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsContextActionsTool.xml b/build/mpsContextActionsTool.xml
index b13a9621a363..a39fc568fa9c 100644
--- a/build/mpsContextActionsTool.xml
+++ b/build/mpsContextActionsTool.xml
@@ -1,6 +1,9 @@
 <project name="mpsContextActionsTool" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsContextActionsTool" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsContextActionsTool" />
   <property name="idea_home" location="" />
@@ -339,6 +342,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -493,6 +498,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsCore.xml b/build/mpsCore.xml
index e86d4939ba93..dfa6492154cd 100644
--- a/build/mpsCore.xml
+++ b/build/mpsCore.xml
@@ -1,6 +1,9 @@
 <project name="mpsCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsCore" />
   <property name="idea_home" location="" />
@@ -755,6 +758,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -911,6 +916,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsDebuggerPlugin.xml b/build/mpsDebuggerPlugin.xml
index d5bc8cf68314..381d9acbd3ef 100644
--- a/build/mpsDebuggerPlugin.xml
+++ b/build/mpsDebuggerPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsDebuggerPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDebuggerPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDebuggerPlugin" />
   <property name="idea_home" location="" />
@@ -1406,6 +1409,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1579,6 +1584,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsDevKit.xml b/build/mpsDevKit.xml
index ca2fb9cb2b34..847868bfce3d 100644
--- a/build/mpsDevKit.xml
+++ b/build/mpsDevKit.xml
@@ -1,6 +1,9 @@
 <project name="mpsDevKit" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDevKit" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDevKit" />
   <property name="idea_home" location="" />
@@ -990,6 +993,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1153,6 +1158,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsDiagramEditor.xml b/build/mpsDiagramEditor.xml
index 267a67b25e45..24742327fd1c 100644
--- a/build/mpsDiagramEditor.xml
+++ b/build/mpsDiagramEditor.xml
@@ -1,6 +1,9 @@
 <project name="mpsDiagramEditor" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDiagramEditor" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDiagramEditor" />
   <property name="idea_home" location="" />
@@ -541,6 +544,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -701,6 +706,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsExecutionPlugin.xml b/build/mpsExecutionPlugin.xml
index 6aa53a0a6fd1..4906add672d9 100644
--- a/build/mpsExecutionPlugin.xml
+++ b/build/mpsExecutionPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsExecutionPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsExecutionPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsExecutionPlugin" />
   <property name="idea_home" location="" />
@@ -1107,6 +1110,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1292,6 +1297,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsHttpSupportPlugin.xml b/build/mpsHttpSupportPlugin.xml
index b181f497b803..7675d82c8bca 100644
--- a/build/mpsHttpSupportPlugin.xml
+++ b/build/mpsHttpSupportPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsHttpSupportPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsHttpSupportPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsHttpSupportPlugin" />
   <property name="idea_home" location="" />
@@ -429,6 +432,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -590,6 +595,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsJava.xml b/build/mpsJava.xml
index 051659fcc2d9..f75c81b656be 100644
--- a/build/mpsJava.xml
+++ b/build/mpsJava.xml
@@ -1,6 +1,9 @@
 <project name="mpsJava" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJava" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJava" />
   <property name="mps_home" location="${basedir}" />
@@ -161,6 +164,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -299,6 +304,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/mpsJavaCore.xml b/build/mpsJavaCore.xml
index 5b433d072ae4..97c14b6ce27d 100644
--- a/build/mpsJavaCore.xml
+++ b/build/mpsJavaCore.xml
@@ -1,6 +1,9 @@
 <project name="mpsJavaCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaCore" />
   <property name="mps_home" location="${basedir}" />
@@ -133,6 +136,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -264,6 +269,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/mpsJavaPlatform.xml b/build/mpsJavaPlatform.xml
index 62c4f28cf89c..9947e5c3b5a6 100644
--- a/build/mpsJavaPlatform.xml
+++ b/build/mpsJavaPlatform.xml
@@ -1,6 +1,9 @@
 <project name="mpsJavaPlatform" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaPlatform" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaPlatform" />
   <property name="mps_home" location="${basedir}" />
@@ -157,6 +160,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -293,6 +298,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/mpsKotlinPlugin.xml b/build/mpsKotlinPlugin.xml
index 8d2849d2e696..910374f0f565 100644
--- a/build/mpsKotlinPlugin.xml
+++ b/build/mpsKotlinPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsKotlinPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsKotlinPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsKotlinPlugin" />
   <property name="idea_home" location="" />
@@ -1057,6 +1060,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1227,6 +1232,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsMakePlugin.xml b/build/mpsMakePlugin.xml
index 2805e7acc648..49e31b249ac8 100644
--- a/build/mpsMakePlugin.xml
+++ b/build/mpsMakePlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsMakePlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMakePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMakePlugin" />
   <property name="idea_home" location="" />
@@ -156,6 +159,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -295,6 +300,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsMigration.xml b/build/mpsMigration.xml
index 42d81b8e1d94..15b97e549ac5 100644
--- a/build/mpsMigration.xml
+++ b/build/mpsMigration.xml
@@ -1,6 +1,9 @@
 <project name="mpsMigration" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMigration" />
   <property name="idea_home" location="" />
@@ -344,6 +347,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -488,6 +493,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsMigrationCore.xml b/build/mpsMigrationCore.xml
index e4ebbacb81d0..cd32cdb27150 100644
--- a/build/mpsMigrationCore.xml
+++ b/build/mpsMigrationCore.xml
@@ -1,6 +1,9 @@
 <project name="mpsMigrationCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMigrationCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMigrationCore" />
   <property name="idea_home" location="" />
@@ -65,6 +68,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/build/mpsNavigationBar.xml b/build/mpsNavigationBar.xml
index 25b1342f67b0..4639dad52c74 100644
--- a/build/mpsNavigationBar.xml
+++ b/build/mpsNavigationBar.xml
@@ -1,6 +1,9 @@
 <project name="mpsNavigationBar" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsNavigationBar" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsNavigationBar" />
   <property name="idea_home" location="" />
@@ -68,6 +71,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/build/mpsPlugins.xml b/build/mpsPlugins.xml
index 1d48c4ce5ca9..ca83a68ab552 100644
--- a/build/mpsPlugins.xml
+++ b/build/mpsPlugins.xml
@@ -1,6 +1,9 @@
 <project name="mpsPlugins" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPlugins" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPlugins" />
   <property name="idea_home" location="" />
@@ -782,6 +785,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -936,6 +941,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsSpellCheckPlugin.xml b/build/mpsSpellCheckPlugin.xml
index 1b3764a20d96..853732d6c2f1 100644
--- a/build/mpsSpellCheckPlugin.xml
+++ b/build/mpsSpellCheckPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsSpellCheckPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsSpellCheckPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsSpellCheckPlugin" />
   <property name="idea_home" location="" />
@@ -121,6 +124,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -255,6 +260,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsStandalone.xml b/build/mpsStandalone.xml
index 8c9c59ea3241..a57a528f8e77 100644
--- a/build/mpsStandalone.xml
+++ b/build/mpsStandalone.xml
@@ -1,6 +1,9 @@
 <project name="mpsStandalone" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsStandalone" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsStandalone" />
   <property name="mps_home" location="${basedir}" />
@@ -115,6 +118,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/build/mpsTesting.xml b/build/mpsTesting.xml
index 7ea4f2d5ebec..a3d5df161b6f 100644
--- a/build/mpsTesting.xml
+++ b/build/mpsTesting.xml
@@ -1,6 +1,9 @@
 <project name="mpsTesting" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTesting" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTesting" />
   <property name="idea_home" location="" />
@@ -1165,6 +1168,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1335,6 +1340,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsTooltips.xml b/build/mpsTooltips.xml
index 34dbf16eb57a..8f6b643daa1f 100644
--- a/build/mpsTooltips.xml
+++ b/build/mpsTooltips.xml
@@ -1,6 +1,9 @@
 <project name="mpsTooltips" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTooltips" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTooltips" />
   <property name="idea_home" location="" />
@@ -266,6 +269,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -402,6 +407,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsTroveCollections.xml b/build/mpsTroveCollections.xml
index 3ace2444b1b5..84c9e5a6d5ad 100644
--- a/build/mpsTroveCollections.xml
+++ b/build/mpsTroveCollections.xml
@@ -1,6 +1,9 @@
 <project name="mpsTroveCollections" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTroveCollections" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTroveCollections" />
   <property name="idea_home" location="" />
@@ -269,6 +272,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -401,6 +406,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsVcs.xml b/build/mpsVcs.xml
index 4e73d028b23c..e70ceb995f91 100644
--- a/build/mpsVcs.xml
+++ b/build/mpsVcs.xml
@@ -1,6 +1,9 @@
 <project name="mpsVcs" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVcs" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVcs" />
   <property name="idea_home" location="" />
@@ -470,6 +473,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -639,6 +644,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsVcsPlatform.xml b/build/mpsVcsPlatform.xml
index 75a500c2b8f6..9274892ab7f1 100644
--- a/build/mpsVcsPlatform.xml
+++ b/build/mpsVcsPlatform.xml
@@ -1,6 +1,9 @@
 <project name="mpsVcsPlatform" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVcsPlatform" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVcsPlatform" />
   <property name="idea_home" location="" />
@@ -425,6 +428,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -574,6 +579,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsWorkbench.xml b/build/mpsWorkbench.xml
index ce0525188c52..f6906865b67d 100644
--- a/build/mpsWorkbench.xml
+++ b/build/mpsWorkbench.xml
@@ -1,6 +1,9 @@
 <project name="mpsWorkbench" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsWorkbench" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsWorkbench" />
   <property name="idea_home" location="" />
@@ -362,6 +365,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -524,6 +529,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/tests/mpsActions.xml b/build/tests/mpsActions.xml
index fdd0d9e9b415..bd60a6df5a61 100644
--- a/build/tests/mpsActions.xml
+++ b/build/tests/mpsActions.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsActions" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsActions" />
   <property name="mps_home" location="" />
@@ -240,6 +241,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -340,7 +344,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsBaseLanguage.xml b/build/tests/mpsBaseLanguage.xml
index 482bba2f8612..14b72fe3f35d 100644
--- a/build/tests/mpsBaseLanguage.xml
+++ b/build/tests/mpsBaseLanguage.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBaseLanguage" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBaseLanguage" />
   <property name="mps_home" location="" />
@@ -1043,6 +1044,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1955,7 +1959,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsBehavior.xml b/build/tests/mpsBehavior.xml
index 3ca6149dc8ca..5285046e2600 100644
--- a/build/tests/mpsBehavior.xml
+++ b/build/tests/mpsBehavior.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBehavior" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBehavior" />
   <property name="mps_home" location="" />
@@ -826,6 +827,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1285,7 +1289,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsBuild.xml b/build/tests/mpsBuild.xml
index 9574f398beea..7f0a1faa9ef1 100644
--- a/build/tests/mpsBuild.xml
+++ b/build/tests/mpsBuild.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuild" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuild" />
   <property name="mps_home" location="" />
@@ -311,6 +312,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -485,7 +489,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsConsole.xml b/build/tests/mpsConsole.xml
index 84b8a78ab6a1..e6996ab42046 100644
--- a/build/tests/mpsConsole.xml
+++ b/build/tests/mpsConsole.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsConsole" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsConsole" />
   <property name="mps_home" location="" />
@@ -271,6 +272,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -430,7 +434,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsConstraints.xml b/build/tests/mpsConstraints.xml
index a674abe54a63..b7fc5772de2f 100644
--- a/build/tests/mpsConstraints.xml
+++ b/build/tests/mpsConstraints.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsConstraints" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsConstraints" />
   <property name="mps_home" location="" />
@@ -579,6 +580,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -955,7 +959,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsDataFlow.xml b/build/tests/mpsDataFlow.xml
index 2f4311bf83f9..b6220bf0d17f 100644
--- a/build/tests/mpsDataFlow.xml
+++ b/build/tests/mpsDataFlow.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDataFlow" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDataFlow" />
   <property name="mps_home" location="" />
@@ -489,6 +490,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -764,7 +768,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsEditor.xml b/build/tests/mpsEditor.xml
index 5a7df55b60ca..c3e542e5bf9d 100644
--- a/build/tests/mpsEditor.xml
+++ b/build/tests/mpsEditor.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditor" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditor" />
   <property name="mps_home" location="" />
@@ -1831,6 +1832,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -3328,7 +3332,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsEditorDiagram.xml b/build/tests/mpsEditorDiagram.xml
index 2a3386f17dd7..bdb8e5adf722 100644
--- a/build/tests/mpsEditorDiagram.xml
+++ b/build/tests/mpsEditorDiagram.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorDiagram" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorDiagram" />
   <property name="mps_home" location="" />
@@ -437,6 +438,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -708,7 +712,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsEditorImageGen.xml b/build/tests/mpsEditorImageGen.xml
index 963a7614123e..1ef43c02ab39 100644
--- a/build/tests/mpsEditorImageGen.xml
+++ b/build/tests/mpsEditorImageGen.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorImageGen" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorImageGen" />
   <property name="mps_home" location="${basedir}/build/artifacts/mps" />
@@ -414,6 +415,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
         <arg value="--add-opens=java.desktop/sun.font=ALL-UNNAMED" />
       </jvmargs>
@@ -630,7 +634,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsEditorTransformationMenu.xml b/build/tests/mpsEditorTransformationMenu.xml
index 5b4251df28c7..601a28d1a775 100644
--- a/build/tests/mpsEditorTransformationMenu.xml
+++ b/build/tests/mpsEditorTransformationMenu.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorTransformationMenu" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorTransformationMenu" />
   <property name="mps_home" location="" />
@@ -1797,6 +1798,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -3173,7 +3177,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsExecution.xml b/build/tests/mpsExecution.xml
index 59caf2be1801..dfae2964bc85 100644
--- a/build/tests/mpsExecution.xml
+++ b/build/tests/mpsExecution.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsExecution" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsExecution" />
   <property name="mps_home" location="" />
@@ -611,6 +612,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1015,7 +1019,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsFeedback.xml b/build/tests/mpsFeedback.xml
index 68ea84fb98ee..c9418be63b79 100644
--- a/build/tests/mpsFeedback.xml
+++ b/build/tests/mpsFeedback.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsFeedback" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsFeedback" />
   <property name="mps_home" location="" />
@@ -367,6 +368,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -539,7 +543,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsGenerator.xml b/build/tests/mpsGenerator.xml
index 0154c44de7d8..60cbe0777bd6 100644
--- a/build/tests/mpsGenerator.xml
+++ b/build/tests/mpsGenerator.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsGenerator" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsGenerator" />
   <property name="mps_home" location="" />
@@ -1719,6 +1720,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -3091,7 +3095,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsHttpSupport.xml b/build/tests/mpsHttpSupport.xml
index 83e91c0d8459..77cb55582cf7 100644
--- a/build/tests/mpsHttpSupport.xml
+++ b/build/tests/mpsHttpSupport.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsHttpSupport" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsHttpSupport" />
   <property name="mps_home" location="" />
@@ -259,6 +260,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -419,7 +423,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsImplementationStripping.xml b/build/tests/mpsImplementationStripping.xml
index f47096b9d39f..91413a387295 100644
--- a/build/tests/mpsImplementationStripping.xml
+++ b/build/tests/mpsImplementationStripping.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsImplementationStripping" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsImplementationStripping" />
   <property name="mps_home" location="" />
@@ -470,6 +471,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -754,7 +758,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsJava.xml b/build/tests/mpsJava.xml
index 3561a5b347bb..6398fe3ed2af 100644
--- a/build/tests/mpsJava.xml
+++ b/build/tests/mpsJava.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJava" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJava" />
   <property name="mps_home" location="" />
@@ -303,6 +304,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -436,7 +440,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsKotlin.xml b/build/tests/mpsKotlin.xml
index f62a7dde5aed..b8505582b14b 100644
--- a/build/tests/mpsKotlin.xml
+++ b/build/tests/mpsKotlin.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsKotlin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsKotlin" />
   <property name="mps_home" location="" />
@@ -326,6 +327,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -511,7 +515,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsPackaged.xml b/build/tests/mpsPackaged.xml
index e61590a936f0..d5d8db666621 100644
--- a/build/tests/mpsPackaged.xml
+++ b/build/tests/mpsPackaged.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPackaged" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPackaged" />
   <property name="mps_home" location="" />
@@ -377,6 +378,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -546,7 +550,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsSModel.xml b/build/tests/mpsSModel.xml
index 6b119543500b..3bde45ce4c89 100644
--- a/build/tests/mpsSModel.xml
+++ b/build/tests/mpsSModel.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsSModel" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsSModel" />
   <property name="mps_home" location="" />
@@ -489,6 +490,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -911,7 +915,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsSmartRefAttrMigration_gen.xml b/build/tests/mpsSmartRefAttrMigration_gen.xml
index b12404b6e176..1d6ca4b1f57b 100644
--- a/build/tests/mpsSmartRefAttrMigration_gen.xml
+++ b/build/tests/mpsSmartRefAttrMigration_gen.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsSmartRefAttrMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsSmartRefAttrMigration" />
   <property name="mps_home" location="" />
@@ -238,6 +239,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -339,7 +343,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsTest.xml b/build/tests/mpsTest.xml
index b18c8a633f49..9d061f7d2ca7 100644
--- a/build/tests/mpsTest.xml
+++ b/build/tests/mpsTest.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTest" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTest" />
   <property name="mps_home" location="" />
@@ -1256,6 +1257,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -2316,7 +2320,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsTestModules.xml b/build/tests/mpsTestModules.xml
index 7dd9ae9d2a08..6c560222bdc8 100644
--- a/build/tests/mpsTestModules.xml
+++ b/build/tests/mpsTestModules.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTestModules" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTestModules" />
   <property name="mps_home" location="" />
@@ -704,6 +705,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1320,7 +1324,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsText.xml b/build/tests/mpsText.xml
index 0bfae909d357..066a11a0eeba 100644
--- a/build/tests/mpsText.xml
+++ b/build/tests/mpsText.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsText" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsText" />
   <property name="mps_home" location="" />
@@ -247,6 +248,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -347,7 +351,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsToolTests.xml b/build/tests/mpsToolTests.xml
index 99f2a7bfbadb..605891d4f765 100644
--- a/build/tests/mpsToolTests.xml
+++ b/build/tests/mpsToolTests.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsToolTests" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsToolTests" />
   <property name="mps_home" location="" />
@@ -300,6 +301,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -515,7 +519,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsTypesystem.xml b/build/tests/mpsTypesystem.xml
index 2969345aa413..1e6d47fc61a3 100644
--- a/build/tests/mpsTypesystem.xml
+++ b/build/tests/mpsTypesystem.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTypesystem" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTypesystem" />
   <property name="mps_home" location="" />
@@ -1093,6 +1094,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1794,7 +1798,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/build/tests/mpsVCS.xml b/build/tests/mpsVCS.xml
index e679d41b73cc..80788283258b 100644
--- a/build/tests/mpsVCS.xml
+++ b/build/tests/mpsVCS.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVCS" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVCS" />
   <property name="mps_home" location="${basedir}" />
@@ -88,6 +91,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -200,6 +205,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/behavior/generated b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/behavior/generated
index 4731aa4c64bf..2311c483b6d7 100644
--- a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/behavior/generated
+++ b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/behavior/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-7odltj7gw7k0vspjrs7k78udzemxvgl" parametersHash="a7y06d854is3tqvgak3b8mgxsuvqmq7" />
+<product version="3" modelHash="-7odltj7gw7k0vspjrs7k78udzemxvgl" />
 
diff --git a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/constraints/generated b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/constraints/generated
index 71900f8da988..4ba150c4d22d 100644
--- a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/constraints/generated
+++ b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/constraints/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-1hr1uqrms2iuyw9vpapjdsm0iu117j4" parametersHash="a7y06d854is3tqvgak3b8mgxsuvqmq7">
+<product version="3" modelHash="-1hr1uqrms2iuyw9vpapjdsm0iu117j4">
   <files names="ConstraintsAspectDescriptor.java" />
 </product>
 
diff --git a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/editor/generated b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/editor/generated
index 5a21d8531d29..954bd91b8a78 100644
--- a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/editor/generated
+++ b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/editor/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-4q0qxn7tnmusxzboc8xdd1ssdr0gmst" parametersHash="a7y06d854is3tqvgak3b8mgxsuvqmq7" />
+<product version="3" modelHash="-4q0qxn7tnmusxzboc8xdd1ssdr0gmst" />
 
diff --git a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/generated b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/generated
index fb780448a259..21453e63f300 100644
--- a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/generated
+++ b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="886upnt643hbim8z7tki98yo8idjodk" parametersHash="a7y06d854is3tqvgak3b8mgxsuvqmq7">
+<product version="3" modelHash="886upnt643hbim8z7tki98yo8idjodk">
   <files names="Language.java" />
 </product>
 
diff --git a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/plugin/generated b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/plugin/generated
index bd09972a498a..00ea9441b8af 100644
--- a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/plugin/generated
+++ b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/plugin/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="bxair3rv9zg0xxwwps68jlli866clsc" parametersHash="a7y06d854is3tqvgak3b8mgxsuvqmq7">
+<product version="3" modelHash="bxair3rv9zg0xxwwps68jlli866clsc">
   <files names="FacetAspectDescriptor.java:FacetManifest.java:ReportFiles_Facet.java" />
 </product>
 
diff --git a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/structure/generated b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/structure/generated
index 70c320735946..c2d10b120776 100644
--- a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/structure/generated
+++ b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/structure/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="afdfgc1burcbwmqo5xp37h23qdiusgn" parametersHash="a7y06d854is3tqvgak3b8mgxsuvqmq7" />
+<product version="3" modelHash="afdfgc1burcbwmqo5xp37h23qdiusgn" />
 
diff --git a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/typesystem/generated b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/typesystem/generated
index 108aea377530..0f61fabbd257 100644
--- a/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/typesystem/generated
+++ b/languages/languageDesign/make/languages/reduced/source_gen.caches/jetbrains/mps/make/reduced/typesystem/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-cz7ak1bjrj3t8gck1im6nt1kp9r78l6" parametersHash="a7y06d854is3tqvgak3b8mgxsuvqmq7">
+<product version="3" modelHash="-cz7ak1bjrj3t8gck1im6nt1kp9r78l6">
   <files names="TypesystemDescriptor.java" />
 </product>
 
diff --git a/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generated b/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generated
index 4cc51be296d9..4539dd6f9381 100644
--- a/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generated
+++ b/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="a0r4l4cn3zjqre3ems8tfzrevavz579">
+<product version="3" modelHash="3s7269b44snlseq0kdblh7emow30gqo">
   <files names="Generator.java" />
 </product>
 
diff --git a/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generator/template/main/generated b/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generator/template/main/generated
index 9d3a6f16a25f..f68f8398784b 100644
--- a/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generator/template/main/generated
+++ b/plugins/mps-build/languages/build.mps.tests/generator/source_gen.caches/jetbrains/mps/build/mps/tests/generator/template/main/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-c4d0vfdx3ewrwwtcyrr8s1c4azcck07">
+<product version="3" modelHash="-25igqtm16wbxngmk0gosfb4islpfedw">
   <files names="QueriesGenerated.java" />
 </product>
 
diff --git a/plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps b/plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps
index 367cfd0fd200..49c388454b3b 100644
--- a/plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps
+++ b/plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps
@@ -1878,7 +1878,7 @@
                     <node concept="2pNUuL" id="6OON6YVXP4d" role="2pNNFR">
                       <property role="2pNUuO" value="value" />
                       <node concept="2pMdtt" id="6OON6YVXP4e" role="2pMdts">
-                        <property role="2pMdty" value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+                        <property role="2pMdty" value="-Djna.boot.library.path=${build.jna.library.path}" />
                       </node>
                     </node>
                   </node>
diff --git a/plugins/mps-build/languages/build.mps.tests/languageAccessories/jetbrains/mps/build/mps/tests/accessories.mps b/plugins/mps-build/languages/build.mps.tests/languageAccessories/jetbrains/mps/build/mps/tests/accessories.mps
index 9cb59b7a8ca2..7b399b334fb8 100644
--- a/plugins/mps-build/languages/build.mps.tests/languageAccessories/jetbrains/mps/build/mps/tests/accessories.mps
+++ b/plugins/mps-build/languages/build.mps.tests/languageAccessories/jetbrains/mps/build/mps/tests/accessories.mps
@@ -25,34 +25,10 @@
       <concept id="2769948622284546675" name="jetbrains.mps.build.workflow.structure.BwfTask" flags="ng" index="2VaFvF">
         <child id="2769948622284574302" name="dependencies" index="2VaxJ6" />
       </concept>
-      <concept id="2769948622284546677" name="jetbrains.mps.build.workflow.structure.BwfSubTask" flags="ng" index="2VaFvH">
-        <child id="2769948622284606050" name="statements" index="2VaTZU" />
-      </concept>
-      <concept id="2769948622284768359" name="jetbrains.mps.build.workflow.structure.BwfAntStatement" flags="ng" index="2Vbh7Z">
-        <child id="2769948622284768360" name="element" index="2Vbh7K" />
-      </concept>
       <concept id="3961775458390032824" name="jetbrains.mps.build.workflow.structure.BwfTaskPart" flags="ng" index="3bMsLL">
         <reference id="3961775458390032825" name="task" index="3bMsLK" />
-        <child id="3961775458390032826" name="subTasks" index="3bMsLN" />
         <child id="3961775458390352322" name="additionalDependencies" index="3bNaKb" />
       </concept>
-      <concept id="6896005762093571400" name="jetbrains.mps.build.workflow.structure.BwfMacro" flags="ng" index="1_4tnW">
-        <property id="6896005762093571407" name="isLocation" index="1_4tnV" />
-        <property id="6896005762093571402" name="defaultValue" index="1_4tnY" />
-      </concept>
-    </language>
-    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml">
-      <concept id="6666499814681541919" name="jetbrains.mps.core.xml.structure.XmlTextValue" flags="ng" index="2pMdtt">
-        <property id="6666499814681541920" name="text" index="2pMdty" />
-      </concept>
-      <concept id="6666499814681415858" name="jetbrains.mps.core.xml.structure.XmlElement" flags="ng" index="2pNNFK">
-        <property id="6666499814681415862" name="tagName" index="2pNNFO" />
-        <child id="6666499814681415861" name="attributes" index="2pNNFR" />
-      </concept>
-      <concept id="6666499814681447923" name="jetbrains.mps.core.xml.structure.XmlAttribute" flags="ng" index="2pNUuL">
-        <property id="6666499814681447926" name="attrName" index="2pNUuO" />
-        <child id="6666499814681541918" name="value" index="2pMdts" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
@@ -62,16 +38,6 @@
   </registry>
   <node concept="yghi3" id="m8_23bzloH">
     <property role="TrG5h" value="module-tests" />
-    <node concept="1_4tnW" id="o7F7WgLLiA" role="yghi5">
-      <property role="1_4tnV" value="true" />
-      <property role="TrG5h" value="build.mps.config.path" />
-      <property role="1_4tnY" value="${build.dir}/config" />
-    </node>
-    <node concept="1_4tnW" id="o7F7WgLLik" role="yghi5">
-      <property role="1_4tnV" value="true" />
-      <property role="TrG5h" value="build.mps.system.path" />
-      <property role="1_4tnY" value="${build.dir}/system" />
-    </node>
     <node concept="ygXWA" id="5T0Kicg_YEu" role="yg1MB">
       <ref role="ygXWD" to="arit:6l_Qx579h0V" resolve="common" />
     </node>
@@ -93,34 +59,6 @@
         <ref role="2VaxJf" node="3umvbTBOJMd" resolve="module-tests" />
       </node>
     </node>
-    <node concept="3bMsLL" id="o7F7WgLLi3" role="yghi5">
-      <ref role="3bMsLK" to="arit:6l_Qx579cKM" resolve="clean" />
-      <node concept="2VaFvH" id="o7F7WgLLia" role="3bMsLN">
-        <property role="TrG5h" value="clear.mps.cahces" />
-        <node concept="2Vbh7Z" id="o7F7WgLLtL" role="2VaTZU">
-          <node concept="2pNNFK" id="o7F7WgLLtV" role="2Vbh7K">
-            <property role="2pNNFO" value="delete" />
-            <node concept="2pNUuL" id="o7F7WgLLtZ" role="2pNNFR">
-              <property role="2pNUuO" value="dir" />
-              <node concept="2pMdtt" id="o7F7WgLLu1" role="2pMdts">
-                <property role="2pMdty" value="${build.mps.config.path}" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2Vbh7Z" id="o7F7WgLLiK" role="2VaTZU">
-          <node concept="2pNNFK" id="o7F7WgLLtd" role="2Vbh7K">
-            <property role="2pNNFO" value="delete" />
-            <node concept="2pNUuL" id="o7F7WgLLth" role="2pNNFR">
-              <property role="2pNUuO" value="dir" />
-              <node concept="2pMdtt" id="o7F7WgLLtj" role="2pMdts">
-                <property role="2pMdty" value="${build.mps.system.path}" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
 </model>
 
diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated
index 4bc03b23fdff..e593a0ac4cfd 100644
--- a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated
+++ b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-45ivybmzlpo4ejfs1b1ulpra999g2h8">
+<product version="3" modelHash="dz6t9b8m9frfjfdxu0jf8gts5tkhw90">
   <files names="Generator.java" />
 </product>
 
diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated
index c496dced57cf..3c13281b4a79 100644
--- a/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated
+++ b/plugins/mps-build/languages/build.mps/generator/source_gen.caches/jetbrains/mps/build/mps/generator/template/main/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-b319t80f8k6o4sydpuovkvcix81yuqe">
+<product version="3" modelHash="198otmd3hiyro025my0rtqz33mk1wyi">
   <files names="QueriesGenerated.java" />
 </product>
 
diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java
index c821d6353a9a..aff396f1ed6b 100644
--- a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java
+++ b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/QueriesGenerated.java
@@ -628,21 +628,24 @@ public static Object propertyMacro_GetValue_9_25(final PropertyMacroContext _con
     return "-Xmx" + heapSize + "m";
   }
   public static Object propertyMacro_GetValue_9_26(final PropertyMacroContext _context) {
-    return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL);
+    return ((String) _context.getVariable("var:generatorOptions"));
   }
   public static Object propertyMacro_GetValue_9_27(final PropertyMacroContext _context) {
-    return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}";
+    return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL);
   }
   public static Object propertyMacro_GetValue_9_28(final PropertyMacroContext _context) {
-    return SPropertyOperations.getString(_context.getNode(), PROPS.path$oN2q);
+    return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}";
   }
   public static Object propertyMacro_GetValue_9_29(final PropertyMacroContext _context) {
     return SPropertyOperations.getString(_context.getNode(), PROPS.path$oN2q);
   }
   public static Object propertyMacro_GetValue_9_30(final PropertyMacroContext _context) {
-    return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$iYKB), Context.defaultContext(_context));
+    return SPropertyOperations.getString(_context.getNode(), PROPS.path$oN2q);
   }
   public static Object propertyMacro_GetValue_9_31(final PropertyMacroContext _context) {
+    return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$iYKB), Context.defaultContext(_context));
+  }
+  public static Object propertyMacro_GetValue_9_32(final PropertyMacroContext _context) {
     SNode mpsAspect = Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q), CONCEPTS.BuildMpsAspect$Ey)).first();
 
     int heapSize;
@@ -656,19 +659,19 @@ public static Object propertyMacro_GetValue_9_31(final PropertyMacroContext _con
 
     return "-Xmx" + heapSize + "m";
   }
-  public static Object propertyMacro_GetValue_9_32(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_9_33(final PropertyMacroContext _context) {
     return SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL);
   }
-  public static Object propertyMacro_GetValue_9_33(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_9_34(final PropertyMacroContext _context) {
     return "${" + SPropertyOperations.getString(_context.getNode(), PROPS.name$MnvL) + "}";
   }
-  public static Object propertyMacro_GetValue_9_34(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_9_35(final PropertyMacroContext _context) {
     return SPropertyOperations.getString(SNodeOperations.cast(ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q)).findFirst((it) -> SNodeOperations.isInstanceOf(it, CONCEPTS.BuildMpsAspect$Ey)), CONCEPTS.BuildMpsAspect$Ey), PROPS.excludes$mj5k);
   }
-  public static Object propertyMacro_GetValue_9_35(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_9_36(final PropertyMacroContext _context) {
     return (String) BuildSourcePath__BehaviorDescriptor.getAntPath_id7ro1ZztyOh5.invoke(SLinkOperations.getTarget(_context.getNode(), LINKS.path$zL7z), Context.defaultContext(_context));
   }
-  public static Object propertyMacro_GetValue_9_36(final PropertyMacroContext _context) {
+  public static Object propertyMacro_GetValue_9_37(final PropertyMacroContext _context) {
     return SPropertyOperations.getString(_context.getNode(), PROPS.path$URGX);
   }
   public static Object propertyMacro_GetValue_11_0(final PropertyMacroContext _context) {
@@ -1058,35 +1061,38 @@ public static boolean ifMacro_Condition_9_6(final IfMacroContext _context) {
     return ((SNode) _context.getVariable("var:compilerOptions")) != null && isNotEmptyString(SPropertyOperations.getString(((SNode) _context.getVariable("var:compilerOptions")), PROPS.javaLevel$8zbK));
   }
   public static boolean ifMacro_Condition_9_7(final IfMacroContext _context) {
+    return ((String) _context.getVariable("var:generatorOptions")) != null;
+  }
+  public static boolean ifMacro_Condition_9_8(final IfMacroContext _context) {
     // XXX the reason I decided to put <mps.make> as alternative to <generate> as a start is
     //     to avoid deep dive into common/java/mps task dependencies and how to switch to a different set.
     //     Instead, just stick to present workflow
     return SPropertyOperations.getBoolean(Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.plugins$AsCR), CONCEPTS.BuildMPSPlugin$YW)).first(), PROPS.useMakeTask$aRFt);
   }
-  public static boolean ifMacro_Condition_9_8(final IfMacroContext _context) {
+  public static boolean ifMacro_Condition_9_9(final IfMacroContext _context) {
     return Sequence.fromIterable(((MPSModulesPartitioner) _context.getVariable("var:closure")).getExternal()).isNotEmpty();
   }
-  public static boolean ifMacro_Condition_9_9(final IfMacroContext _context) {
+  public static boolean ifMacro_Condition_9_10(final IfMacroContext _context) {
     SNode mpsAspect = Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q), CONCEPTS.BuildMpsAspect$Ey)).first();
     return (mpsAspect != null) && SPropertyOperations.getBoolean(mpsAspect, PROPS.testGeneration$xdoj);
   }
-  public static boolean ifMacro_Condition_9_10(final IfMacroContext _context) {
+  public static boolean ifMacro_Condition_9_11(final IfMacroContext _context) {
     SNode ba = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), LINKS.aspects$6r0Q)).findFirst((it) -> SNodeOperations.isInstanceOf(it, CONCEPTS.BuildMpsAspect$Ey));
     if ((ba == null)) {
       return false;
     }
     return isNotEmptyString(SPropertyOperations.getString(SNodeOperations.cast(ba, CONCEPTS.BuildMpsAspect$Ey), PROPS.excludes$mj5k));
   }
-  public static boolean ifMacro_Condition_9_11(final IfMacroContext _context) {
+  public static boolean ifMacro_Condition_9_12(final IfMacroContext _context) {
     return Sequence.fromIterable(((MPSModulesPartitioner) _context.getVariable("var:closure")).getExternal()).isNotEmpty();
   }
-  public static boolean ifMacro_Condition_9_12(final IfMacroContext _context) {
+  public static boolean ifMacro_Condition_9_13(final IfMacroContext _context) {
     // sort of stupid way to find out if project has 'generate' task;
     // although the previous one, hardcoded check for presence of specific task library node,
     // was not better.
     return Sequence.fromIterable(SNodeOperations.ofConcept(SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), LINKS.project$ciHu), LINKS.plugins$AsCR), CONCEPTS.BuildMPSPlugin$YW)).isNotEmpty();
   }
-  public static boolean ifMacro_Condition_9_13(final IfMacroContext _context) {
+  public static boolean ifMacro_Condition_9_14(final IfMacroContext _context) {
     return ListSequence.fromList(((List<SNode>) _context.getVariable("var:dependency"))).isNotEmpty();
   }
   public static boolean ifMacro_Condition_16_0(final IfMacroContext _context) {
@@ -1427,7 +1433,7 @@ public static Iterable<SNode> sourceNodesQuery_9_1(final SourceSubstituteMacroNo
     //      however, would need a node to hold 2 string values at a time
     // XXX FWIW, there's GeneratorInternal_PluginExpanded; though I hope to replace with just _IdeaPlugin reference some day,
     //    which is to be reduced to path value later.
-    return Sequence.fromIterable(Sequence.fromArray(((ModulePlugins) _context.getVariable("var:requiredPlugins")).getPluginPaths(_context))).select((it) -> createGeneratorInternal_String_x583g4_a0a0a0e0jn(it));
+    return Sequence.fromIterable(Sequence.fromArray(((ModulePlugins) _context.getVariable("var:requiredPlugins")).getPluginPaths(_context))).select((it) -> createGeneratorInternal_String_x583g4_a0a0a0e0ln(it));
   }
   public static Iterable<SNode> sourceNodesQuery_9_2(final SourceSubstituteMacroNodesContext _context) {
     return ModuleFinder.findModules(((ModulePlugins) _context.getVariable("var:requiredPlugins")).getModulesNotInPlugins(), _context, _context.getNode());
@@ -1471,7 +1477,7 @@ public static Iterable<SNode> sourceNodesQuery_9_9(final SourceSubstituteMacroNo
     return SNodeOperations.ofConcept(SLinkOperations.getChildren(_context.getNode(), LINKS.macros$r8_A), CONCEPTS.BuildFolderMacro$mR);
   }
   public static Iterable<SNode> sourceNodesQuery_9_10(final SourceSubstituteMacroNodesContext _context) {
-    return Sequence.fromIterable(Sequence.fromArray(((String[]) _context.getVariable("var:requiredPlugins")))).select((it) -> createGeneratorInternal_String_x583g4_a0a0a0a0sn(it));
+    return Sequence.fromIterable(Sequence.fromArray(((String[]) _context.getVariable("var:requiredPlugins")))).select((it) -> createGeneratorInternal_String_x583g4_a0a0a0a0un(it));
   }
   public static Iterable<SNode> sourceNodesQuery_9_11(final SourceSubstituteMacroNodesContext _context) {
     return ((Iterable<SNode>) _context.getVariable("var:closureForGenTest"));
@@ -1775,7 +1781,7 @@ public static Object varMacro_Value_9_7(final TemplateVarContext _context) {
   }
   public static Object varMacro_Value_9_8(final TemplateVarContext _context) {
     List<Tuples._2<SNode, String>> dependencies = new ProjectDependency(_context, _context.getNode()).collectDependencies().getDependencies();
-    return ListSequence.fromList(dependencies).select((it) -> createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a893(it._1(), it._0())).toList();
+    return ListSequence.fromList(dependencies).select((it) -> createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a004(it._1(), it._0())).toList();
   }
   public static Object varMacro_Value_9_9(final TemplateVarContext _context) {
     MPSModulesPartitioner partitioner = new MPSModulesPartitioner(_context.getNode());
@@ -2328,6 +2334,7 @@ public Collection<SNode> evaluate(@NotNull SourceSubstituteMacroNodesContext ctx
     pvqMethods.put("4035665851936450300", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "aaa"));
     pvqMethods.put("4035665851936951126", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "module.msd"));
     pvqMethods.put("4035665851936219812", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "-Xmx512m"));
+    pvqMethods.put("1992944417853204718", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "--options"));
     pvqMethods.put("4035665851936216040", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "name"));
     pvqMethods.put("4035665851936216049", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "${propertyName}"));
     pvqMethods.put("3239569521490197761", new PVQ(i++, MetaAdapterFactory.getProperty(0x479c7a8c02f943b5L, 0x9139d910cb22f298L, 0x5c842a42c54cfd1fL, 0x5c842a42c54cfd20L, "text"), "plugins.path"));
@@ -2626,84 +2633,86 @@ public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailu
         case 114:
           return QueriesGenerated.propertyMacro_GetValue_9_36(ctx);
         case 115:
-          return QueriesGenerated.propertyMacro_GetValue_11_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_9_37(ctx);
         case 116:
-          return QueriesGenerated.propertyMacro_GetValue_11_1(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_11_0(ctx);
         case 117:
-          return QueriesGenerated.propertyMacro_GetValue_11_2(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_11_1(ctx);
         case 118:
-          return QueriesGenerated.propertyMacro_GetValue_12_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_11_2(ctx);
         case 119:
-          return QueriesGenerated.propertyMacro_GetValue_12_1(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_12_0(ctx);
         case 120:
-          return QueriesGenerated.propertyMacro_GetValue_12_2(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_12_1(ctx);
         case 121:
-          return QueriesGenerated.propertyMacro_GetValue_12_3(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_12_2(ctx);
         case 122:
-          return QueriesGenerated.propertyMacro_GetValue_13_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_12_3(ctx);
         case 123:
-          return QueriesGenerated.propertyMacro_GetValue_13_1(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_13_0(ctx);
         case 124:
-          return QueriesGenerated.propertyMacro_GetValue_16_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_13_1(ctx);
         case 125:
-          return QueriesGenerated.propertyMacro_GetValue_16_1(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_0(ctx);
         case 126:
-          return QueriesGenerated.propertyMacro_GetValue_16_2(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_1(ctx);
         case 127:
-          return QueriesGenerated.propertyMacro_GetValue_16_3(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_2(ctx);
         case 128:
-          return QueriesGenerated.propertyMacro_GetValue_16_4(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_3(ctx);
         case 129:
-          return QueriesGenerated.propertyMacro_GetValue_16_5(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_4(ctx);
         case 130:
-          return QueriesGenerated.propertyMacro_GetValue_16_6(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_5(ctx);
         case 131:
-          return QueriesGenerated.propertyMacro_GetValue_16_7(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_6(ctx);
         case 132:
-          return QueriesGenerated.propertyMacro_GetValue_16_8(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_7(ctx);
         case 133:
-          return QueriesGenerated.propertyMacro_GetValue_16_9(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_8(ctx);
         case 134:
-          return QueriesGenerated.propertyMacro_GetValue_16_10(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_9(ctx);
         case 135:
-          return QueriesGenerated.propertyMacro_GetValue_16_11(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_10(ctx);
         case 136:
-          return QueriesGenerated.propertyMacro_GetValue_16_12(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_11(ctx);
         case 137:
-          return QueriesGenerated.propertyMacro_GetValue_16_13(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_12(ctx);
         case 138:
-          return QueriesGenerated.propertyMacro_GetValue_16_14(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_13(ctx);
         case 139:
-          return QueriesGenerated.propertyMacro_GetValue_16_15(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_14(ctx);
         case 140:
-          return QueriesGenerated.propertyMacro_GetValue_16_16(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_15(ctx);
         case 141:
-          return QueriesGenerated.propertyMacro_GetValue_16_17(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_16(ctx);
         case 142:
-          return QueriesGenerated.propertyMacro_GetValue_16_18(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_17(ctx);
         case 143:
-          return QueriesGenerated.propertyMacro_GetValue_17_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_16_18(ctx);
         case 144:
-          return QueriesGenerated.propertyMacro_GetValue_17_1(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_17_0(ctx);
         case 145:
-          return QueriesGenerated.propertyMacro_GetValue_17_2(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_17_1(ctx);
         case 146:
-          return QueriesGenerated.propertyMacro_GetValue_18_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_17_2(ctx);
         case 147:
-          return QueriesGenerated.propertyMacro_GetValue_18_1(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_18_0(ctx);
         case 148:
-          return QueriesGenerated.propertyMacro_GetValue_21_0(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_18_1(ctx);
         case 149:
-          return QueriesGenerated.propertyMacro_GetValue_21_1(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_21_0(ctx);
         case 150:
-          return QueriesGenerated.propertyMacro_GetValue_21_2(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_21_1(ctx);
         case 151:
-          return QueriesGenerated.propertyMacro_GetValue_21_3(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_21_2(ctx);
         case 152:
-          return QueriesGenerated.propertyMacro_GetValue_21_4(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_21_3(ctx);
         case 153:
-          return QueriesGenerated.propertyMacro_GetValue_21_5(ctx);
+          return QueriesGenerated.propertyMacro_GetValue_21_4(ctx);
         case 154:
+          return QueriesGenerated.propertyMacro_GetValue_21_5(ctx);
+        case 155:
           return QueriesGenerated.propertyMacro_GetValue_21_6(ctx);
         default:
           throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no method for query %s (key: #%d)", ctx.getTemplateReference(), methodKey));
@@ -2778,6 +2787,7 @@ public Object evaluate(@NotNull PropertyMacroContext ctx) throws GenerationFailu
     imcMethods.put("1933226676407114454", new IfMC(i++));
     imcMethods.put("4035665851936438514", new IfMC(i++));
     imcMethods.put("4035665851935707502", new IfMC(i++));
+    imcMethods.put("1992944417853204725", new IfMC(i++));
     imcMethods.put("4035665851935770399", new IfMC(i++));
     imcMethods.put("398731435601112750", new IfMC(i++));
     imcMethods.put("1787667533297084980", new IfMC(i++));
@@ -2952,18 +2962,20 @@ public boolean check(@NotNull IfMacroContext ctx) throws GenerationFailureExcept
         case 71:
           return QueriesGenerated.ifMacro_Condition_9_13(ctx);
         case 72:
-          return QueriesGenerated.ifMacro_Condition_16_0(ctx);
+          return QueriesGenerated.ifMacro_Condition_9_14(ctx);
         case 73:
-          return QueriesGenerated.ifMacro_Condition_16_1(ctx);
+          return QueriesGenerated.ifMacro_Condition_16_0(ctx);
         case 74:
-          return QueriesGenerated.ifMacro_Condition_18_0(ctx);
+          return QueriesGenerated.ifMacro_Condition_16_1(ctx);
         case 75:
-          return QueriesGenerated.ifMacro_Condition_21_0(ctx);
+          return QueriesGenerated.ifMacro_Condition_18_0(ctx);
         case 76:
-          return QueriesGenerated.ifMacro_Condition_21_1(ctx);
+          return QueriesGenerated.ifMacro_Condition_21_0(ctx);
         case 77:
-          return QueriesGenerated.ifMacro_Condition_21_2(ctx);
+          return QueriesGenerated.ifMacro_Condition_21_1(ctx);
         case 78:
+          return QueriesGenerated.ifMacro_Condition_21_2(ctx);
+        case 79:
           return QueriesGenerated.ifMacro_Condition_21_3(ctx);
         default:
           throw new GenerationFailureException(String.format("Inconsistent QueriesGenerated: there's no condition method for if macro %s (key: #%d)", ctx.getTemplateReference(), methodKey));
@@ -3299,17 +3311,17 @@ public void invoke(@NotNull MapSrcMacroPostProcContext ctx) throws GenerationFai
       }
     }
   }
-  private static SNode createGeneratorInternal_String_x583g4_a0a0a0e0jn(String p0) {
+  private static SNode createGeneratorInternal_String_x583g4_a0a0a0e0ln(String p0) {
     SNodeBuilder n0 = new SNodeBuilder().init(CONCEPTS.GeneratorInternal_String$CC);
     n0.setProperty(PROPS.path$oN2q, p0);
     return n0.getResult();
   }
-  private static SNode createGeneratorInternal_String_x583g4_a0a0a0a0sn(String p0) {
+  private static SNode createGeneratorInternal_String_x583g4_a0a0a0a0un(String p0) {
     SNodeBuilder n0 = new SNodeBuilder().init(CONCEPTS.GeneratorInternal_String$CC);
     n0.setProperty(PROPS.path$oN2q, p0);
     return n0.getResult();
   }
-  private static SNode createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a893(String p0, SNode p1) {
+  private static SNode createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a004(String p0, SNode p1) {
     SNodeBuilder n0 = new SNodeBuilder().init(CONCEPTS.GeneratorInternal_ProjectDependency$bb);
     n0.setProperty(PROPS.path$URGX, p0);
     n0.setReferenceTarget(LINKS.project$ciHu, p1);
diff --git a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info
index 7fefad7e3235..73579505ad62 100644
--- a/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info
+++ b/plugins/mps-build/languages/build.mps/generator/source_gen/jetbrains/mps/build/mps/generator/template/main/trace.info
@@ -14,22 +14,22 @@
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1076505808687:jetbrains.mps.baseLanguage.structure.WhileStatement" />
   <root>
     <file name="QueriesGenerated.java">
-      <unit at="1910,0,1926,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$SCB" />
-      <unit at="1809,0,1834,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$RRC" />
-      <unit at="2990,0,3017,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$ISCC" />
-      <unit at="3275,0,3302,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$PPQ" />
-      <unit at="3442,0,3480,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$CONCEPTS" />
-      <unit at="1858,0,1899,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$WRQ" />
-      <unit at="3481,0,3523,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$PROPS" />
-      <unit at="3043,0,3091,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$RTQ" />
-      <unit at="3121,0,3176,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$VVQ" />
-      <unit at="3206,0,3261,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$CAQ" />
-      <unit at="1961,0,2024,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$SNQ" />
-      <unit at="3325,0,3441,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$LINKS" />
-      <unit at="2093,0,2224,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$SNsQ" />
-      <unit at="2802,0,2973,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$IfMC" />
-      <unit at="2389,0,2713,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$PVQ" />
-      <unit at="103,0,3524,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated" />
+      <unit at="1916,0,1932,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$SCB" />
+      <unit at="1815,0,1840,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$RRC" />
+      <unit at="3002,0,3029,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$ISCC" />
+      <unit at="3287,0,3314,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$PPQ" />
+      <unit at="3454,0,3492,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$CONCEPTS" />
+      <unit at="1864,0,1905,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$WRQ" />
+      <unit at="3493,0,3535,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$PROPS" />
+      <unit at="3055,0,3103,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$RTQ" />
+      <unit at="3133,0,3188,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$VVQ" />
+      <unit at="3218,0,3273,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$CAQ" />
+      <unit at="1967,0,2030,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$SNQ" />
+      <unit at="3337,0,3453,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$LINKS" />
+      <unit at="2099,0,2230,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$SNsQ" />
+      <unit at="2812,0,2985,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$IfMC" />
+      <unit at="2396,0,2722,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$PVQ" />
+      <unit at="103,0,3536,0" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated" />
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/1265949165890610447">
@@ -46,165 +46,165 @@
       <node id="7862711839426716703" at="308,5,309,50" concept="6" />
       <node id="7918752904810573907" at="311,88,312,94" concept="6" />
       <node id="2540145662854694193" at="314,88,315,130" concept="6" />
-      <node id="4643216374596212172" at="812,93,813,167" concept="6" />
-      <node id="1517654889520202460" at="815,93,816,30" concept="6" />
-      <node id="1517654889523632485" at="818,93,819,76" concept="6" />
-      <node id="7454762407074000899" at="887,78,888,206" concept="6" />
-      <node id="3335207478149132083" at="890,78,891,247" concept="6" />
-      <node id="3335207478149152704" at="893,78,894,245" concept="6" />
-      <node id="2540145662854694301" at="896,78,897,70" concept="6" />
-      <node id="1241280061045797645" at="1135,92,1136,76" concept="6" />
-      <node id="763829979706275425" at="1210,90,1211,191" concept="6" />
-      <node id="1241280061045711831" at="1213,90,1214,263" concept="6" />
-      <node id="8062866996715238024" at="1216,90,1217,244" concept="6" />
-      <node id="1241280061045633251" at="1219,90,1220,84" concept="6" />
-      <node id="1241280061045812456" at="1222,90,1223,225" concept="6" />
-      <node id="1241280061045812468" at="1225,90,1226,271" concept="6" />
-      <node id="1241280061045812484" at="1228,90,1229,29" concept="6" />
-      <node id="230419292059631172" at="1359,104,1360,174" concept="6" />
-      <node id="3335207478149114599" at="1362,104,1363,131" concept="6" />
-      <node id="3944422889387266813" at="1365,104,1366,79" concept="6" />
-      <node id="7862711839426439931" at="1368,104,1369,233" concept="6" />
-      <node id="1517654889523644403" at="1371,104,1372,67" concept="5" />
-      <node id="1517654889523651796" at="1372,67,1373,298" concept="1" />
-      <node id="1517654889523980921" at="1373,298,1374,0" concept="8" />
-      <node id="1517654889523707313" at="1375,136,1376,410" concept="1" />
-      <node id="1517654889523981012" at="1377,5,1378,0" concept="8" />
-      <node id="1517654889523724903" at="1378,0,1379,236" concept="6" />
-      <node id="3335207478149152719" at="1381,104,1382,129" concept="6" />
-      <node id="7477562766051744163" at="1666,78,1667,68" concept="7" />
-      <node id="7477562766051736342" at="1667,68,1668,30" concept="6" />
-      <node id="1241280061045796456" at="1935,56,1936,56" concept="1" />
-      <node id="1241280061045796456" at="1983,15,1984,59" concept="6" />
-      <node id="230419292059623319" at="2046,58,2047,57" concept="1" />
-      <node id="3335207478149112020" at="2047,57,2048,58" concept="1" />
-      <node id="3944422889387266811" at="2048,58,2049,58" concept="1" />
-      <node id="7862711839426437495" at="2049,58,2050,58" concept="1" />
-      <node id="2540145662854694642" at="2050,58,2051,58" concept="1" />
-      <node id="3335207478149152717" at="2051,58,2052,58" concept="1" />
-      <node id="230419292059623319" at="2141,16,2142,87" concept="6" />
-      <node id="3335207478149112020" at="2143,16,2144,87" concept="6" />
-      <node id="3944422889387266811" at="2145,16,2146,87" concept="6" />
-      <node id="7862711839426437495" at="2147,16,2148,87" concept="6" />
-      <node id="2540145662854694642" at="2149,16,2150,87" concept="6" />
-      <node id="3335207478149152717" at="2151,16,2152,87" concept="6" />
-      <node id="2540145662854694139" at="2247,190,2248,194" concept="1" />
-      <node id="9200313594511245387" at="2248,194,2249,204" concept="1" />
-      <node id="7918752904810572709" at="2249,204,2250,200" concept="1" />
-      <node id="2540145662854694190" at="2250,200,2251,198" concept="1" />
-      <node id="2540145662854694139" at="2440,16,2441,66" concept="6" />
-      <node id="9200313594511245387" at="2442,16,2443,66" concept="6" />
-      <node id="7918752904810572709" at="2444,16,2445,66" concept="6" />
-      <node id="2540145662854694190" at="2446,16,2447,66" concept="6" />
-      <node id="2794582399917924014" at="2725,57,2726,57" concept="1" />
-      <node id="3335207478149118950" at="2726,57,2727,57" concept="1" />
-      <node id="3335207478149152701" at="2727,57,2728,57" concept="1" />
-      <node id="2540145662854694312" at="2728,57,2729,57" concept="1" />
-      <node id="2794582399917924014" at="2830,16,2831,61" concept="6" />
-      <node id="3335207478149118950" at="2832,16,2833,61" concept="6" />
-      <node id="3335207478149152701" at="2834,16,2835,61" concept="6" />
-      <node id="2540145662854694312" at="2836,16,2837,61" concept="6" />
-      <node id="2591537044436106597" at="3020,64,3021,61" concept="1" />
-      <node id="9200313594511245340" at="3021,61,3022,61" concept="1" />
-      <node id="1517654889523632482" at="3022,61,3023,61" concept="1" />
-      <node id="2591537044436106597" at="3056,15,3057,70" concept="6" />
-      <node id="9200313594511245340" at="3058,15,3059,70" concept="6" />
-      <node id="1517654889523632482" at="3060,15,3061,70" concept="6" />
-      <node id="2409421742521905593" at="3100,54,3101,54" concept="1" />
-      <node id="2409421742521905593" at="3145,15,3146,58" concept="6" />
-      <node id="763829979706275425" at="3183,54,3184,53" concept="1" />
-      <node id="1241280061045711831" at="3184,53,3185,54" concept="1" />
-      <node id="8062866996715238024" at="3185,54,3186,54" concept="1" />
-      <node id="1241280061045633251" at="3186,54,3187,54" concept="1" />
-      <node id="1241280061045812456" at="3187,54,3188,55" concept="1" />
-      <node id="1241280061045812468" at="3188,55,3189,55" concept="1" />
-      <node id="1241280061045812484" at="3189,55,3190,55" concept="1" />
-      <node id="763829979706275425" at="3226,15,3227,65" concept="6" />
-      <node id="1241280061045711831" at="3228,15,3229,65" concept="6" />
-      <node id="8062866996715238024" at="3230,15,3231,65" concept="6" />
-      <node id="1241280061045633251" at="3232,15,3233,65" concept="6" />
-      <node id="1241280061045812456" at="3234,16,3235,65" concept="6" />
-      <node id="1241280061045812468" at="3236,16,3237,65" concept="6" />
-      <node id="1241280061045812484" at="3238,16,3239,65" concept="6" />
+      <node id="4643216374596212172" at="815,93,816,167" concept="6" />
+      <node id="1517654889520202460" at="818,93,819,30" concept="6" />
+      <node id="1517654889523632485" at="821,93,822,76" concept="6" />
+      <node id="7454762407074000899" at="890,78,891,206" concept="6" />
+      <node id="3335207478149132083" at="893,78,894,247" concept="6" />
+      <node id="3335207478149152704" at="896,78,897,245" concept="6" />
+      <node id="2540145662854694301" at="899,78,900,70" concept="6" />
+      <node id="1241280061045797645" at="1141,92,1142,76" concept="6" />
+      <node id="763829979706275425" at="1216,90,1217,191" concept="6" />
+      <node id="1241280061045711831" at="1219,90,1220,263" concept="6" />
+      <node id="8062866996715238024" at="1222,90,1223,244" concept="6" />
+      <node id="1241280061045633251" at="1225,90,1226,84" concept="6" />
+      <node id="1241280061045812456" at="1228,90,1229,225" concept="6" />
+      <node id="1241280061045812468" at="1231,90,1232,271" concept="6" />
+      <node id="1241280061045812484" at="1234,90,1235,29" concept="6" />
+      <node id="230419292059631172" at="1365,104,1366,174" concept="6" />
+      <node id="3335207478149114599" at="1368,104,1369,131" concept="6" />
+      <node id="3944422889387266813" at="1371,104,1372,79" concept="6" />
+      <node id="7862711839426439931" at="1374,104,1375,233" concept="6" />
+      <node id="1517654889523644403" at="1377,104,1378,67" concept="5" />
+      <node id="1517654889523651796" at="1378,67,1379,298" concept="1" />
+      <node id="1517654889523980921" at="1379,298,1380,0" concept="8" />
+      <node id="1517654889523707313" at="1381,136,1382,410" concept="1" />
+      <node id="1517654889523981012" at="1383,5,1384,0" concept="8" />
+      <node id="1517654889523724903" at="1384,0,1385,236" concept="6" />
+      <node id="3335207478149152719" at="1387,104,1388,129" concept="6" />
+      <node id="7477562766051744163" at="1672,78,1673,68" concept="7" />
+      <node id="7477562766051736342" at="1673,68,1674,30" concept="6" />
+      <node id="1241280061045796456" at="1941,56,1942,56" concept="1" />
+      <node id="1241280061045796456" at="1989,15,1990,59" concept="6" />
+      <node id="230419292059623319" at="2052,58,2053,57" concept="1" />
+      <node id="3335207478149112020" at="2053,57,2054,58" concept="1" />
+      <node id="3944422889387266811" at="2054,58,2055,58" concept="1" />
+      <node id="7862711839426437495" at="2055,58,2056,58" concept="1" />
+      <node id="2540145662854694642" at="2056,58,2057,58" concept="1" />
+      <node id="3335207478149152717" at="2057,58,2058,58" concept="1" />
+      <node id="230419292059623319" at="2147,16,2148,87" concept="6" />
+      <node id="3335207478149112020" at="2149,16,2150,87" concept="6" />
+      <node id="3944422889387266811" at="2151,16,2152,87" concept="6" />
+      <node id="7862711839426437495" at="2153,16,2154,87" concept="6" />
+      <node id="2540145662854694642" at="2155,16,2156,87" concept="6" />
+      <node id="3335207478149152717" at="2157,16,2158,87" concept="6" />
+      <node id="2540145662854694139" at="2253,190,2254,194" concept="1" />
+      <node id="9200313594511245387" at="2254,194,2255,204" concept="1" />
+      <node id="7918752904810572709" at="2255,204,2256,200" concept="1" />
+      <node id="2540145662854694190" at="2256,200,2257,198" concept="1" />
+      <node id="2540145662854694139" at="2447,16,2448,66" concept="6" />
+      <node id="9200313594511245387" at="2449,16,2450,66" concept="6" />
+      <node id="7918752904810572709" at="2451,16,2452,66" concept="6" />
+      <node id="2540145662854694190" at="2453,16,2454,66" concept="6" />
+      <node id="2794582399917924014" at="2734,57,2735,57" concept="1" />
+      <node id="3335207478149118950" at="2735,57,2736,57" concept="1" />
+      <node id="3335207478149152701" at="2736,57,2737,57" concept="1" />
+      <node id="2540145662854694312" at="2737,57,2738,57" concept="1" />
+      <node id="2794582399917924014" at="2840,16,2841,61" concept="6" />
+      <node id="3335207478149118950" at="2842,16,2843,61" concept="6" />
+      <node id="3335207478149152701" at="2844,16,2845,61" concept="6" />
+      <node id="2540145662854694312" at="2846,16,2847,61" concept="6" />
+      <node id="2591537044436106597" at="3032,64,3033,61" concept="1" />
+      <node id="9200313594511245340" at="3033,61,3034,61" concept="1" />
+      <node id="1517654889523632482" at="3034,61,3035,61" concept="1" />
+      <node id="2591537044436106597" at="3068,15,3069,70" concept="6" />
+      <node id="9200313594511245340" at="3070,15,3071,70" concept="6" />
+      <node id="1517654889523632482" at="3072,15,3073,70" concept="6" />
+      <node id="2409421742521905593" at="3112,54,3113,54" concept="1" />
+      <node id="2409421742521905593" at="3157,15,3158,58" concept="6" />
+      <node id="763829979706275425" at="3195,54,3196,53" concept="1" />
+      <node id="1241280061045711831" at="3196,53,3197,54" concept="1" />
+      <node id="8062866996715238024" at="3197,54,3198,54" concept="1" />
+      <node id="1241280061045633251" at="3198,54,3199,54" concept="1" />
+      <node id="1241280061045812456" at="3199,54,3200,55" concept="1" />
+      <node id="1241280061045812468" at="3200,55,3201,55" concept="1" />
+      <node id="1241280061045812484" at="3201,55,3202,55" concept="1" />
+      <node id="763829979706275425" at="3238,15,3239,65" concept="6" />
+      <node id="1241280061045711831" at="3240,15,3241,65" concept="6" />
+      <node id="8062866996715238024" at="3242,15,3243,65" concept="6" />
+      <node id="1241280061045633251" at="3244,15,3245,65" concept="6" />
+      <node id="1241280061045812456" at="3246,16,3247,65" concept="6" />
+      <node id="1241280061045812468" at="3248,16,3249,65" concept="6" />
+      <node id="1241280061045812484" at="3250,16,3251,65" concept="6" />
       <node id="2540145662854694140" at="295,0,298,0" concept="9" trace="propertyMacro_GetValue_3_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="7918752904810572710" at="311,0,314,0" concept="9" trace="propertyMacro_GetValue_3_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="2540145662854694191" at="314,0,317,0" concept="9" trace="propertyMacro_GetValue_3_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="2591537044436106598" at="812,0,815,0" concept="9" trace="referenceMacro_GetReferent_3_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="9200313594511245341" at="815,0,818,0" concept="9" trace="referenceMacro_GetReferent_3_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="1517654889523632483" at="818,0,821,0" concept="9" trace="referenceMacro_GetReferent_3_2#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="2794582399917924015" at="887,0,890,0" concept="9" trace="ifMacro_Condition_3_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="3335207478149118952" at="890,0,893,0" concept="9" trace="ifMacro_Condition_3_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="3335207478149152702" at="893,0,896,0" concept="9" trace="ifMacro_Condition_3_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="2540145662854694313" at="896,0,899,0" concept="9" trace="ifMacro_Condition_3_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1241280061045796456" at="1135,0,1138,0" concept="9" trace="sourceNodeQuery_3_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="763829979706275425" at="1210,0,1213,0" concept="9" trace="templateArgumentQuery_3_0#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061045711831" at="1213,0,1216,0" concept="9" trace="templateArgumentQuery_3_1#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="8062866996715238024" at="1216,0,1219,0" concept="9" trace="templateArgumentQuery_3_2#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061045633251" at="1219,0,1222,0" concept="9" trace="templateArgumentQuery_3_3#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061045812456" at="1222,0,1225,0" concept="9" trace="templateArgumentQuery_3_4#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061045812468" at="1225,0,1228,0" concept="9" trace="templateArgumentQuery_3_5#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061045812484" at="1228,0,1231,0" concept="9" trace="templateArgumentQuery_3_6#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="230419292059623319" at="1359,0,1362,0" concept="9" trace="sourceNodesQuery_3_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="3335207478149112020" at="1362,0,1365,0" concept="9" trace="sourceNodesQuery_3_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="3944422889387266811" at="1365,0,1368,0" concept="9" trace="sourceNodesQuery_3_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7862711839426437495" at="1368,0,1371,0" concept="9" trace="sourceNodesQuery_3_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="1517654889523701807" at="1374,0,1377,5" concept="3" />
-      <node id="3335207478149152717" at="1381,0,1384,0" concept="9" trace="sourceNodesQuery_3_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7477562766051723482" at="1666,0,1670,0" concept="9" trace="varMacro_Value_3_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="2591537044436106598" at="815,0,818,0" concept="9" trace="referenceMacro_GetReferent_3_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="9200313594511245341" at="818,0,821,0" concept="9" trace="referenceMacro_GetReferent_3_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="1517654889523632483" at="821,0,824,0" concept="9" trace="referenceMacro_GetReferent_3_2#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="2794582399917924015" at="890,0,893,0" concept="9" trace="ifMacro_Condition_3_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="3335207478149118952" at="893,0,896,0" concept="9" trace="ifMacro_Condition_3_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="3335207478149152702" at="896,0,899,0" concept="9" trace="ifMacro_Condition_3_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="2540145662854694313" at="899,0,902,0" concept="9" trace="ifMacro_Condition_3_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1241280061045796456" at="1141,0,1144,0" concept="9" trace="sourceNodeQuery_3_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="763829979706275425" at="1216,0,1219,0" concept="9" trace="templateArgumentQuery_3_0#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061045711831" at="1219,0,1222,0" concept="9" trace="templateArgumentQuery_3_1#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="8062866996715238024" at="1222,0,1225,0" concept="9" trace="templateArgumentQuery_3_2#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061045633251" at="1225,0,1228,0" concept="9" trace="templateArgumentQuery_3_3#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061045812456" at="1228,0,1231,0" concept="9" trace="templateArgumentQuery_3_4#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061045812468" at="1231,0,1234,0" concept="9" trace="templateArgumentQuery_3_5#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061045812484" at="1234,0,1237,0" concept="9" trace="templateArgumentQuery_3_6#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="230419292059623319" at="1365,0,1368,0" concept="9" trace="sourceNodesQuery_3_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="3335207478149112020" at="1368,0,1371,0" concept="9" trace="sourceNodesQuery_3_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="3944422889387266811" at="1371,0,1374,0" concept="9" trace="sourceNodesQuery_3_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7862711839426437495" at="1374,0,1377,0" concept="9" trace="sourceNodesQuery_3_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="1517654889523701807" at="1380,0,1383,5" concept="3" />
+      <node id="3335207478149152717" at="1387,0,1390,0" concept="9" trace="sourceNodesQuery_3_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7477562766051723482" at="1672,0,1676,0" concept="9" trace="varMacro_Value_3_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
       <node id="7862711839426553738" at="300,136,308,5" concept="3" />
-      <node id="2540145662854694642" at="1371,0,1381,0" concept="9" trace="sourceNodesQuery_3_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="2540145662854694642" at="1377,0,1387,0" concept="9" trace="sourceNodesQuery_3_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
       <node id="9200313594511245388" at="298,0,311,0" concept="9" trace="propertyMacro_GetValue_3_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <scope id="2540145662854694141" at="295,88,296,133" />
       <scope id="7918752904810572711" at="311,88,312,94" />
       <scope id="2540145662854694192" at="314,88,315,130" />
-      <scope id="2591537044436106599" at="812,93,813,167" />
-      <scope id="9200313594511245342" at="815,93,816,30" />
-      <scope id="1517654889523632484" at="818,93,819,76" />
-      <scope id="2794582399917924016" at="887,78,888,206" />
-      <scope id="3335207478149118954" at="890,78,891,247" />
-      <scope id="3335207478149152703" at="893,78,894,245" />
-      <scope id="2540145662854694314" at="896,78,897,70" />
-      <scope id="1241280061045796457" at="1135,92,1136,76" />
-      <scope id="763829979706275425" at="1210,90,1211,191" />
-      <scope id="1241280061045711831" at="1213,90,1214,263" />
-      <scope id="8062866996715238024" at="1216,90,1217,244" />
-      <scope id="1241280061045633251" at="1219,90,1220,84" />
-      <scope id="1241280061045812456" at="1222,90,1223,225" />
-      <scope id="1241280061045812468" at="1225,90,1226,271" />
-      <scope id="1241280061045812484" at="1228,90,1229,29" />
-      <scope id="230419292059623321" at="1359,104,1360,174" />
-      <scope id="3335207478149112030" at="1362,104,1363,131" />
-      <scope id="3944422889387266812" at="1365,104,1366,79" />
-      <scope id="7862711839426437517" at="1368,104,1369,233" />
-      <scope id="1517654889523701810" at="1375,136,1376,410" />
-      <scope id="3335207478149152718" at="1381,104,1382,129" />
-      <scope id="1241280061045796456" at="1983,15,1984,59" />
-      <scope id="230419292059623319" at="2141,16,2142,87" />
-      <scope id="3335207478149112020" at="2143,16,2144,87" />
-      <scope id="3944422889387266811" at="2145,16,2146,87" />
-      <scope id="7862711839426437495" at="2147,16,2148,87" />
-      <scope id="2540145662854694642" at="2149,16,2150,87" />
-      <scope id="3335207478149152717" at="2151,16,2152,87" />
-      <scope id="2540145662854694139" at="2440,16,2441,66" />
-      <scope id="9200313594511245387" at="2442,16,2443,66" />
-      <scope id="7918752904810572709" at="2444,16,2445,66" />
-      <scope id="2540145662854694190" at="2446,16,2447,66" />
-      <scope id="2794582399917924014" at="2830,16,2831,61" />
-      <scope id="3335207478149118950" at="2832,16,2833,61" />
-      <scope id="3335207478149152701" at="2834,16,2835,61" />
-      <scope id="2540145662854694312" at="2836,16,2837,61" />
-      <scope id="2591537044436106597" at="3056,15,3057,70" />
-      <scope id="9200313594511245340" at="3058,15,3059,70" />
-      <scope id="1517654889523632482" at="3060,15,3061,70" />
-      <scope id="2409421742521905593" at="3145,15,3146,58" />
-      <scope id="763829979706275425" at="3226,15,3227,65" />
-      <scope id="1241280061045711831" at="3228,15,3229,65" />
-      <scope id="8062866996715238024" at="3230,15,3231,65" />
-      <scope id="1241280061045633251" at="3232,15,3233,65" />
-      <scope id="1241280061045812456" at="3234,16,3235,65" />
-      <scope id="1241280061045812468" at="3236,16,3237,65" />
-      <scope id="1241280061045812484" at="3238,16,3239,65" />
-      <scope id="7477562766051723484" at="1666,78,1668,30" />
+      <scope id="2591537044436106599" at="815,93,816,167" />
+      <scope id="9200313594511245342" at="818,93,819,30" />
+      <scope id="1517654889523632484" at="821,93,822,76" />
+      <scope id="2794582399917924016" at="890,78,891,206" />
+      <scope id="3335207478149118954" at="893,78,894,247" />
+      <scope id="3335207478149152703" at="896,78,897,245" />
+      <scope id="2540145662854694314" at="899,78,900,70" />
+      <scope id="1241280061045796457" at="1141,92,1142,76" />
+      <scope id="763829979706275425" at="1216,90,1217,191" />
+      <scope id="1241280061045711831" at="1219,90,1220,263" />
+      <scope id="8062866996715238024" at="1222,90,1223,244" />
+      <scope id="1241280061045633251" at="1225,90,1226,84" />
+      <scope id="1241280061045812456" at="1228,90,1229,225" />
+      <scope id="1241280061045812468" at="1231,90,1232,271" />
+      <scope id="1241280061045812484" at="1234,90,1235,29" />
+      <scope id="230419292059623321" at="1365,104,1366,174" />
+      <scope id="3335207478149112030" at="1368,104,1369,131" />
+      <scope id="3944422889387266812" at="1371,104,1372,79" />
+      <scope id="7862711839426437517" at="1374,104,1375,233" />
+      <scope id="1517654889523701810" at="1381,136,1382,410" />
+      <scope id="3335207478149152718" at="1387,104,1388,129" />
+      <scope id="1241280061045796456" at="1989,15,1990,59" />
+      <scope id="230419292059623319" at="2147,16,2148,87" />
+      <scope id="3335207478149112020" at="2149,16,2150,87" />
+      <scope id="3944422889387266811" at="2151,16,2152,87" />
+      <scope id="7862711839426437495" at="2153,16,2154,87" />
+      <scope id="2540145662854694642" at="2155,16,2156,87" />
+      <scope id="3335207478149152717" at="2157,16,2158,87" />
+      <scope id="2540145662854694139" at="2447,16,2448,66" />
+      <scope id="9200313594511245387" at="2449,16,2450,66" />
+      <scope id="7918752904810572709" at="2451,16,2452,66" />
+      <scope id="2540145662854694190" at="2453,16,2454,66" />
+      <scope id="2794582399917924014" at="2840,16,2841,61" />
+      <scope id="3335207478149118950" at="2842,16,2843,61" />
+      <scope id="3335207478149152701" at="2844,16,2845,61" />
+      <scope id="2540145662854694312" at="2846,16,2847,61" />
+      <scope id="2591537044436106597" at="3068,15,3069,70" />
+      <scope id="9200313594511245340" at="3070,15,3071,70" />
+      <scope id="1517654889523632482" at="3072,15,3073,70" />
+      <scope id="2409421742521905593" at="3157,15,3158,58" />
+      <scope id="763829979706275425" at="3238,15,3239,65" />
+      <scope id="1241280061045711831" at="3240,15,3241,65" />
+      <scope id="8062866996715238024" at="3242,15,3243,65" />
+      <scope id="1241280061045633251" at="3244,15,3245,65" />
+      <scope id="1241280061045812456" at="3246,16,3247,65" />
+      <scope id="1241280061045812468" at="3248,16,3249,65" />
+      <scope id="1241280061045812484" at="3250,16,3251,65" />
+      <scope id="7477562766051723484" at="1672,78,1674,30" />
       <scope id="2540145662854694140" at="295,0,298,0">
         <var name="_context" id="2540145662854694140" />
       </scope>
@@ -214,74 +214,74 @@
       <scope id="2540145662854694191" at="314,0,317,0">
         <var name="_context" id="2540145662854694191" />
       </scope>
-      <scope id="2591537044436106598" at="812,0,815,0">
+      <scope id="2591537044436106598" at="815,0,818,0">
         <var name="_context" id="2591537044436106598" />
       </scope>
-      <scope id="9200313594511245341" at="815,0,818,0">
+      <scope id="9200313594511245341" at="818,0,821,0">
         <var name="_context" id="9200313594511245341" />
       </scope>
-      <scope id="1517654889523632483" at="818,0,821,0">
+      <scope id="1517654889523632483" at="821,0,824,0">
         <var name="_context" id="1517654889523632483" />
       </scope>
-      <scope id="2794582399917924015" at="887,0,890,0">
+      <scope id="2794582399917924015" at="890,0,893,0">
         <var name="_context" id="2794582399917924015" />
       </scope>
-      <scope id="3335207478149118952" at="890,0,893,0">
+      <scope id="3335207478149118952" at="893,0,896,0">
         <var name="_context" id="3335207478149118952" />
       </scope>
-      <scope id="3335207478149152702" at="893,0,896,0">
+      <scope id="3335207478149152702" at="896,0,899,0">
         <var name="_context" id="3335207478149152702" />
       </scope>
-      <scope id="2540145662854694313" at="896,0,899,0">
+      <scope id="2540145662854694313" at="899,0,902,0">
         <var name="_context" id="2540145662854694313" />
       </scope>
-      <scope id="1241280061045796456" at="1135,0,1138,0">
+      <scope id="1241280061045796456" at="1141,0,1144,0">
         <var name="_context" id="1241280061045796456" />
       </scope>
-      <scope id="763829979706275425" at="1210,0,1213,0">
+      <scope id="763829979706275425" at="1216,0,1219,0">
         <var name="_context" id="763829979706275425" />
       </scope>
-      <scope id="1241280061045711831" at="1213,0,1216,0">
+      <scope id="1241280061045711831" at="1219,0,1222,0">
         <var name="_context" id="1241280061045711831" />
       </scope>
-      <scope id="8062866996715238024" at="1216,0,1219,0">
+      <scope id="8062866996715238024" at="1222,0,1225,0">
         <var name="_context" id="8062866996715238024" />
       </scope>
-      <scope id="1241280061045633251" at="1219,0,1222,0">
+      <scope id="1241280061045633251" at="1225,0,1228,0">
         <var name="_context" id="1241280061045633251" />
       </scope>
-      <scope id="1241280061045812456" at="1222,0,1225,0">
+      <scope id="1241280061045812456" at="1228,0,1231,0">
         <var name="_context" id="1241280061045812456" />
       </scope>
-      <scope id="1241280061045812468" at="1225,0,1228,0">
+      <scope id="1241280061045812468" at="1231,0,1234,0">
         <var name="_context" id="1241280061045812468" />
       </scope>
-      <scope id="1241280061045812484" at="1228,0,1231,0">
+      <scope id="1241280061045812484" at="1234,0,1237,0">
         <var name="_context" id="1241280061045812484" />
       </scope>
-      <scope id="230419292059623319" at="1359,0,1362,0">
+      <scope id="230419292059623319" at="1365,0,1368,0">
         <var name="_context" id="230419292059623319" />
       </scope>
-      <scope id="3335207478149112020" at="1362,0,1365,0">
+      <scope id="3335207478149112020" at="1368,0,1371,0">
         <var name="_context" id="3335207478149112020" />
       </scope>
-      <scope id="3944422889387266811" at="1365,0,1368,0">
+      <scope id="3944422889387266811" at="1371,0,1374,0">
         <var name="_context" id="3944422889387266811" />
       </scope>
-      <scope id="7862711839426437495" at="1368,0,1371,0">
+      <scope id="7862711839426437495" at="1374,0,1377,0">
         <var name="_context" id="7862711839426437495" />
       </scope>
-      <scope id="3335207478149152717" at="1381,0,1384,0">
+      <scope id="3335207478149152717" at="1387,0,1390,0">
         <var name="_context" id="3335207478149152717" />
       </scope>
-      <scope id="7477562766051723482" at="1666,0,1670,0">
+      <scope id="7477562766051723482" at="1672,0,1676,0">
         <var name="_context" id="7477562766051723482" />
       </scope>
       <scope id="7862711839426553740" at="301,59,307,80" />
-      <scope id="2540145662854694643" at="1371,104,1379,236">
+      <scope id="2540145662854694643" at="1377,104,1385,236">
         <var name="sources" id="1517654889523644406" />
       </scope>
-      <scope id="2540145662854694642" at="1371,0,1381,0">
+      <scope id="2540145662854694642" at="1377,0,1387,0">
         <var name="_context" id="2540145662854694642" />
       </scope>
       <scope id="9200313594511245389" at="298,88,309,50">
@@ -352,310 +352,316 @@
       <node id="4035665851936219870" at="624,21,625,21" concept="1" />
       <node id="4035665851936219874" at="626,5,627,0" concept="8" />
       <node id="4035665851936219875" at="627,0,628,35" concept="6" />
-      <node id="4035665851936216043" at="630,89,631,78" concept="6" />
-      <node id="4035665851936216052" at="633,89,634,91" concept="6" />
-      <node id="3239569521490197764" at="636,89,637,78" concept="6" />
-      <node id="8986357566212561517" at="639,89,640,78" concept="6" />
-      <node id="1374711517443210442" at="642,89,643,186" concept="6" />
-      <node id="8702237507672319036" at="645,89,646,176" concept="5" />
-      <node id="8702237507672319054" at="646,176,647,0" concept="8" />
-      <node id="8702237507672319055" at="647,0,648,17" concept="5" />
-      <node id="8702237507672319058" at="648,17,649,68" concept="7" />
-      <node id="8702237507672319062" at="650,113,651,97" concept="1" />
-      <node id="8702237507672319082" at="652,12,653,21" concept="7" />
-      <node id="8702237507672319084" at="653,21,654,21" concept="1" />
-      <node id="8702237507672319088" at="655,5,656,0" concept="8" />
-      <node id="8702237507672319089" at="656,0,657,35" concept="6" />
-      <node id="5002485985637417297" at="659,89,660,78" concept="6" />
-      <node id="5002485985637417306" at="662,89,663,91" concept="6" />
-      <node id="7795397664372773541" at="665,89,666,284" concept="6" />
-      <node id="5970181360963004537" at="668,89,669,186" concept="6" />
-      <node id="6354776497085480732" at="671,89,672,78" concept="6" />
-      <node id="1769740796772692686" at="1039,78,1040,94" concept="6" />
-      <node id="3733986151372083983" at="1042,78,1043,201" concept="6" />
-      <node id="5970181360960165101" at="1045,78,1046,91" concept="6" />
-      <node id="5970181360960165172" at="1048,78,1049,111" concept="6" />
-      <node id="1933226676407299157" at="1051,78,1052,75" concept="6" />
-      <node id="4035665851936446256" at="1054,78,1055,224" concept="6" />
-      <node id="4035665851935707505" at="1057,78,1058,201" concept="6" />
-      <node id="4035665851936685996" at="1060,78,1061,92" concept="7" />
-      <node id="4035665851936687556" at="1061,92,1062,106" concept="7" />
-      <node id="4035665851936688288" at="1062,106,1063,50" concept="7" />
-      <node id="4035665851935972877" at="1063,50,1064,221" concept="6" />
-      <node id="398731435601473232" at="1066,78,1067,123" concept="6" />
-      <node id="1787667533297288929" at="1069,78,1070,176" concept="5" />
-      <node id="1787667533297118841" at="1070,176,1071,103" concept="6" />
-      <node id="5002485985634208502" at="1073,79,1074,186" concept="5" />
-      <node id="5002485985634230623" at="1075,23,1076,19" concept="6" />
-      <node id="5002485985634250193" at="1077,5,1078,134" concept="6" />
-      <node id="3239569521490198043" at="1080,79,1081,123" concept="6" />
-      <node id="7358113559821750179" at="1083,79,1084,69" concept="7" />
-      <node id="7358113559821750731" at="1084,69,1085,93" concept="7" />
-      <node id="7358113559822136813" at="1085,93,1086,22" concept="7" />
-      <node id="4101476690147164906" at="1086,22,1087,217" concept="6" />
-      <node id="6354776497085480791" at="1089,79,1090,102" concept="6" />
-      <node id="5423338990220345233" at="1408,104,1409,158" concept="5" />
-      <node id="5423338990220397817" at="1410,50,1411,17" concept="6" />
-      <node id="4297162197628724874" at="1412,5,1413,210" concept="5" />
-      <node id="4297162197628740778" at="1413,210,1414,68" concept="1" />
-      <node id="4297162197629594973" at="1414,68,1415,69" concept="7" />
-      <node id="4297162197628923504" at="1415,69,1416,72" concept="1" />
-      <node id="4297162197628749231" at="1416,72,1417,66" concept="1" />
-      <node id="4297162197628917485" at="1417,66,1418,68" concept="1" />
-      <node id="3938719774425413411" at="1418,68,1419,73" concept="1" />
-      <node id="6535001758417087858" at="1419,73,1420,76" concept="1" />
-      <node id="3967774530650444686" at="1420,76,1421,353" concept="1" />
-      <node id="1769740796772658841" at="1421,353,1422,123" concept="7" />
-      <node id="5423338990220410532" at="1422,123,1423,47" concept="6" />
-      <node id="4035665851936450208" at="1425,104,1426,97" concept="7" />
-      <node id="4035665851936450225" at="1426,97,1427,72" concept="7" />
-      <node id="4035665851936450245" at="1427,72,1428,125" concept="7" />
-      <node id="4035665851936450262" at="1428,125,1429,53" concept="7" />
-      <node id="4035665851936450276" at="1429,53,1430,210" concept="6" />
-      <node id="3749662389731418659" at="1432,104,1433,154" concept="6" />
-      <node id="8845345751178284886" at="1436,124,1437,112" concept="5" />
-      <node id="8845345751178284894" at="1437,112,1438,42" concept="1" />
-      <node id="8845345751178284918" at="1438,42,1439,22" concept="6" />
-      <node id="5829439739855133196" at="1442,104,1443,201" concept="5" />
-      <node id="5829439739855203734" at="1443,201,1444,339" concept="5" />
-      <node id="5829439739855224494" at="1444,339,1445,92" concept="7" />
-      <node id="5829439739855228968" at="1445,92,1446,112" concept="7" />
-      <node id="5829439739855230879" at="1446,112,1447,118" concept="7" />
-      <node id="5829439739855235110" at="1447,118,1448,119" concept="7" />
-      <node id="5829439739855264444" at="1448,119,1449,71" concept="7" />
-      <node id="8845345751178284921" at="1449,71,1450,160" concept="6" />
-      <node id="5002485985636840980" at="1452,104,1453,135" concept="6" />
-      <node id="4031822141863243851" at="1455,104,1456,92" concept="7" />
-      <node id="4035665851936596632" at="1456,92,1457,90" concept="7" />
-      <node id="978600701690072962" at="1457,90,1458,101" concept="6" />
-      <node id="4035665851936612289" at="1458,101,1459,0" concept="8" />
-      <node id="4035665851936450310" at="1461,104,1462,154" concept="6" />
-      <node id="4035665851936901616" at="1464,104,1465,238" concept="5" />
-      <node id="4035665851937036765" at="1465,238,1466,49" concept="5" />
-      <node id="4035665851937091011" at="1466,49,1467,45" concept="7" />
-      <node id="4035665851936689343" at="1467,45,1468,257" concept="6" />
-      <node id="4035665851936216063" at="1470,104,1471,135" concept="6" />
-      <node id="3239569521490197893" at="1473,105,1474,180" concept="6" />
-      <node id="8986357566212775176" at="1476,105,1477,77" concept="6" />
-      <node id="3239569521490197951" at="1479,105,1480,297" concept="6" />
-      <node id="5002485985642145969" at="1482,105,1483,179" concept="6" />
-      <node id="1872825584233072238" at="1485,105,1486,84" concept="7" />
-      <node id="7354447573577595456" at="1486,84,1487,253" concept="5" />
-      <node id="7354447573577628662" at="1487,253,1488,0" concept="8" />
-      <node id="7354447573577627075" at="1491,41,1492,76" concept="6" />
-      <node id="7354447573577628497" at="1498,41,1499,76" concept="6" />
-      <node id="7354447573577628803" at="1502,27,1503,0" concept="8" />
-      <node id="5970181360963001900" at="1503,0,1504,84" concept="6" />
-      <node id="6354776497113986528" at="1506,105,1507,66" concept="6" />
-      <node id="1675583295863892878" at="1717,78,1718,197" concept="7" />
-      <node id="3340252814672973529" at="1718,197,1719,98" concept="5" />
-      <node id="3340252814672973536" at="1719,98,1720,32" concept="5" />
-      <node id="3340252814672973540" at="1720,32,1721,50" concept="5" />
-      <node id="3340252814672973622" at="1722,29,1723,42" concept="6" />
-      <node id="3340252814672973589" at="1725,243,1726,97" concept="1" />
-      <node id="3340252814672973703" at="1727,5,1728,16" concept="6" />
-      <node id="3340252814673340858" at="1730,78,1731,98" concept="5" />
-      <node id="3340252814673340865" at="1731,98,1732,33" concept="5" />
-      <node id="4963874803257640668" at="1732,33,1733,76" concept="7" />
-      <node id="923773175841067608" at="1733,76,1734,77" concept="7" />
-      <node id="3340252814673340869" at="1734,77,1735,45" concept="5" />
-      <node id="4963874803257612475" at="1736,24,1737,51" concept="5" />
-      <node id="3340252814673340880" at="1737,51,1738,68" concept="6" />
-      <node id="923773175841002021" at="1739,5,1740,97" concept="7" />
-      <node id="923773175841005215" at="1740,97,1741,50" concept="7" />
-      <node id="3340252814673340891" at="1742,243,1743,97" concept="1" />
-      <node id="3340252814673340919" at="1744,5,1745,16" concept="6" />
-      <node id="5970181360960165010" at="1747,78,1748,83" concept="6" />
-      <node id="6536521488243341287" at="1750,78,1751,255" concept="6" />
-      <node id="106891382227936603" at="1753,78,1754,149" concept="5" />
-      <node id="106891382227942087" at="1754,149,1755,121" concept="1" />
-      <node id="4438567763349691812" at="1755,121,1756,19" concept="6" />
-      <node id="1933226676407295325" at="1758,78,1759,275" concept="5" />
-      <node id="1933226676407295346" at="1759,275,1760,109" concept="6" />
-      <node id="106891382228416454" at="1762,78,1763,149" concept="5" />
-      <node id="106891382228416465" at="1763,149,1764,121" concept="1" />
-      <node id="106891382228416474" at="1764,121,1765,44" concept="6" />
-      <node id="8986357566212685835" at="1767,78,1768,85" concept="5" />
-      <node id="8986357566212685841" at="1768,85,1769,29" concept="1" />
-      <node id="1416143158804389770" at="1769,29,1770,33" concept="7" />
-      <node id="8986357566212685845" at="1770,33,1771,87" concept="5" />
-      <node id="8986357566212685853" at="1771,87,1772,114" concept="5" />
-      <node id="8986357566212685860" at="1772,114,1773,268" concept="5" />
-      <node id="8986357566212773837" at="1773,268,1774,78" concept="6" />
-      <node id="6354776497085480750" at="1776,78,1777,142" concept="5" />
-      <node id="6354776497085480764" at="1777,142,1778,152" concept="6" />
-      <node id="8845345751178284737" at="1780,78,1781,86" concept="5" />
-      <node id="8845345751178284730" at="1781,86,1782,30" concept="1" />
-      <node id="5970181360960745161" at="1782,30,1783,44" concept="1" />
-      <node id="5970181360960411033" at="1784,368,1785,206" concept="5" />
-      <node id="5970181360960287858" at="1785,206,1786,388" concept="1" />
-      <node id="7391870795497191475" at="1787,119,1788,232" concept="1" />
-      <node id="8845345751178284772" at="1790,5,1791,23" concept="6" />
-      <node id="5423338990220300237" at="2060,58,2061,58" concept="1" />
-      <node id="978600701690054686" at="2061,58,2062,57" concept="1" />
-      <node id="5970181360960745073" at="2062,57,2063,58" concept="1" />
-      <node id="8845345751178284778" at="2063,58,2064,58" concept="1" />
-      <node id="8845345751178284914" at="2064,58,2065,58" concept="1" />
-      <node id="5002485985636840318" at="2065,58,2066,58" concept="1" />
-      <node id="4035665851936450206" at="2066,58,2067,58" concept="1" />
-      <node id="4035665851936450308" at="2067,58,2068,58" concept="1" />
-      <node id="4035665851936681464" at="2068,58,2069,58" concept="1" />
-      <node id="4035665851936216061" at="2069,58,2070,58" concept="1" />
-      <node id="3239569521490197891" at="2070,58,2071,58" concept="1" />
-      <node id="8986357566212684075" at="2071,58,2072,58" concept="1" />
-      <node id="3239569521490197949" at="2072,58,2073,58" concept="1" />
-      <node id="5002485985637417315" at="2073,58,2074,58" concept="1" />
-      <node id="5970181360963002103" at="2074,58,2075,58" concept="1" />
-      <node id="6354776497113862138" at="2075,58,2076,58" concept="1" />
-      <node id="5423338990220300237" at="2169,16,2170,87" concept="6" />
-      <node id="978600701690054686" at="2171,16,2172,87" concept="6" />
-      <node id="5970181360960745073" at="2173,16,2174,87" concept="6" />
-      <node id="8845345751178284778" at="2175,16,2176,87" concept="6" />
-      <node id="8845345751178284914" at="2177,16,2178,87" concept="6" />
-      <node id="5002485985636840318" at="2179,16,2180,87" concept="6" />
-      <node id="4035665851936450206" at="2181,16,2182,87" concept="6" />
-      <node id="4035665851936450308" at="2183,16,2184,87" concept="6" />
-      <node id="4035665851936681464" at="2185,16,2186,87" concept="6" />
-      <node id="4035665851936216061" at="2187,16,2188,87" concept="6" />
-      <node id="3239569521490197891" at="2189,16,2190,88" concept="6" />
-      <node id="8986357566212684075" at="2191,16,2192,88" concept="6" />
-      <node id="3239569521490197949" at="2193,16,2194,88" concept="6" />
-      <node id="5002485985637417315" at="2195,16,2196,88" concept="6" />
-      <node id="5970181360963002103" at="2197,16,2198,88" concept="6" />
-      <node id="6354776497113862138" at="2199,16,2200,88" concept="6" />
-      <node id="2436117033632111129" at="2304,229,2305,219" concept="1" />
-      <node id="2436117033632111186" at="2305,219,2306,199" concept="1" />
-      <node id="5423338990220413266" at="2306,199,2307,196" concept="1" />
-      <node id="4237431449989321950" at="2307,196,2308,188" concept="1" />
-      <node id="4237431449989321974" at="2308,188,2309,185" concept="1" />
-      <node id="4237431449989322008" at="2309,185,2310,189" concept="1" />
-      <node id="4237431449989322020" at="2310,189,2311,188" concept="1" />
-      <node id="4237431449989322032" at="2311,188,2312,188" concept="1" />
-      <node id="3967774530650472141" at="2312,188,2313,189" concept="1" />
-      <node id="1769740796772668696" at="2313,189,2314,189" concept="1" />
-      <node id="5423338990220523093" at="2314,189,2315,196" concept="1" />
-      <node id="978600701690073082" at="2315,196,2316,195" concept="1" />
-      <node id="5970181360960745172" at="2316,195,2317,187" concept="1" />
-      <node id="3733986151372087665" at="2317,187,2318,187" concept="1" />
-      <node id="8845345751178380247" at="2318,187,2319,191" concept="1" />
-      <node id="449958221363123418" at="2319,191,2320,191" concept="1" />
-      <node id="1933226676407305895" at="2320,191,2321,193" concept="1" />
-      <node id="5002485985636846574" at="2321,193,2322,188" concept="1" />
-      <node id="5002485985636839430" at="2322,188,2323,199" concept="1" />
-      <node id="4035665851935707493" at="2323,199,2324,187" concept="1" />
-      <node id="4035665851935768873" at="2324,187,2325,196" concept="1" />
-      <node id="4035665851936450198" at="2325,196,2326,196" concept="1" />
-      <node id="4035665851936666756" at="2326,196,2327,186" concept="1" />
-      <node id="4035665851936450300" at="2327,186,2328,187" concept="1" />
-      <node id="4035665851936951126" at="2328,187,2329,194" concept="1" />
-      <node id="4035665851936219812" at="2329,194,2330,192" concept="1" />
-      <node id="4035665851936216040" at="2330,192,2331,188" concept="1" />
-      <node id="4035665851936216049" at="2331,188,2332,199" concept="1" />
-      <node id="3239569521490197761" at="2332,199,2333,196" concept="1" />
-      <node id="8986357566212561514" at="2333,196,2334,187" concept="1" />
-      <node id="1374711517443210408" at="2334,187,2335,198" concept="1" />
-      <node id="8702237507672319033" at="2335,198,2336,192" concept="1" />
-      <node id="5002485985637417294" at="2336,192,2337,188" concept="1" />
-      <node id="5002485985637417303" at="2337,188,2338,199" concept="1" />
-      <node id="7795397664372773538" at="2338,199,2339,198" concept="1" />
-      <node id="5970181360963002105" at="2339,198,2340,201" concept="1" />
-      <node id="6354776497085480729" at="2340,201,2341,193" concept="1" />
-      <node id="2436117033632111129" at="2554,16,2555,66" concept="6" />
-      <node id="2436117033632111186" at="2556,16,2557,66" concept="6" />
-      <node id="5423338990220413266" at="2558,16,2559,66" concept="6" />
-      <node id="4237431449989321950" at="2560,16,2561,66" concept="6" />
-      <node id="4237431449989321974" at="2562,16,2563,66" concept="6" />
-      <node id="4237431449989322008" at="2564,16,2565,66" concept="6" />
-      <node id="4237431449989322020" at="2566,16,2567,66" concept="6" />
-      <node id="4237431449989322032" at="2568,16,2569,66" concept="6" />
-      <node id="3967774530650472141" at="2570,16,2571,66" concept="6" />
-      <node id="1769740796772668696" at="2572,16,2573,66" concept="6" />
-      <node id="5423338990220523093" at="2574,16,2575,67" concept="6" />
-      <node id="978600701690073082" at="2576,16,2577,67" concept="6" />
-      <node id="5970181360960745172" at="2578,16,2579,67" concept="6" />
-      <node id="3733986151372087665" at="2580,16,2581,67" concept="6" />
-      <node id="8845345751178380247" at="2582,16,2583,67" concept="6" />
-      <node id="449958221363123418" at="2584,16,2585,67" concept="6" />
-      <node id="1933226676407305895" at="2586,16,2587,67" concept="6" />
-      <node id="5002485985636846574" at="2588,16,2589,67" concept="6" />
-      <node id="5002485985636839430" at="2590,16,2591,67" concept="6" />
-      <node id="4035665851935707493" at="2592,16,2593,67" concept="6" />
-      <node id="4035665851935768873" at="2594,16,2595,67" concept="6" />
-      <node id="4035665851936450198" at="2596,16,2597,67" concept="6" />
-      <node id="4035665851936666756" at="2598,17,2599,67" concept="6" />
-      <node id="4035665851936450300" at="2600,17,2601,67" concept="6" />
-      <node id="4035665851936951126" at="2602,17,2603,67" concept="6" />
-      <node id="4035665851936219812" at="2604,17,2605,67" concept="6" />
-      <node id="4035665851936216040" at="2606,17,2607,67" concept="6" />
-      <node id="4035665851936216049" at="2608,17,2609,67" concept="6" />
-      <node id="3239569521490197761" at="2610,17,2611,67" concept="6" />
-      <node id="8986357566212561514" at="2612,17,2613,67" concept="6" />
-      <node id="1374711517443210408" at="2614,17,2615,67" concept="6" />
-      <node id="8702237507672319033" at="2616,17,2617,67" concept="6" />
-      <node id="5002485985637417294" at="2618,17,2619,67" concept="6" />
-      <node id="5002485985637417303" at="2620,17,2621,67" concept="6" />
-      <node id="7795397664372773538" at="2622,17,2623,67" concept="6" />
-      <node id="5970181360963002105" at="2624,17,2625,67" concept="6" />
-      <node id="6354776497085480729" at="2626,17,2627,67" concept="6" />
-      <node id="1769740796772692676" at="2773,57,2774,57" concept="1" />
-      <node id="3733986151372083092" at="2774,57,2775,57" concept="1" />
-      <node id="8845345751178285143" at="2775,57,2776,57" concept="1" />
-      <node id="5970181360960165169" at="2776,57,2777,57" concept="1" />
-      <node id="1933226676407114454" at="2777,57,2778,57" concept="1" />
-      <node id="4035665851936438514" at="2778,57,2779,57" concept="1" />
-      <node id="4035665851935707502" at="2779,57,2780,57" concept="1" />
-      <node id="4035665851935770399" at="2780,57,2781,57" concept="1" />
-      <node id="398731435601112750" at="2781,57,2782,56" concept="1" />
-      <node id="1787667533297084980" at="2782,56,2783,57" concept="1" />
-      <node id="5002485985634204064" at="2783,57,2784,57" concept="1" />
-      <node id="3239569521490198040" at="2784,57,2785,57" concept="1" />
-      <node id="4101476690146989261" at="2785,57,2786,57" concept="1" />
-      <node id="6354776497085480788" at="2786,57,2787,57" concept="1" />
-      <node id="1769740796772692676" at="2926,16,2927,61" concept="6" />
-      <node id="3733986151372083092" at="2928,16,2929,61" concept="6" />
-      <node id="8845345751178285143" at="2930,16,2931,61" concept="6" />
-      <node id="5970181360960165169" at="2932,16,2933,61" concept="6" />
-      <node id="1933226676407114454" at="2934,16,2935,61" concept="6" />
-      <node id="4035665851936438514" at="2936,16,2937,61" concept="6" />
-      <node id="4035665851935707502" at="2938,16,2939,61" concept="6" />
-      <node id="4035665851935770399" at="2940,16,2941,61" concept="6" />
-      <node id="398731435601112750" at="2942,16,2943,61" concept="6" />
-      <node id="1787667533297084980" at="2944,16,2945,61" concept="6" />
-      <node id="5002485985634204064" at="2946,16,2947,62" concept="6" />
-      <node id="3239569521490198040" at="2948,16,2949,62" concept="6" />
-      <node id="4101476690146989261" at="2950,16,2951,62" concept="6" />
-      <node id="6354776497085480788" at="2952,16,2953,62" concept="6" />
-      <node id="2409421742521905606" at="3103,55,3104,55" concept="1" />
-      <node id="2409421742521905610" at="3104,55,3105,55" concept="1" />
-      <node id="2409421742521905625" at="3105,55,3106,55" concept="1" />
-      <node id="5121314058278757759" at="3106,55,3107,55" concept="1" />
-      <node id="4438567763349653940" at="3107,55,3108,55" concept="1" />
-      <node id="1933226676407279753" at="3108,55,3109,55" concept="1" />
-      <node id="2409421742521905630" at="3109,55,3110,55" concept="1" />
-      <node id="2409421742521905633" at="3110,55,3111,55" concept="1" />
-      <node id="2409421742521905636" at="3111,55,3112,55" concept="1" />
-      <node id="2409421742521905640" at="3112,55,3113,55" concept="1" />
-      <node id="2409421742521905606" at="3151,16,3152,58" concept="6" />
-      <node id="2409421742521905610" at="3153,16,3154,58" concept="6" />
-      <node id="2409421742521905625" at="3155,16,3156,58" concept="6" />
-      <node id="5121314058278757759" at="3157,16,3158,58" concept="6" />
-      <node id="4438567763349653940" at="3159,16,3160,58" concept="6" />
-      <node id="1933226676407279753" at="3161,16,3162,58" concept="6" />
-      <node id="2409421742521905630" at="3163,16,3164,58" concept="6" />
-      <node id="2409421742521905633" at="3165,16,3166,58" concept="6" />
-      <node id="2409421742521905636" at="3167,16,3168,58" concept="6" />
-      <node id="2409421742521905640" at="3169,16,3170,58" concept="6" />
-      <node id="4035665851936450290" at="3302,84,3303,84" concept="5" />
-      <node id="4035665851936450290" at="3303,84,3304,40" concept="1" />
-      <node id="4035665851936450290" at="3304,40,3305,26" concept="6" />
-      <node id="3239569521490197904" at="3307,84,3308,84" concept="5" />
-      <node id="3239569521490197904" at="3308,84,3309,40" concept="1" />
-      <node id="3239569521490197904" at="3309,40,3310,26" concept="6" />
-      <node id="6354776497085480772" at="3312,107,3313,95" concept="5" />
-      <node id="6354776497085480772" at="3313,95,3314,40" concept="1" />
-      <node id="6354776497085480772" at="3314,40,3315,50" concept="1" />
-      <node id="6354776497085480772" at="3315,50,3316,26" concept="6" />
-      <node id="2402740824034685341" at="3321,52,3322,40" concept="6" />
+      <node id="1992944417853204721" at="630,89,631,67" concept="6" />
+      <node id="4035665851936216043" at="633,89,634,78" concept="6" />
+      <node id="4035665851936216052" at="636,89,637,91" concept="6" />
+      <node id="3239569521490197764" at="639,89,640,78" concept="6" />
+      <node id="8986357566212561517" at="642,89,643,78" concept="6" />
+      <node id="1374711517443210442" at="645,89,646,186" concept="6" />
+      <node id="8702237507672319036" at="648,89,649,176" concept="5" />
+      <node id="8702237507672319054" at="649,176,650,0" concept="8" />
+      <node id="8702237507672319055" at="650,0,651,17" concept="5" />
+      <node id="8702237507672319058" at="651,17,652,68" concept="7" />
+      <node id="8702237507672319062" at="653,113,654,97" concept="1" />
+      <node id="8702237507672319082" at="655,12,656,21" concept="7" />
+      <node id="8702237507672319084" at="656,21,657,21" concept="1" />
+      <node id="8702237507672319088" at="658,5,659,0" concept="8" />
+      <node id="8702237507672319089" at="659,0,660,35" concept="6" />
+      <node id="5002485985637417297" at="662,89,663,78" concept="6" />
+      <node id="5002485985637417306" at="665,89,666,91" concept="6" />
+      <node id="7795397664372773541" at="668,89,669,284" concept="6" />
+      <node id="5970181360963004537" at="671,89,672,186" concept="6" />
+      <node id="6354776497085480732" at="674,89,675,78" concept="6" />
+      <node id="1769740796772692686" at="1042,78,1043,94" concept="6" />
+      <node id="3733986151372083983" at="1045,78,1046,201" concept="6" />
+      <node id="5970181360960165101" at="1048,78,1049,91" concept="6" />
+      <node id="5970181360960165172" at="1051,78,1052,111" concept="6" />
+      <node id="1933226676407299157" at="1054,78,1055,75" concept="6" />
+      <node id="4035665851936446256" at="1057,78,1058,224" concept="6" />
+      <node id="4035665851935707505" at="1060,78,1061,201" concept="6" />
+      <node id="1992944417853204728" at="1063,78,1064,75" concept="6" />
+      <node id="4035665851936685996" at="1066,78,1067,92" concept="7" />
+      <node id="4035665851936687556" at="1067,92,1068,106" concept="7" />
+      <node id="4035665851936688288" at="1068,106,1069,50" concept="7" />
+      <node id="4035665851935972877" at="1069,50,1070,221" concept="6" />
+      <node id="398731435601473232" at="1072,78,1073,123" concept="6" />
+      <node id="1787667533297288929" at="1075,79,1076,176" concept="5" />
+      <node id="1787667533297118841" at="1076,176,1077,103" concept="6" />
+      <node id="5002485985634208502" at="1079,79,1080,186" concept="5" />
+      <node id="5002485985634230623" at="1081,23,1082,19" concept="6" />
+      <node id="5002485985634250193" at="1083,5,1084,134" concept="6" />
+      <node id="3239569521490198043" at="1086,79,1087,123" concept="6" />
+      <node id="7358113559821750179" at="1089,79,1090,69" concept="7" />
+      <node id="7358113559821750731" at="1090,69,1091,93" concept="7" />
+      <node id="7358113559822136813" at="1091,93,1092,22" concept="7" />
+      <node id="4101476690147164906" at="1092,22,1093,217" concept="6" />
+      <node id="6354776497085480791" at="1095,79,1096,102" concept="6" />
+      <node id="5423338990220345233" at="1414,104,1415,158" concept="5" />
+      <node id="5423338990220397817" at="1416,50,1417,17" concept="6" />
+      <node id="4297162197628724874" at="1418,5,1419,210" concept="5" />
+      <node id="4297162197628740778" at="1419,210,1420,68" concept="1" />
+      <node id="4297162197629594973" at="1420,68,1421,69" concept="7" />
+      <node id="4297162197628923504" at="1421,69,1422,72" concept="1" />
+      <node id="4297162197628749231" at="1422,72,1423,66" concept="1" />
+      <node id="4297162197628917485" at="1423,66,1424,68" concept="1" />
+      <node id="3938719774425413411" at="1424,68,1425,73" concept="1" />
+      <node id="6535001758417087858" at="1425,73,1426,76" concept="1" />
+      <node id="3967774530650444686" at="1426,76,1427,353" concept="1" />
+      <node id="1769740796772658841" at="1427,353,1428,123" concept="7" />
+      <node id="5423338990220410532" at="1428,123,1429,47" concept="6" />
+      <node id="4035665851936450208" at="1431,104,1432,97" concept="7" />
+      <node id="4035665851936450225" at="1432,97,1433,72" concept="7" />
+      <node id="4035665851936450245" at="1433,72,1434,125" concept="7" />
+      <node id="4035665851936450262" at="1434,125,1435,53" concept="7" />
+      <node id="4035665851936450276" at="1435,53,1436,210" concept="6" />
+      <node id="3749662389731418659" at="1438,104,1439,154" concept="6" />
+      <node id="8845345751178284886" at="1442,124,1443,112" concept="5" />
+      <node id="8845345751178284894" at="1443,112,1444,42" concept="1" />
+      <node id="8845345751178284918" at="1444,42,1445,22" concept="6" />
+      <node id="5829439739855133196" at="1448,104,1449,201" concept="5" />
+      <node id="5829439739855203734" at="1449,201,1450,339" concept="5" />
+      <node id="5829439739855224494" at="1450,339,1451,92" concept="7" />
+      <node id="5829439739855228968" at="1451,92,1452,112" concept="7" />
+      <node id="5829439739855230879" at="1452,112,1453,118" concept="7" />
+      <node id="5829439739855235110" at="1453,118,1454,119" concept="7" />
+      <node id="5829439739855264444" at="1454,119,1455,71" concept="7" />
+      <node id="8845345751178284921" at="1455,71,1456,160" concept="6" />
+      <node id="5002485985636840980" at="1458,104,1459,135" concept="6" />
+      <node id="4031822141863243851" at="1461,104,1462,92" concept="7" />
+      <node id="4035665851936596632" at="1462,92,1463,90" concept="7" />
+      <node id="978600701690072962" at="1463,90,1464,101" concept="6" />
+      <node id="4035665851936612289" at="1464,101,1465,0" concept="8" />
+      <node id="4035665851936450310" at="1467,104,1468,154" concept="6" />
+      <node id="4035665851936901616" at="1470,104,1471,238" concept="5" />
+      <node id="4035665851937036765" at="1471,238,1472,49" concept="5" />
+      <node id="4035665851937091011" at="1472,49,1473,45" concept="7" />
+      <node id="4035665851936689343" at="1473,45,1474,257" concept="6" />
+      <node id="4035665851936216063" at="1476,104,1477,135" concept="6" />
+      <node id="3239569521490197893" at="1479,105,1480,180" concept="6" />
+      <node id="8986357566212775176" at="1482,105,1483,77" concept="6" />
+      <node id="3239569521490197951" at="1485,105,1486,297" concept="6" />
+      <node id="5002485985642145969" at="1488,105,1489,179" concept="6" />
+      <node id="1872825584233072238" at="1491,105,1492,84" concept="7" />
+      <node id="7354447573577595456" at="1492,84,1493,253" concept="5" />
+      <node id="7354447573577628662" at="1493,253,1494,0" concept="8" />
+      <node id="7354447573577627075" at="1497,41,1498,76" concept="6" />
+      <node id="7354447573577628497" at="1504,41,1505,76" concept="6" />
+      <node id="7354447573577628803" at="1508,27,1509,0" concept="8" />
+      <node id="5970181360963001900" at="1509,0,1510,84" concept="6" />
+      <node id="6354776497113986528" at="1512,105,1513,66" concept="6" />
+      <node id="1675583295863892878" at="1723,78,1724,197" concept="7" />
+      <node id="3340252814672973529" at="1724,197,1725,98" concept="5" />
+      <node id="3340252814672973536" at="1725,98,1726,32" concept="5" />
+      <node id="3340252814672973540" at="1726,32,1727,50" concept="5" />
+      <node id="3340252814672973622" at="1728,29,1729,42" concept="6" />
+      <node id="3340252814672973589" at="1731,243,1732,97" concept="1" />
+      <node id="3340252814672973703" at="1733,5,1734,16" concept="6" />
+      <node id="3340252814673340858" at="1736,78,1737,98" concept="5" />
+      <node id="3340252814673340865" at="1737,98,1738,33" concept="5" />
+      <node id="4963874803257640668" at="1738,33,1739,76" concept="7" />
+      <node id="923773175841067608" at="1739,76,1740,77" concept="7" />
+      <node id="3340252814673340869" at="1740,77,1741,45" concept="5" />
+      <node id="4963874803257612475" at="1742,24,1743,51" concept="5" />
+      <node id="3340252814673340880" at="1743,51,1744,68" concept="6" />
+      <node id="923773175841002021" at="1745,5,1746,97" concept="7" />
+      <node id="923773175841005215" at="1746,97,1747,50" concept="7" />
+      <node id="3340252814673340891" at="1748,243,1749,97" concept="1" />
+      <node id="3340252814673340919" at="1750,5,1751,16" concept="6" />
+      <node id="5970181360960165010" at="1753,78,1754,83" concept="6" />
+      <node id="6536521488243341287" at="1756,78,1757,255" concept="6" />
+      <node id="106891382227936603" at="1759,78,1760,149" concept="5" />
+      <node id="106891382227942087" at="1760,149,1761,121" concept="1" />
+      <node id="4438567763349691812" at="1761,121,1762,19" concept="6" />
+      <node id="1933226676407295325" at="1764,78,1765,275" concept="5" />
+      <node id="1933226676407295346" at="1765,275,1766,109" concept="6" />
+      <node id="106891382228416454" at="1768,78,1769,149" concept="5" />
+      <node id="106891382228416465" at="1769,149,1770,121" concept="1" />
+      <node id="106891382228416474" at="1770,121,1771,44" concept="6" />
+      <node id="8986357566212685835" at="1773,78,1774,85" concept="5" />
+      <node id="8986357566212685841" at="1774,85,1775,29" concept="1" />
+      <node id="1416143158804389770" at="1775,29,1776,33" concept="7" />
+      <node id="8986357566212685845" at="1776,33,1777,87" concept="5" />
+      <node id="8986357566212685853" at="1777,87,1778,114" concept="5" />
+      <node id="8986357566212685860" at="1778,114,1779,268" concept="5" />
+      <node id="8986357566212773837" at="1779,268,1780,78" concept="6" />
+      <node id="6354776497085480750" at="1782,78,1783,142" concept="5" />
+      <node id="6354776497085480764" at="1783,142,1784,152" concept="6" />
+      <node id="8845345751178284737" at="1786,78,1787,86" concept="5" />
+      <node id="8845345751178284730" at="1787,86,1788,30" concept="1" />
+      <node id="5970181360960745161" at="1788,30,1789,44" concept="1" />
+      <node id="5970181360960411033" at="1790,368,1791,206" concept="5" />
+      <node id="5970181360960287858" at="1791,206,1792,388" concept="1" />
+      <node id="7391870795497191475" at="1793,119,1794,232" concept="1" />
+      <node id="8845345751178284772" at="1796,5,1797,23" concept="6" />
+      <node id="5423338990220300237" at="2066,58,2067,58" concept="1" />
+      <node id="978600701690054686" at="2067,58,2068,57" concept="1" />
+      <node id="5970181360960745073" at="2068,57,2069,58" concept="1" />
+      <node id="8845345751178284778" at="2069,58,2070,58" concept="1" />
+      <node id="8845345751178284914" at="2070,58,2071,58" concept="1" />
+      <node id="5002485985636840318" at="2071,58,2072,58" concept="1" />
+      <node id="4035665851936450206" at="2072,58,2073,58" concept="1" />
+      <node id="4035665851936450308" at="2073,58,2074,58" concept="1" />
+      <node id="4035665851936681464" at="2074,58,2075,58" concept="1" />
+      <node id="4035665851936216061" at="2075,58,2076,58" concept="1" />
+      <node id="3239569521490197891" at="2076,58,2077,58" concept="1" />
+      <node id="8986357566212684075" at="2077,58,2078,58" concept="1" />
+      <node id="3239569521490197949" at="2078,58,2079,58" concept="1" />
+      <node id="5002485985637417315" at="2079,58,2080,58" concept="1" />
+      <node id="5970181360963002103" at="2080,58,2081,58" concept="1" />
+      <node id="6354776497113862138" at="2081,58,2082,58" concept="1" />
+      <node id="5423338990220300237" at="2175,16,2176,87" concept="6" />
+      <node id="978600701690054686" at="2177,16,2178,87" concept="6" />
+      <node id="5970181360960745073" at="2179,16,2180,87" concept="6" />
+      <node id="8845345751178284778" at="2181,16,2182,87" concept="6" />
+      <node id="8845345751178284914" at="2183,16,2184,87" concept="6" />
+      <node id="5002485985636840318" at="2185,16,2186,87" concept="6" />
+      <node id="4035665851936450206" at="2187,16,2188,87" concept="6" />
+      <node id="4035665851936450308" at="2189,16,2190,87" concept="6" />
+      <node id="4035665851936681464" at="2191,16,2192,87" concept="6" />
+      <node id="4035665851936216061" at="2193,16,2194,87" concept="6" />
+      <node id="3239569521490197891" at="2195,16,2196,88" concept="6" />
+      <node id="8986357566212684075" at="2197,16,2198,88" concept="6" />
+      <node id="3239569521490197949" at="2199,16,2200,88" concept="6" />
+      <node id="5002485985637417315" at="2201,16,2202,88" concept="6" />
+      <node id="5970181360963002103" at="2203,16,2204,88" concept="6" />
+      <node id="6354776497113862138" at="2205,16,2206,88" concept="6" />
+      <node id="2436117033632111129" at="2310,229,2311,219" concept="1" />
+      <node id="2436117033632111186" at="2311,219,2312,199" concept="1" />
+      <node id="5423338990220413266" at="2312,199,2313,196" concept="1" />
+      <node id="4237431449989321950" at="2313,196,2314,188" concept="1" />
+      <node id="4237431449989321974" at="2314,188,2315,185" concept="1" />
+      <node id="4237431449989322008" at="2315,185,2316,189" concept="1" />
+      <node id="4237431449989322020" at="2316,189,2317,188" concept="1" />
+      <node id="4237431449989322032" at="2317,188,2318,188" concept="1" />
+      <node id="3967774530650472141" at="2318,188,2319,189" concept="1" />
+      <node id="1769740796772668696" at="2319,189,2320,189" concept="1" />
+      <node id="5423338990220523093" at="2320,189,2321,196" concept="1" />
+      <node id="978600701690073082" at="2321,196,2322,195" concept="1" />
+      <node id="5970181360960745172" at="2322,195,2323,187" concept="1" />
+      <node id="3733986151372087665" at="2323,187,2324,187" concept="1" />
+      <node id="8845345751178380247" at="2324,187,2325,191" concept="1" />
+      <node id="449958221363123418" at="2325,191,2326,191" concept="1" />
+      <node id="1933226676407305895" at="2326,191,2327,193" concept="1" />
+      <node id="5002485985636846574" at="2327,193,2328,188" concept="1" />
+      <node id="5002485985636839430" at="2328,188,2329,199" concept="1" />
+      <node id="4035665851935707493" at="2329,199,2330,187" concept="1" />
+      <node id="4035665851935768873" at="2330,187,2331,196" concept="1" />
+      <node id="4035665851936450198" at="2331,196,2332,196" concept="1" />
+      <node id="4035665851936666756" at="2332,196,2333,186" concept="1" />
+      <node id="4035665851936450300" at="2333,186,2334,187" concept="1" />
+      <node id="4035665851936951126" at="2334,187,2335,194" concept="1" />
+      <node id="4035665851936219812" at="2335,194,2336,192" concept="1" />
+      <node id="1992944417853204718" at="2336,192,2337,193" concept="1" />
+      <node id="4035665851936216040" at="2337,193,2338,188" concept="1" />
+      <node id="4035665851936216049" at="2338,188,2339,199" concept="1" />
+      <node id="3239569521490197761" at="2339,199,2340,196" concept="1" />
+      <node id="8986357566212561514" at="2340,196,2341,187" concept="1" />
+      <node id="1374711517443210408" at="2341,187,2342,198" concept="1" />
+      <node id="8702237507672319033" at="2342,198,2343,192" concept="1" />
+      <node id="5002485985637417294" at="2343,192,2344,188" concept="1" />
+      <node id="5002485985637417303" at="2344,188,2345,199" concept="1" />
+      <node id="7795397664372773538" at="2345,199,2346,198" concept="1" />
+      <node id="5970181360963002105" at="2346,198,2347,201" concept="1" />
+      <node id="6354776497085480729" at="2347,201,2348,193" concept="1" />
+      <node id="2436117033632111129" at="2561,16,2562,66" concept="6" />
+      <node id="2436117033632111186" at="2563,16,2564,66" concept="6" />
+      <node id="5423338990220413266" at="2565,16,2566,66" concept="6" />
+      <node id="4237431449989321950" at="2567,16,2568,66" concept="6" />
+      <node id="4237431449989321974" at="2569,16,2570,66" concept="6" />
+      <node id="4237431449989322008" at="2571,16,2572,66" concept="6" />
+      <node id="4237431449989322020" at="2573,16,2574,66" concept="6" />
+      <node id="4237431449989322032" at="2575,16,2576,66" concept="6" />
+      <node id="3967774530650472141" at="2577,16,2578,66" concept="6" />
+      <node id="1769740796772668696" at="2579,16,2580,66" concept="6" />
+      <node id="5423338990220523093" at="2581,16,2582,67" concept="6" />
+      <node id="978600701690073082" at="2583,16,2584,67" concept="6" />
+      <node id="5970181360960745172" at="2585,16,2586,67" concept="6" />
+      <node id="3733986151372087665" at="2587,16,2588,67" concept="6" />
+      <node id="8845345751178380247" at="2589,16,2590,67" concept="6" />
+      <node id="449958221363123418" at="2591,16,2592,67" concept="6" />
+      <node id="1933226676407305895" at="2593,16,2594,67" concept="6" />
+      <node id="5002485985636846574" at="2595,16,2596,67" concept="6" />
+      <node id="5002485985636839430" at="2597,16,2598,67" concept="6" />
+      <node id="4035665851935707493" at="2599,16,2600,67" concept="6" />
+      <node id="4035665851935768873" at="2601,16,2602,67" concept="6" />
+      <node id="4035665851936450198" at="2603,16,2604,67" concept="6" />
+      <node id="4035665851936666756" at="2605,17,2606,67" concept="6" />
+      <node id="4035665851936450300" at="2607,17,2608,67" concept="6" />
+      <node id="4035665851936951126" at="2609,17,2610,67" concept="6" />
+      <node id="4035665851936219812" at="2611,17,2612,67" concept="6" />
+      <node id="1992944417853204718" at="2613,17,2614,67" concept="6" />
+      <node id="4035665851936216040" at="2615,17,2616,67" concept="6" />
+      <node id="4035665851936216049" at="2617,17,2618,67" concept="6" />
+      <node id="3239569521490197761" at="2619,17,2620,67" concept="6" />
+      <node id="8986357566212561514" at="2621,17,2622,67" concept="6" />
+      <node id="1374711517443210408" at="2623,17,2624,67" concept="6" />
+      <node id="8702237507672319033" at="2625,17,2626,67" concept="6" />
+      <node id="5002485985637417294" at="2627,17,2628,67" concept="6" />
+      <node id="5002485985637417303" at="2629,17,2630,67" concept="6" />
+      <node id="7795397664372773538" at="2631,17,2632,67" concept="6" />
+      <node id="5970181360963002105" at="2633,17,2634,67" concept="6" />
+      <node id="6354776497085480729" at="2635,17,2636,67" concept="6" />
+      <node id="1769740796772692676" at="2782,57,2783,57" concept="1" />
+      <node id="3733986151372083092" at="2783,57,2784,57" concept="1" />
+      <node id="8845345751178285143" at="2784,57,2785,57" concept="1" />
+      <node id="5970181360960165169" at="2785,57,2786,57" concept="1" />
+      <node id="1933226676407114454" at="2786,57,2787,57" concept="1" />
+      <node id="4035665851936438514" at="2787,57,2788,57" concept="1" />
+      <node id="4035665851935707502" at="2788,57,2789,57" concept="1" />
+      <node id="1992944417853204725" at="2789,57,2790,57" concept="1" />
+      <node id="4035665851935770399" at="2790,57,2791,57" concept="1" />
+      <node id="398731435601112750" at="2791,57,2792,56" concept="1" />
+      <node id="1787667533297084980" at="2792,56,2793,57" concept="1" />
+      <node id="5002485985634204064" at="2793,57,2794,57" concept="1" />
+      <node id="3239569521490198040" at="2794,57,2795,57" concept="1" />
+      <node id="4101476690146989261" at="2795,57,2796,57" concept="1" />
+      <node id="6354776497085480788" at="2796,57,2797,57" concept="1" />
+      <node id="1769740796772692676" at="2936,16,2937,61" concept="6" />
+      <node id="3733986151372083092" at="2938,16,2939,61" concept="6" />
+      <node id="8845345751178285143" at="2940,16,2941,61" concept="6" />
+      <node id="5970181360960165169" at="2942,16,2943,61" concept="6" />
+      <node id="1933226676407114454" at="2944,16,2945,61" concept="6" />
+      <node id="4035665851936438514" at="2946,16,2947,61" concept="6" />
+      <node id="4035665851935707502" at="2948,16,2949,61" concept="6" />
+      <node id="1992944417853204725" at="2950,16,2951,61" concept="6" />
+      <node id="4035665851935770399" at="2952,16,2953,61" concept="6" />
+      <node id="398731435601112750" at="2954,16,2955,61" concept="6" />
+      <node id="1787667533297084980" at="2956,16,2957,62" concept="6" />
+      <node id="5002485985634204064" at="2958,16,2959,62" concept="6" />
+      <node id="3239569521490198040" at="2960,16,2961,62" concept="6" />
+      <node id="4101476690146989261" at="2962,16,2963,62" concept="6" />
+      <node id="6354776497085480788" at="2964,16,2965,62" concept="6" />
+      <node id="2409421742521905606" at="3115,55,3116,55" concept="1" />
+      <node id="2409421742521905610" at="3116,55,3117,55" concept="1" />
+      <node id="2409421742521905625" at="3117,55,3118,55" concept="1" />
+      <node id="5121314058278757759" at="3118,55,3119,55" concept="1" />
+      <node id="4438567763349653940" at="3119,55,3120,55" concept="1" />
+      <node id="1933226676407279753" at="3120,55,3121,55" concept="1" />
+      <node id="2409421742521905630" at="3121,55,3122,55" concept="1" />
+      <node id="2409421742521905633" at="3122,55,3123,55" concept="1" />
+      <node id="2409421742521905636" at="3123,55,3124,55" concept="1" />
+      <node id="2409421742521905640" at="3124,55,3125,55" concept="1" />
+      <node id="2409421742521905606" at="3163,16,3164,58" concept="6" />
+      <node id="2409421742521905610" at="3165,16,3166,58" concept="6" />
+      <node id="2409421742521905625" at="3167,16,3168,58" concept="6" />
+      <node id="5121314058278757759" at="3169,16,3170,58" concept="6" />
+      <node id="4438567763349653940" at="3171,16,3172,58" concept="6" />
+      <node id="1933226676407279753" at="3173,16,3174,58" concept="6" />
+      <node id="2409421742521905630" at="3175,16,3176,58" concept="6" />
+      <node id="2409421742521905633" at="3177,16,3178,58" concept="6" />
+      <node id="2409421742521905636" at="3179,16,3180,58" concept="6" />
+      <node id="2409421742521905640" at="3181,16,3182,58" concept="6" />
+      <node id="4035665851936450290" at="3314,84,3315,84" concept="5" />
+      <node id="4035665851936450290" at="3315,84,3316,40" concept="1" />
+      <node id="4035665851936450290" at="3316,40,3317,26" concept="6" />
+      <node id="3239569521490197904" at="3319,84,3320,84" concept="5" />
+      <node id="3239569521490197904" at="3320,84,3321,40" concept="1" />
+      <node id="3239569521490197904" at="3321,40,3322,26" concept="6" />
+      <node id="6354776497085480772" at="3324,107,3325,95" concept="5" />
+      <node id="6354776497085480772" at="3325,95,3326,40" concept="1" />
+      <node id="6354776497085480772" at="3326,40,3327,50" concept="1" />
+      <node id="6354776497085480772" at="3327,50,3328,26" concept="6" />
+      <node id="2402740824034685341" at="3333,52,3334,40" concept="6" />
       <node id="4237431449989412997" at="522,10,524,5" concept="0" />
       <node id="3340252814672973705" at="496,88,499,5" concept="3" />
       <node id="3340252814673340922" at="502,88,505,5" concept="3" />
@@ -681,92 +687,94 @@
       <node id="4035665851936450301" at="610,0,613,0" concept="9" trace="propertyMacro_GetValue_9_23#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="4035665851936951127" at="613,0,616,0" concept="9" trace="propertyMacro_GetValue_9_24#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="4035665851936219864" at="623,10,626,5" concept="0" />
-      <node id="4035665851936216041" at="630,0,633,0" concept="9" trace="propertyMacro_GetValue_9_26#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="4035665851936216050" at="633,0,636,0" concept="9" trace="propertyMacro_GetValue_9_27#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="3239569521490197762" at="636,0,639,0" concept="9" trace="propertyMacro_GetValue_9_28#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8986357566212561515" at="639,0,642,0" concept="9" trace="propertyMacro_GetValue_9_29#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="1374711517443210409" at="642,0,645,0" concept="9" trace="propertyMacro_GetValue_9_30#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8702237507672319080" at="652,10,655,5" concept="0" />
-      <node id="5002485985637417295" at="659,0,662,0" concept="9" trace="propertyMacro_GetValue_9_32#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5002485985637417304" at="662,0,665,0" concept="9" trace="propertyMacro_GetValue_9_33#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7795397664372773539" at="665,0,668,0" concept="9" trace="propertyMacro_GetValue_9_34#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5970181360963002106" at="668,0,671,0" concept="9" trace="propertyMacro_GetValue_9_35#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="6354776497085480730" at="671,0,674,0" concept="9" trace="propertyMacro_GetValue_9_36#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="1769740796772692679" at="1039,0,1042,0" concept="9" trace="ifMacro_Condition_9_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="3733986151372083094" at="1042,0,1045,0" concept="9" trace="ifMacro_Condition_9_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="8845345751178285144" at="1045,0,1048,0" concept="9" trace="ifMacro_Condition_9_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="5970181360960165170" at="1048,0,1051,0" concept="9" trace="ifMacro_Condition_9_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1933226676407114455" at="1051,0,1054,0" concept="9" trace="ifMacro_Condition_9_4#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="4035665851936438515" at="1054,0,1057,0" concept="9" trace="ifMacro_Condition_9_5#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="4035665851935707503" at="1057,0,1060,0" concept="9" trace="ifMacro_Condition_9_6#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="398731435601112752" at="1066,0,1069,0" concept="9" trace="ifMacro_Condition_9_8#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="5002485985634215291" at="1074,186,1077,5" concept="3" />
-      <node id="3239569521490198041" at="1080,0,1083,0" concept="9" trace="ifMacro_Condition_9_11#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6354776497085480789" at="1089,0,1092,0" concept="9" trace="ifMacro_Condition_9_13#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="5423338990220359220" at="1409,158,1412,5" concept="3" />
-      <node id="5970181360960745073" at="1432,0,1435,0" concept="9" trace="sourceNodesQuery_9_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="5002485985636840318" at="1452,0,1455,0" concept="9" trace="sourceNodesQuery_9_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4035665851936450308" at="1461,0,1464,0" concept="9" trace="sourceNodesQuery_9_7#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4035665851936216061" at="1470,0,1473,0" concept="9" trace="sourceNodesQuery_9_9#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="3239569521490197891" at="1473,0,1476,0" concept="9" trace="sourceNodesQuery_9_10#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="8986357566212684075" at="1476,0,1479,0" concept="9" trace="sourceNodesQuery_9_11#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="3239569521490197949" at="1479,0,1482,0" concept="9" trace="sourceNodesQuery_9_12#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="5002485985637417315" at="1482,0,1485,0" concept="9" trace="sourceNodesQuery_9_13#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7354447573577627073" at="1491,0,1494,0" concept="4" trace="invoke#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/Boolean;" />
-      <node id="7354447573577628495" at="1498,0,1501,0" concept="4" trace="invoke#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/Boolean;" />
-      <node id="6354776497113862138" at="1506,0,1509,0" concept="9" trace="sourceNodesQuery_9_15#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="3340252814672973549" at="1721,50,1724,5" concept="3" />
-      <node id="3340252814672973587" at="1724,5,1727,5" concept="3" />
-      <node id="3340252814673340889" at="1741,50,1744,5" concept="3" />
-      <node id="5970181360960164993" at="1747,0,1750,0" concept="9" trace="varMacro_Value_9_2#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="3733986151371807578" at="1750,0,1753,0" concept="9" trace="varMacro_Value_9_3#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="7391870795497191469" at="1786,388,1789,7" concept="2" />
-      <node id="2402740824034685341" at="3321,0,3324,0" concept="9" trace="isEmptyString#(Ljava/lang/String;)Z" />
+      <node id="1992944417853204719" at="630,0,633,0" concept="9" trace="propertyMacro_GetValue_9_26#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="4035665851936216041" at="633,0,636,0" concept="9" trace="propertyMacro_GetValue_9_27#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="4035665851936216050" at="636,0,639,0" concept="9" trace="propertyMacro_GetValue_9_28#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="3239569521490197762" at="639,0,642,0" concept="9" trace="propertyMacro_GetValue_9_29#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="8986357566212561515" at="642,0,645,0" concept="9" trace="propertyMacro_GetValue_9_30#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="1374711517443210409" at="645,0,648,0" concept="9" trace="propertyMacro_GetValue_9_31#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="8702237507672319080" at="655,10,658,5" concept="0" />
+      <node id="5002485985637417295" at="662,0,665,0" concept="9" trace="propertyMacro_GetValue_9_33#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5002485985637417304" at="665,0,668,0" concept="9" trace="propertyMacro_GetValue_9_34#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7795397664372773539" at="668,0,671,0" concept="9" trace="propertyMacro_GetValue_9_35#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5970181360963002106" at="671,0,674,0" concept="9" trace="propertyMacro_GetValue_9_36#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="6354776497085480730" at="674,0,677,0" concept="9" trace="propertyMacro_GetValue_9_37#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="1769740796772692679" at="1042,0,1045,0" concept="9" trace="ifMacro_Condition_9_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="3733986151372083094" at="1045,0,1048,0" concept="9" trace="ifMacro_Condition_9_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="8845345751178285144" at="1048,0,1051,0" concept="9" trace="ifMacro_Condition_9_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="5970181360960165170" at="1051,0,1054,0" concept="9" trace="ifMacro_Condition_9_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1933226676407114455" at="1054,0,1057,0" concept="9" trace="ifMacro_Condition_9_4#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="4035665851936438515" at="1057,0,1060,0" concept="9" trace="ifMacro_Condition_9_5#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="4035665851935707503" at="1060,0,1063,0" concept="9" trace="ifMacro_Condition_9_6#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1992944417853204726" at="1063,0,1066,0" concept="9" trace="ifMacro_Condition_9_7#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="398731435601112752" at="1072,0,1075,0" concept="9" trace="ifMacro_Condition_9_9#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="5002485985634215291" at="1080,186,1083,5" concept="3" />
+      <node id="3239569521490198041" at="1086,0,1089,0" concept="9" trace="ifMacro_Condition_9_12#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6354776497085480789" at="1095,0,1098,0" concept="9" trace="ifMacro_Condition_9_14#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="5423338990220359220" at="1415,158,1418,5" concept="3" />
+      <node id="5970181360960745073" at="1438,0,1441,0" concept="9" trace="sourceNodesQuery_9_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="5002485985636840318" at="1458,0,1461,0" concept="9" trace="sourceNodesQuery_9_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4035665851936450308" at="1467,0,1470,0" concept="9" trace="sourceNodesQuery_9_7#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4035665851936216061" at="1476,0,1479,0" concept="9" trace="sourceNodesQuery_9_9#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="3239569521490197891" at="1479,0,1482,0" concept="9" trace="sourceNodesQuery_9_10#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8986357566212684075" at="1482,0,1485,0" concept="9" trace="sourceNodesQuery_9_11#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="3239569521490197949" at="1485,0,1488,0" concept="9" trace="sourceNodesQuery_9_12#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="5002485985637417315" at="1488,0,1491,0" concept="9" trace="sourceNodesQuery_9_13#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7354447573577627073" at="1497,0,1500,0" concept="4" trace="invoke#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/Boolean;" />
+      <node id="7354447573577628495" at="1504,0,1507,0" concept="4" trace="invoke#(Lorg/jetbrains/mps/openapi/model/SNode;)Ljava/lang/Boolean;" />
+      <node id="6354776497113862138" at="1512,0,1515,0" concept="9" trace="sourceNodesQuery_9_15#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="3340252814672973549" at="1727,50,1730,5" concept="3" />
+      <node id="3340252814672973587" at="1730,5,1733,5" concept="3" />
+      <node id="3340252814673340889" at="1747,50,1750,5" concept="3" />
+      <node id="5970181360960164993" at="1753,0,1756,0" concept="9" trace="varMacro_Value_9_2#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="3733986151371807578" at="1756,0,1759,0" concept="9" trace="varMacro_Value_9_3#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="7391870795497191469" at="1792,388,1795,7" concept="2" />
+      <node id="2402740824034685341" at="3333,0,3336,0" concept="9" trace="isEmptyString#(Ljava/lang/String;)Z" />
       <node id="5423338990220413590" at="508,88,512,5" concept="3" />
-      <node id="1787667533297084982" at="1069,0,1073,0" concept="9" trace="ifMacro_Condition_9_9#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="3340252814673340878" at="1735,45,1739,5" concept="3" />
-      <node id="1933226676407279754" at="1758,0,1762,0" concept="9" trace="varMacro_Value_9_5#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="6354776497085480748" at="1776,0,1780,0" concept="9" trace="varMacro_Value_9_8#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="1787667533297084982" at="1075,0,1079,0" concept="9" trace="ifMacro_Condition_9_10#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="3340252814673340878" at="1741,45,1745,5" concept="3" />
+      <node id="1933226676407279754" at="1764,0,1768,0" concept="9" trace="varMacro_Value_9_5#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="6354776497085480748" at="1782,0,1786,0" concept="9" trace="varMacro_Value_9_8#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
       <node id="4237431449989372826" at="519,12,524,5" concept="3" />
       <node id="3967774530650566664" at="539,88,544,5" concept="3" />
-      <node id="8845345751178284780" at="1435,104,1440,7" concept="6" />
-      <node id="7354447573577627067" at="1489,104,1494,9" concept="6" />
-      <node id="7354447573577628489" at="1496,108,1501,9" concept="6" />
-      <node id="4438567763349653941" at="1753,0,1758,0" concept="9" trace="varMacro_Value_9_4#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="3239569521490197769" at="1762,0,1767,0" concept="9" trace="varMacro_Value_9_6#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="4035665851936450290" at="3302,0,3307,0" concept="9" trace="createGeneratorInternal_String_x583g4_a0a0a0e0jn#(Ljava/lang/String;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="3239569521490197904" at="3307,0,3312,0" concept="9" trace="createGeneratorInternal_String_x583g4_a0a0a0a0sn#(Ljava/lang/String;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="8845345751178284780" at="1441,104,1446,7" concept="6" />
+      <node id="7354447573577627067" at="1495,104,1500,9" concept="6" />
+      <node id="7354447573577628489" at="1502,108,1507,9" concept="6" />
+      <node id="4438567763349653941" at="1759,0,1764,0" concept="9" trace="varMacro_Value_9_4#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="3239569521490197769" at="1768,0,1773,0" concept="9" trace="varMacro_Value_9_6#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="4035665851936450290" at="3314,0,3319,0" concept="9" trace="createGeneratorInternal_String_x583g4_a0a0a0e0ln#(Ljava/lang/String;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="3239569521490197904" at="3319,0,3324,0" concept="9" trace="createGeneratorInternal_String_x583g4_a0a0a0a0un#(Ljava/lang/String;)Lorg/jetbrains/mps/openapi/model/SNode;" />
       <node id="2436117033632111130" at="496,0,502,0" concept="9" trace="propertyMacro_GetValue_9_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="2436117033632111187" at="502,0,508,0" concept="9" trace="propertyMacro_GetValue_9_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="449958221363123438" at="575,68,581,5" concept="3" />
       <node id="4035665851936219844" at="620,68,626,5" concept="3" />
-      <node id="8702237507672319060" at="649,68,655,5" concept="3" />
-      <node id="4035665851935770400" at="1060,0,1066,0" concept="9" trace="ifMacro_Condition_9_7#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="4101476690146989263" at="1083,0,1089,0" concept="9" trace="ifMacro_Condition_9_12#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="4035665851936450206" at="1455,0,1461,0" concept="9" trace="sourceNodesQuery_9_6#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4035665851936681464" at="1464,0,1470,0" concept="9" trace="sourceNodesQuery_9_8#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="6354776497085480772" at="3312,0,3318,0" concept="9" trace="createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a893#(Ljava/lang/String;Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="8702237507672319060" at="652,68,658,5" concept="3" />
+      <node id="4035665851935770400" at="1066,0,1072,0" concept="9" trace="ifMacro_Condition_9_8#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="4101476690146989263" at="1089,0,1095,0" concept="9" trace="ifMacro_Condition_9_13#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="4035665851936450206" at="1461,0,1467,0" concept="9" trace="sourceNodesQuery_9_6#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4035665851936681464" at="1470,0,1476,0" concept="9" trace="sourceNodesQuery_9_8#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="6354776497085480772" at="3324,0,3330,0" concept="9" trace="createGeneratorInternal_ProjectDependency_x583g4_a0a0a0a1a004#(Ljava/lang/String;Lorg/jetbrains/mps/openapi/model/SNode;)Lorg/jetbrains/mps/openapi/model/SNode;" />
       <node id="5423338990220413267" at="508,0,515,0" concept="9" trace="propertyMacro_GetValue_9_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="5423338990220523094" at="552,0,559,0" concept="9" trace="propertyMacro_GetValue_9_10#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="4035665851935768874" at="597,0,604,0" concept="9" trace="propertyMacro_GetValue_9_20#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5002485985634204066" at="1073,0,1080,0" concept="9" trace="ifMacro_Condition_9_10#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="978600701690054686" at="1425,0,1432,0" concept="9" trace="sourceNodesQuery_9_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="8845345751178284778" at="1435,0,1442,0" concept="9" trace="sourceNodesQuery_9_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7354447573577627059" at="1488,0,1495,27" concept="5" />
-      <node id="7354447573577628481" at="1495,27,1502,27" concept="5" />
-      <node id="5970181360960255920" at="1783,44,1790,5" concept="3" />
-      <node id="8986357566212610610" at="1767,0,1776,0" concept="9" trace="varMacro_Value_9_7#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="5002485985634204066" at="1079,0,1086,0" concept="9" trace="ifMacro_Condition_9_11#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="978600701690054686" at="1431,0,1438,0" concept="9" trace="sourceNodesQuery_9_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8845345751178284778" at="1441,0,1448,0" concept="9" trace="sourceNodesQuery_9_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7354447573577627059" at="1494,0,1501,27" concept="5" />
+      <node id="7354447573577628481" at="1501,27,1508,27" concept="5" />
+      <node id="5970181360960255920" at="1789,44,1796,5" concept="3" />
+      <node id="8986357566212610610" at="1773,0,1782,0" concept="9" trace="varMacro_Value_9_7#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
       <node id="3967774530650472142" at="539,0,549,0" concept="9" trace="propertyMacro_GetValue_9_8#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8845345751178284914" at="1442,0,1452,0" concept="9" trace="sourceNodesQuery_9_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8845345751178284914" at="1448,0,1458,0" concept="9" trace="sourceNodesQuery_9_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
       <node id="4237431449989321975" at="518,0,530,0" concept="9" trace="propertyMacro_GetValue_9_4#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="3340252814672973526" at="1717,0,1730,0" concept="9" trace="varMacro_Value_9_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="5970181360963001549" at="1780,0,1793,0" concept="9" trace="varMacro_Value_9_9#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="3340252814672973526" at="1723,0,1736,0" concept="9" trace="varMacro_Value_9_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="5970181360963001549" at="1786,0,1799,0" concept="9" trace="varMacro_Value_9_9#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
       <node id="449958221363123419" at="571,0,585,0" concept="9" trace="propertyMacro_GetValue_9_15#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="4035665851936219813" at="616,0,630,0" concept="9" trace="propertyMacro_GetValue_9_25#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8702237507672319034" at="645,0,659,0" concept="9" trace="propertyMacro_GetValue_9_31#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5423338990220300237" at="1408,0,1425,0" concept="9" trace="sourceNodesQuery_9_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="3340252814673340855" at="1730,0,1747,0" concept="9" trace="varMacro_Value_9_1#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="5970181360963002103" at="1485,0,1506,0" concept="9" trace="sourceNodesQuery_9_14#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8702237507672319034" at="648,0,662,0" concept="9" trace="propertyMacro_GetValue_9_32#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5423338990220300237" at="1414,0,1431,0" concept="9" trace="sourceNodesQuery_9_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="3340252814673340855" at="1736,0,1753,0" concept="9" trace="varMacro_Value_9_1#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="5970181360963002103" at="1491,0,1512,0" concept="9" trace="sourceNodesQuery_9_14#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
       <scope id="3340252814672973707" at="497,78,498,63" />
       <scope id="3340252814673340924" at="503,75,504,60" />
       <scope id="4237431449989321952" at="515,88,516,99" />
@@ -795,138 +803,142 @@
       <scope id="4035665851936450302" at="610,89,611,78" />
       <scope id="4035665851936951128" at="613,89,614,186" />
       <scope id="4035665851936219845" at="621,113,622,97" />
-      <scope id="4035665851936216042" at="630,89,631,78" />
-      <scope id="4035665851936216051" at="633,89,634,91" />
-      <scope id="3239569521490197763" at="636,89,637,78" />
-      <scope id="8986357566212561516" at="639,89,640,78" />
-      <scope id="1374711517443210410" at="642,89,643,186" />
-      <scope id="8702237507672319061" at="650,113,651,97" />
-      <scope id="5002485985637417296" at="659,89,660,78" />
-      <scope id="5002485985637417305" at="662,89,663,91" />
-      <scope id="7795397664372773540" at="665,89,666,284" />
-      <scope id="5970181360963002107" at="668,89,669,186" />
-      <scope id="6354776497085480731" at="671,89,672,78" />
-      <scope id="1769740796772692680" at="1039,78,1040,94" />
-      <scope id="3733986151372083096" at="1042,78,1043,201" />
-      <scope id="8845345751178285145" at="1045,78,1046,91" />
-      <scope id="5970181360960165171" at="1048,78,1049,111" />
-      <scope id="1933226676407114456" at="1051,78,1052,75" />
-      <scope id="4035665851936438516" at="1054,78,1055,224" />
-      <scope id="4035665851935707504" at="1057,78,1058,201" />
-      <scope id="398731435601112754" at="1066,78,1067,123" />
-      <scope id="5002485985634215294" at="1075,23,1076,19" />
-      <scope id="3239569521490198042" at="1080,79,1081,123" />
-      <scope id="6354776497085480790" at="1089,79,1090,102" />
-      <scope id="5423338990220359222" at="1410,50,1411,17" />
-      <scope id="5970181360960745074" at="1432,104,1433,154" />
-      <scope id="5002485985636840320" at="1452,104,1453,135" />
-      <scope id="4035665851936450309" at="1461,104,1462,154" />
-      <scope id="4035665851936216062" at="1470,104,1471,135" />
-      <scope id="3239569521490197892" at="1473,105,1474,180" />
-      <scope id="8986357566212684077" at="1476,105,1477,77" />
-      <scope id="3239569521490197950" at="1479,105,1480,297" />
-      <scope id="5002485985637417316" at="1482,105,1483,179" />
-      <scope id="7354447573577627074" at="1491,41,1492,76" />
-      <scope id="7354447573577628496" at="1498,41,1499,76" />
-      <scope id="6354776497113862140" at="1506,105,1507,66" />
-      <scope id="3340252814672973550" at="1722,29,1723,42" />
-      <scope id="3340252814672973588" at="1725,243,1726,97" />
-      <scope id="3340252814673340890" at="1742,243,1743,97" />
-      <scope id="5970181360960164994" at="1747,78,1748,83" />
-      <scope id="3733986151371807580" at="1750,78,1751,255" />
-      <scope id="7391870795497191472" at="1787,119,1788,232" />
-      <scope id="5423338990220300237" at="2169,16,2170,87" />
-      <scope id="978600701690054686" at="2171,16,2172,87" />
-      <scope id="5970181360960745073" at="2173,16,2174,87" />
-      <scope id="8845345751178284778" at="2175,16,2176,87" />
-      <scope id="8845345751178284914" at="2177,16,2178,87" />
-      <scope id="5002485985636840318" at="2179,16,2180,87" />
-      <scope id="4035665851936450206" at="2181,16,2182,87" />
-      <scope id="4035665851936450308" at="2183,16,2184,87" />
-      <scope id="4035665851936681464" at="2185,16,2186,87" />
-      <scope id="4035665851936216061" at="2187,16,2188,87" />
-      <scope id="3239569521490197891" at="2189,16,2190,88" />
-      <scope id="8986357566212684075" at="2191,16,2192,88" />
-      <scope id="3239569521490197949" at="2193,16,2194,88" />
-      <scope id="5002485985637417315" at="2195,16,2196,88" />
-      <scope id="5970181360963002103" at="2197,16,2198,88" />
-      <scope id="6354776497113862138" at="2199,16,2200,88" />
-      <scope id="2436117033632111129" at="2554,16,2555,66" />
-      <scope id="2436117033632111186" at="2556,16,2557,66" />
-      <scope id="5423338990220413266" at="2558,16,2559,66" />
-      <scope id="4237431449989321950" at="2560,16,2561,66" />
-      <scope id="4237431449989321974" at="2562,16,2563,66" />
-      <scope id="4237431449989322008" at="2564,16,2565,66" />
-      <scope id="4237431449989322020" at="2566,16,2567,66" />
-      <scope id="4237431449989322032" at="2568,16,2569,66" />
-      <scope id="3967774530650472141" at="2570,16,2571,66" />
-      <scope id="1769740796772668696" at="2572,16,2573,66" />
-      <scope id="5423338990220523093" at="2574,16,2575,67" />
-      <scope id="978600701690073082" at="2576,16,2577,67" />
-      <scope id="5970181360960745172" at="2578,16,2579,67" />
-      <scope id="3733986151372087665" at="2580,16,2581,67" />
-      <scope id="8845345751178380247" at="2582,16,2583,67" />
-      <scope id="449958221363123418" at="2584,16,2585,67" />
-      <scope id="1933226676407305895" at="2586,16,2587,67" />
-      <scope id="5002485985636846574" at="2588,16,2589,67" />
-      <scope id="5002485985636839430" at="2590,16,2591,67" />
-      <scope id="4035665851935707493" at="2592,16,2593,67" />
-      <scope id="4035665851935768873" at="2594,16,2595,67" />
-      <scope id="4035665851936450198" at="2596,16,2597,67" />
-      <scope id="4035665851936666756" at="2598,17,2599,67" />
-      <scope id="4035665851936450300" at="2600,17,2601,67" />
-      <scope id="4035665851936951126" at="2602,17,2603,67" />
-      <scope id="4035665851936219812" at="2604,17,2605,67" />
-      <scope id="4035665851936216040" at="2606,17,2607,67" />
-      <scope id="4035665851936216049" at="2608,17,2609,67" />
-      <scope id="3239569521490197761" at="2610,17,2611,67" />
-      <scope id="8986357566212561514" at="2612,17,2613,67" />
-      <scope id="1374711517443210408" at="2614,17,2615,67" />
-      <scope id="8702237507672319033" at="2616,17,2617,67" />
-      <scope id="5002485985637417294" at="2618,17,2619,67" />
-      <scope id="5002485985637417303" at="2620,17,2621,67" />
-      <scope id="7795397664372773538" at="2622,17,2623,67" />
-      <scope id="5970181360963002105" at="2624,17,2625,67" />
-      <scope id="6354776497085480729" at="2626,17,2627,67" />
-      <scope id="1769740796772692676" at="2926,16,2927,61" />
-      <scope id="3733986151372083092" at="2928,16,2929,61" />
-      <scope id="8845345751178285143" at="2930,16,2931,61" />
-      <scope id="5970181360960165169" at="2932,16,2933,61" />
-      <scope id="1933226676407114454" at="2934,16,2935,61" />
-      <scope id="4035665851936438514" at="2936,16,2937,61" />
-      <scope id="4035665851935707502" at="2938,16,2939,61" />
-      <scope id="4035665851935770399" at="2940,16,2941,61" />
-      <scope id="398731435601112750" at="2942,16,2943,61" />
-      <scope id="1787667533297084980" at="2944,16,2945,61" />
-      <scope id="5002485985634204064" at="2946,16,2947,62" />
-      <scope id="3239569521490198040" at="2948,16,2949,62" />
-      <scope id="4101476690146989261" at="2950,16,2951,62" />
-      <scope id="6354776497085480788" at="2952,16,2953,62" />
-      <scope id="2409421742521905606" at="3151,16,3152,58" />
-      <scope id="2409421742521905610" at="3153,16,3154,58" />
-      <scope id="2409421742521905625" at="3155,16,3156,58" />
-      <scope id="5121314058278757759" at="3157,16,3158,58" />
-      <scope id="4438567763349653940" at="3159,16,3160,58" />
-      <scope id="1933226676407279753" at="3161,16,3162,58" />
-      <scope id="2409421742521905630" at="3163,16,3164,58" />
-      <scope id="2409421742521905633" at="3165,16,3166,58" />
-      <scope id="2409421742521905636" at="3167,16,3168,58" />
-      <scope id="2409421742521905640" at="3169,16,3170,58" />
-      <scope id="2402740824034685341" at="3321,52,3322,40" />
+      <scope id="1992944417853204720" at="630,89,631,67" />
+      <scope id="4035665851936216042" at="633,89,634,78" />
+      <scope id="4035665851936216051" at="636,89,637,91" />
+      <scope id="3239569521490197763" at="639,89,640,78" />
+      <scope id="8986357566212561516" at="642,89,643,78" />
+      <scope id="1374711517443210410" at="645,89,646,186" />
+      <scope id="8702237507672319061" at="653,113,654,97" />
+      <scope id="5002485985637417296" at="662,89,663,78" />
+      <scope id="5002485985637417305" at="665,89,666,91" />
+      <scope id="7795397664372773540" at="668,89,669,284" />
+      <scope id="5970181360963002107" at="671,89,672,186" />
+      <scope id="6354776497085480731" at="674,89,675,78" />
+      <scope id="1769740796772692680" at="1042,78,1043,94" />
+      <scope id="3733986151372083096" at="1045,78,1046,201" />
+      <scope id="8845345751178285145" at="1048,78,1049,91" />
+      <scope id="5970181360960165171" at="1051,78,1052,111" />
+      <scope id="1933226676407114456" at="1054,78,1055,75" />
+      <scope id="4035665851936438516" at="1057,78,1058,224" />
+      <scope id="4035665851935707504" at="1060,78,1061,201" />
+      <scope id="1992944417853204727" at="1063,78,1064,75" />
+      <scope id="398731435601112754" at="1072,78,1073,123" />
+      <scope id="5002485985634215294" at="1081,23,1082,19" />
+      <scope id="3239569521490198042" at="1086,79,1087,123" />
+      <scope id="6354776497085480790" at="1095,79,1096,102" />
+      <scope id="5423338990220359222" at="1416,50,1417,17" />
+      <scope id="5970181360960745074" at="1438,104,1439,154" />
+      <scope id="5002485985636840320" at="1458,104,1459,135" />
+      <scope id="4035665851936450309" at="1467,104,1468,154" />
+      <scope id="4035665851936216062" at="1476,104,1477,135" />
+      <scope id="3239569521490197892" at="1479,105,1480,180" />
+      <scope id="8986357566212684077" at="1482,105,1483,77" />
+      <scope id="3239569521490197950" at="1485,105,1486,297" />
+      <scope id="5002485985637417316" at="1488,105,1489,179" />
+      <scope id="7354447573577627074" at="1497,41,1498,76" />
+      <scope id="7354447573577628496" at="1504,41,1505,76" />
+      <scope id="6354776497113862140" at="1512,105,1513,66" />
+      <scope id="3340252814672973550" at="1728,29,1729,42" />
+      <scope id="3340252814672973588" at="1731,243,1732,97" />
+      <scope id="3340252814673340890" at="1748,243,1749,97" />
+      <scope id="5970181360960164994" at="1753,78,1754,83" />
+      <scope id="3733986151371807580" at="1756,78,1757,255" />
+      <scope id="7391870795497191472" at="1793,119,1794,232" />
+      <scope id="5423338990220300237" at="2175,16,2176,87" />
+      <scope id="978600701690054686" at="2177,16,2178,87" />
+      <scope id="5970181360960745073" at="2179,16,2180,87" />
+      <scope id="8845345751178284778" at="2181,16,2182,87" />
+      <scope id="8845345751178284914" at="2183,16,2184,87" />
+      <scope id="5002485985636840318" at="2185,16,2186,87" />
+      <scope id="4035665851936450206" at="2187,16,2188,87" />
+      <scope id="4035665851936450308" at="2189,16,2190,87" />
+      <scope id="4035665851936681464" at="2191,16,2192,87" />
+      <scope id="4035665851936216061" at="2193,16,2194,87" />
+      <scope id="3239569521490197891" at="2195,16,2196,88" />
+      <scope id="8986357566212684075" at="2197,16,2198,88" />
+      <scope id="3239569521490197949" at="2199,16,2200,88" />
+      <scope id="5002485985637417315" at="2201,16,2202,88" />
+      <scope id="5970181360963002103" at="2203,16,2204,88" />
+      <scope id="6354776497113862138" at="2205,16,2206,88" />
+      <scope id="2436117033632111129" at="2561,16,2562,66" />
+      <scope id="2436117033632111186" at="2563,16,2564,66" />
+      <scope id="5423338990220413266" at="2565,16,2566,66" />
+      <scope id="4237431449989321950" at="2567,16,2568,66" />
+      <scope id="4237431449989321974" at="2569,16,2570,66" />
+      <scope id="4237431449989322008" at="2571,16,2572,66" />
+      <scope id="4237431449989322020" at="2573,16,2574,66" />
+      <scope id="4237431449989322032" at="2575,16,2576,66" />
+      <scope id="3967774530650472141" at="2577,16,2578,66" />
+      <scope id="1769740796772668696" at="2579,16,2580,66" />
+      <scope id="5423338990220523093" at="2581,16,2582,67" />
+      <scope id="978600701690073082" at="2583,16,2584,67" />
+      <scope id="5970181360960745172" at="2585,16,2586,67" />
+      <scope id="3733986151372087665" at="2587,16,2588,67" />
+      <scope id="8845345751178380247" at="2589,16,2590,67" />
+      <scope id="449958221363123418" at="2591,16,2592,67" />
+      <scope id="1933226676407305895" at="2593,16,2594,67" />
+      <scope id="5002485985636846574" at="2595,16,2596,67" />
+      <scope id="5002485985636839430" at="2597,16,2598,67" />
+      <scope id="4035665851935707493" at="2599,16,2600,67" />
+      <scope id="4035665851935768873" at="2601,16,2602,67" />
+      <scope id="4035665851936450198" at="2603,16,2604,67" />
+      <scope id="4035665851936666756" at="2605,17,2606,67" />
+      <scope id="4035665851936450300" at="2607,17,2608,67" />
+      <scope id="4035665851936951126" at="2609,17,2610,67" />
+      <scope id="4035665851936219812" at="2611,17,2612,67" />
+      <scope id="1992944417853204718" at="2613,17,2614,67" />
+      <scope id="4035665851936216040" at="2615,17,2616,67" />
+      <scope id="4035665851936216049" at="2617,17,2618,67" />
+      <scope id="3239569521490197761" at="2619,17,2620,67" />
+      <scope id="8986357566212561514" at="2621,17,2622,67" />
+      <scope id="1374711517443210408" at="2623,17,2624,67" />
+      <scope id="8702237507672319033" at="2625,17,2626,67" />
+      <scope id="5002485985637417294" at="2627,17,2628,67" />
+      <scope id="5002485985637417303" at="2629,17,2630,67" />
+      <scope id="7795397664372773538" at="2631,17,2632,67" />
+      <scope id="5970181360963002105" at="2633,17,2634,67" />
+      <scope id="6354776497085480729" at="2635,17,2636,67" />
+      <scope id="1769740796772692676" at="2936,16,2937,61" />
+      <scope id="3733986151372083092" at="2938,16,2939,61" />
+      <scope id="8845345751178285143" at="2940,16,2941,61" />
+      <scope id="5970181360960165169" at="2942,16,2943,61" />
+      <scope id="1933226676407114454" at="2944,16,2945,61" />
+      <scope id="4035665851936438514" at="2946,16,2947,61" />
+      <scope id="4035665851935707502" at="2948,16,2949,61" />
+      <scope id="1992944417853204725" at="2950,16,2951,61" />
+      <scope id="4035665851935770399" at="2952,16,2953,61" />
+      <scope id="398731435601112750" at="2954,16,2955,61" />
+      <scope id="1787667533297084980" at="2956,16,2957,62" />
+      <scope id="5002485985634204064" at="2958,16,2959,62" />
+      <scope id="3239569521490198040" at="2960,16,2961,62" />
+      <scope id="4101476690146989261" at="2962,16,2963,62" />
+      <scope id="6354776497085480788" at="2964,16,2965,62" />
+      <scope id="2409421742521905606" at="3163,16,3164,58" />
+      <scope id="2409421742521905610" at="3165,16,3166,58" />
+      <scope id="2409421742521905625" at="3167,16,3168,58" />
+      <scope id="5121314058278757759" at="3169,16,3170,58" />
+      <scope id="4438567763349653940" at="3171,16,3172,58" />
+      <scope id="1933226676407279753" at="3173,16,3174,58" />
+      <scope id="2409421742521905630" at="3175,16,3176,58" />
+      <scope id="2409421742521905633" at="3177,16,3178,58" />
+      <scope id="2409421742521905636" at="3179,16,3180,58" />
+      <scope id="2409421742521905640" at="3181,16,3182,58" />
+      <scope id="2402740824034685341" at="3333,52,3334,40" />
       <scope id="5423338990220413592" at="509,64,511,41" />
       <scope id="449958221363123459" at="578,12,580,21" />
       <scope id="4035665851936219865" at="623,12,625,21" />
-      <scope id="8702237507672319081" at="652,12,654,21" />
-      <scope id="1787667533297084984" at="1069,78,1071,103">
+      <scope id="8702237507672319081" at="655,12,657,21" />
+      <scope id="1787667533297084984" at="1075,79,1077,103">
         <var name="mpsAspect" id="1787667533297288930" />
       </scope>
-      <scope id="3340252814673340879" at="1736,24,1738,68">
+      <scope id="3340252814673340879" at="1742,24,1744,68">
         <var name="libLocation" id="4963874803257612476" />
       </scope>
-      <scope id="1933226676407279755" at="1758,78,1760,109">
+      <scope id="1933226676407279755" at="1764,78,1766,109">
         <var name="options" id="1933226676407295326" />
       </scope>
-      <scope id="6354776497085480749" at="1776,78,1778,152">
+      <scope id="6354776497085480749" at="1782,78,1784,152">
         <var name="dependencies" id="6354776497085480751" />
       </scope>
       <scope id="4237431449989321951" at="515,0,518,0">
@@ -980,170 +992,176 @@
       <scope id="4035665851936951127" at="613,0,616,0">
         <var name="_context" id="4035665851936951127" />
       </scope>
-      <scope id="4035665851936216041" at="630,0,633,0">
+      <scope id="1992944417853204719" at="630,0,633,0">
+        <var name="_context" id="1992944417853204719" />
+      </scope>
+      <scope id="4035665851936216041" at="633,0,636,0">
         <var name="_context" id="4035665851936216041" />
       </scope>
-      <scope id="4035665851936216050" at="633,0,636,0">
+      <scope id="4035665851936216050" at="636,0,639,0">
         <var name="_context" id="4035665851936216050" />
       </scope>
-      <scope id="3239569521490197762" at="636,0,639,0">
+      <scope id="3239569521490197762" at="639,0,642,0">
         <var name="_context" id="3239569521490197762" />
       </scope>
-      <scope id="8986357566212561515" at="639,0,642,0">
+      <scope id="8986357566212561515" at="642,0,645,0">
         <var name="_context" id="8986357566212561515" />
       </scope>
-      <scope id="1374711517443210409" at="642,0,645,0">
+      <scope id="1374711517443210409" at="645,0,648,0">
         <var name="_context" id="1374711517443210409" />
       </scope>
-      <scope id="5002485985637417295" at="659,0,662,0">
+      <scope id="5002485985637417295" at="662,0,665,0">
         <var name="_context" id="5002485985637417295" />
       </scope>
-      <scope id="5002485985637417304" at="662,0,665,0">
+      <scope id="5002485985637417304" at="665,0,668,0">
         <var name="_context" id="5002485985637417304" />
       </scope>
-      <scope id="7795397664372773539" at="665,0,668,0">
+      <scope id="7795397664372773539" at="668,0,671,0">
         <var name="_context" id="7795397664372773539" />
       </scope>
-      <scope id="5970181360963002106" at="668,0,671,0">
+      <scope id="5970181360963002106" at="671,0,674,0">
         <var name="_context" id="5970181360963002106" />
       </scope>
-      <scope id="6354776497085480730" at="671,0,674,0">
+      <scope id="6354776497085480730" at="674,0,677,0">
         <var name="_context" id="6354776497085480730" />
       </scope>
-      <scope id="1769740796772692679" at="1039,0,1042,0">
+      <scope id="1769740796772692679" at="1042,0,1045,0">
         <var name="_context" id="1769740796772692679" />
       </scope>
-      <scope id="3733986151372083094" at="1042,0,1045,0">
+      <scope id="3733986151372083094" at="1045,0,1048,0">
         <var name="_context" id="3733986151372083094" />
       </scope>
-      <scope id="8845345751178285144" at="1045,0,1048,0">
+      <scope id="8845345751178285144" at="1048,0,1051,0">
         <var name="_context" id="8845345751178285144" />
       </scope>
-      <scope id="5970181360960165170" at="1048,0,1051,0">
+      <scope id="5970181360960165170" at="1051,0,1054,0">
         <var name="_context" id="5970181360960165170" />
       </scope>
-      <scope id="1933226676407114455" at="1051,0,1054,0">
+      <scope id="1933226676407114455" at="1054,0,1057,0">
         <var name="_context" id="1933226676407114455" />
       </scope>
-      <scope id="4035665851936438515" at="1054,0,1057,0">
+      <scope id="4035665851936438515" at="1057,0,1060,0">
         <var name="_context" id="4035665851936438515" />
       </scope>
-      <scope id="4035665851935707503" at="1057,0,1060,0">
+      <scope id="4035665851935707503" at="1060,0,1063,0">
         <var name="_context" id="4035665851935707503" />
       </scope>
-      <scope id="398731435601112752" at="1066,0,1069,0">
+      <scope id="1992944417853204726" at="1063,0,1066,0">
+        <var name="_context" id="1992944417853204726" />
+      </scope>
+      <scope id="398731435601112752" at="1072,0,1075,0">
         <var name="_context" id="398731435601112752" />
       </scope>
-      <scope id="3239569521490198041" at="1080,0,1083,0">
+      <scope id="3239569521490198041" at="1086,0,1089,0">
         <var name="_context" id="3239569521490198041" />
       </scope>
-      <scope id="6354776497085480789" at="1089,0,1092,0">
+      <scope id="6354776497085480789" at="1095,0,1098,0">
         <var name="_context" id="6354776497085480789" />
       </scope>
-      <scope id="5970181360960745073" at="1432,0,1435,0">
+      <scope id="5970181360960745073" at="1438,0,1441,0">
         <var name="_context" id="5970181360960745073" />
       </scope>
-      <scope id="8845345751178284865" at="1436,124,1439,22">
+      <scope id="8845345751178284865" at="1442,124,1445,22">
         <var name="loopnode" id="8845345751178284887" />
       </scope>
-      <scope id="5002485985636840318" at="1452,0,1455,0">
+      <scope id="5002485985636840318" at="1458,0,1461,0">
         <var name="_context" id="5002485985636840318" />
       </scope>
-      <scope id="4035665851936450308" at="1461,0,1464,0">
+      <scope id="4035665851936450308" at="1467,0,1470,0">
         <var name="_context" id="4035665851936450308" />
       </scope>
-      <scope id="4035665851936216061" at="1470,0,1473,0">
+      <scope id="4035665851936216061" at="1476,0,1479,0">
         <var name="_context" id="4035665851936216061" />
       </scope>
-      <scope id="3239569521490197891" at="1473,0,1476,0">
+      <scope id="3239569521490197891" at="1479,0,1482,0">
         <var name="_context" id="3239569521490197891" />
       </scope>
-      <scope id="8986357566212684075" at="1476,0,1479,0">
+      <scope id="8986357566212684075" at="1482,0,1485,0">
         <var name="_context" id="8986357566212684075" />
       </scope>
-      <scope id="3239569521490197949" at="1479,0,1482,0">
+      <scope id="3239569521490197949" at="1485,0,1488,0">
         <var name="_context" id="3239569521490197949" />
       </scope>
-      <scope id="5002485985637417315" at="1482,0,1485,0">
+      <scope id="5002485985637417315" at="1488,0,1491,0">
         <var name="_context" id="5002485985637417315" />
       </scope>
-      <scope id="7354447573577627073" at="1491,0,1494,0">
+      <scope id="7354447573577627073" at="1497,0,1500,0">
         <var name="it" id="7354447573577627073" />
       </scope>
-      <scope id="7354447573577628495" at="1498,0,1501,0">
+      <scope id="7354447573577628495" at="1504,0,1507,0">
         <var name="it" id="7354447573577628495" />
       </scope>
-      <scope id="6354776497113862138" at="1506,0,1509,0">
+      <scope id="6354776497113862138" at="1512,0,1515,0">
         <var name="_context" id="6354776497113862138" />
       </scope>
-      <scope id="5970181360960164993" at="1747,0,1750,0">
+      <scope id="5970181360960164993" at="1753,0,1756,0">
         <var name="_context" id="5970181360960164993" />
       </scope>
-      <scope id="3733986151371807578" at="1750,0,1753,0">
+      <scope id="3733986151371807578" at="1756,0,1759,0">
         <var name="_context" id="3733986151371807578" />
       </scope>
-      <scope id="4438567763349653942" at="1753,78,1756,19">
+      <scope id="4438567763349653942" at="1759,78,1762,19">
         <var name="plugins" id="106891382227936604" />
       </scope>
-      <scope id="3239569521490197770" at="1762,78,1765,44">
+      <scope id="3239569521490197770" at="1768,78,1771,44">
         <var name="plugins" id="106891382228416455" />
       </scope>
-      <scope id="7391870795497191469" at="1786,388,1789,7">
+      <scope id="7391870795497191469" at="1792,388,1795,7">
         <var name="c" id="7391870795497191470" />
       </scope>
-      <scope id="4035665851936450290" at="3302,84,3305,26">
+      <scope id="4035665851936450290" at="3314,84,3317,26">
         <var name="n0" id="4035665851936450290" />
       </scope>
-      <scope id="3239569521490197904" at="3307,84,3310,26">
+      <scope id="3239569521490197904" at="3319,84,3322,26">
         <var name="n0" id="3239569521490197904" />
       </scope>
-      <scope id="2402740824034685341" at="3321,0,3324,0">
+      <scope id="2402740824034685341" at="3333,0,3336,0">
         <var name="str" id="2402740824034685341" />
       </scope>
       <scope id="2436117033632111131" at="496,88,500,39" />
       <scope id="2436117033632111188" at="502,88,506,39" />
-      <scope id="4035665851935770401" at="1060,78,1064,221" />
-      <scope id="1787667533297084982" at="1069,0,1073,0">
+      <scope id="4035665851935770401" at="1066,78,1070,221" />
+      <scope id="1787667533297084982" at="1075,0,1079,0">
         <var name="_context" id="1787667533297084982" />
       </scope>
-      <scope id="4101476690146989265" at="1083,79,1087,217" />
-      <scope id="4035665851936450207" at="1455,104,1459,0" />
-      <scope id="4035665851936681465" at="1464,104,1468,257">
+      <scope id="4101476690146989265" at="1089,79,1093,217" />
+      <scope id="4035665851936450207" at="1461,104,1465,0" />
+      <scope id="4035665851936681465" at="1470,104,1474,257">
         <var name="modules" id="4035665851936901617" />
         <var name="seen" id="4035665851937036766" />
       </scope>
-      <scope id="1933226676407279754" at="1758,0,1762,0">
+      <scope id="1933226676407279754" at="1764,0,1768,0">
         <var name="_context" id="1933226676407279754" />
       </scope>
-      <scope id="6354776497085480748" at="1776,0,1780,0">
+      <scope id="6354776497085480748" at="1782,0,1786,0">
         <var name="_context" id="6354776497085480748" />
       </scope>
-      <scope id="6354776497085480772" at="3312,107,3316,26">
+      <scope id="6354776497085480772" at="3324,107,3328,26">
         <var name="n0" id="6354776497085480772" />
       </scope>
       <scope id="5423338990220413268" at="508,88,513,81" />
       <scope id="5423338990220523095" at="552,89,557,19" />
       <scope id="4035665851935768875" at="597,89,602,19" />
-      <scope id="5002485985634204068" at="1073,79,1078,134">
+      <scope id="5002485985634204068" at="1079,79,1084,134">
         <var name="ba" id="5002485985634208503" />
       </scope>
-      <scope id="978600701690054687" at="1425,104,1430,210" />
-      <scope id="8845345751178284779" at="1435,104,1440,7" />
-      <scope id="7354447573577627066" at="1489,104,1494,9" />
-      <scope id="7354447573577628488" at="1496,108,1501,9" />
-      <scope id="4438567763349653941" at="1753,0,1758,0">
+      <scope id="978600701690054687" at="1431,104,1436,210" />
+      <scope id="8845345751178284779" at="1441,104,1446,7" />
+      <scope id="7354447573577627066" at="1495,104,1500,9" />
+      <scope id="7354447573577628488" at="1502,108,1507,9" />
+      <scope id="4438567763349653941" at="1759,0,1764,0">
         <var name="_context" id="4438567763349653941" />
       </scope>
-      <scope id="3239569521490197769" at="1762,0,1767,0">
+      <scope id="3239569521490197769" at="1768,0,1773,0">
         <var name="_context" id="3239569521490197769" />
       </scope>
-      <scope id="5970181360960255921" at="1784,368,1789,7">
+      <scope id="5970181360960255921" at="1790,368,1795,7">
         <var name="samples" id="5970181360960411034" />
       </scope>
-      <scope id="4035665851936450290" at="3302,0,3307,0">
+      <scope id="4035665851936450290" at="3314,0,3319,0">
         <var name="p0" id="4035665851936450290" />
       </scope>
-      <scope id="3239569521490197904" at="3307,0,3312,0">
+      <scope id="3239569521490197904" at="3319,0,3324,0">
         <var name="p0" id="3239569521490197904" />
       </scope>
       <scope id="2436117033632111130" at="496,0,502,0">
@@ -1152,19 +1170,19 @@
       <scope id="2436117033632111187" at="502,0,508,0">
         <var name="_context" id="2436117033632111187" />
       </scope>
-      <scope id="4035665851935770400" at="1060,0,1066,0">
+      <scope id="4035665851935770400" at="1066,0,1072,0">
         <var name="_context" id="4035665851935770400" />
       </scope>
-      <scope id="4101476690146989263" at="1083,0,1089,0">
+      <scope id="4101476690146989263" at="1089,0,1095,0">
         <var name="_context" id="4101476690146989263" />
       </scope>
-      <scope id="4035665851936450206" at="1455,0,1461,0">
+      <scope id="4035665851936450206" at="1461,0,1467,0">
         <var name="_context" id="4035665851936450206" />
       </scope>
-      <scope id="4035665851936681464" at="1464,0,1470,0">
+      <scope id="4035665851936681464" at="1470,0,1476,0">
         <var name="_context" id="4035665851936681464" />
       </scope>
-      <scope id="6354776497085480772" at="3312,0,3318,0">
+      <scope id="6354776497085480772" at="3324,0,3330,0">
         <var name="p0" id="6354776497085480772" />
         <var name="p1" id="6354776497085480772" />
       </scope>
@@ -1177,27 +1195,27 @@
       <scope id="4035665851935768874" at="597,0,604,0">
         <var name="_context" id="4035665851935768874" />
       </scope>
-      <scope id="5002485985634204066" at="1073,0,1080,0">
+      <scope id="5002485985634204066" at="1079,0,1086,0">
         <var name="_context" id="5002485985634204066" />
       </scope>
-      <scope id="978600701690054686" at="1425,0,1432,0">
+      <scope id="978600701690054686" at="1431,0,1438,0">
         <var name="_context" id="978600701690054686" />
       </scope>
-      <scope id="8845345751178284778" at="1435,0,1442,0">
+      <scope id="8845345751178284778" at="1441,0,1448,0">
         <var name="_context" id="8845345751178284778" />
       </scope>
-      <scope id="8986357566212610612" at="1767,78,1774,78">
+      <scope id="8986357566212610612" at="1773,78,1780,78">
         <var name="allModules" id="8986357566212685861" />
         <var name="closure" id="8986357566212685854" />
         <var name="gentest" id="8986357566212685846" />
         <var name="visibleModules" id="8986357566212685836" />
       </scope>
       <scope id="3967774530650472143" at="539,88,547,39" />
-      <scope id="8845345751178284915" at="1442,104,1450,160">
+      <scope id="8845345751178284915" at="1448,104,1456,160">
         <var name="managedGenerators" id="5829439739855203735" />
         <var name="mm" id="5829439739855133197" />
       </scope>
-      <scope id="8986357566212610610" at="1767,0,1776,0">
+      <scope id="8986357566212610610" at="1773,0,1782,0">
         <var name="_context" id="8986357566212610610" />
       </scope>
       <scope id="4237431449989321976" at="518,88,528,33">
@@ -1206,15 +1224,15 @@
       <scope id="3967774530650472142" at="539,0,549,0">
         <var name="_context" id="3967774530650472142" />
       </scope>
-      <scope id="8845345751178284914" at="1442,0,1452,0">
+      <scope id="8845345751178284914" at="1448,0,1458,0">
         <var name="_context" id="8845345751178284914" />
       </scope>
-      <scope id="3340252814672973527" at="1717,78,1728,16">
+      <scope id="3340252814672973527" at="1723,78,1734,16">
         <var name="artifact" id="3340252814672973537" />
         <var name="helper" id="3340252814672973530" />
         <var name="jmAntJar" id="3340252814672973541" />
       </scope>
-      <scope id="5970181360963001550" at="1780,78,1791,23">
+      <scope id="5970181360963001550" at="1786,78,1797,23">
         <var name="partitioner" id="8845345751178284738" />
       </scope>
       <scope id="4237431449989321975" at="518,0,530,0">
@@ -1228,14 +1246,14 @@
         <var name="heapSize" id="4035665851936219828" />
         <var name="mpsAspect" id="4035665851936219816" />
       </scope>
-      <scope id="8702237507672319035" at="645,89,657,35">
+      <scope id="8702237507672319035" at="648,89,660,35">
         <var name="heapSize" id="8702237507672319056" />
         <var name="mpsAspect" id="8702237507672319037" />
       </scope>
-      <scope id="3340252814672973526" at="1717,0,1730,0">
+      <scope id="3340252814672973526" at="1723,0,1736,0">
         <var name="_context" id="3340252814672973526" />
       </scope>
-      <scope id="5970181360963001549" at="1780,0,1793,0">
+      <scope id="5970181360963001549" at="1786,0,1799,0">
         <var name="_context" id="5970181360963001549" />
       </scope>
       <scope id="449958221363123419" at="571,0,585,0">
@@ -1244,154 +1262,154 @@
       <scope id="4035665851936219813" at="616,0,630,0">
         <var name="_context" id="4035665851936219813" />
       </scope>
-      <scope id="8702237507672319034" at="645,0,659,0">
+      <scope id="8702237507672319034" at="648,0,662,0">
         <var name="_context" id="8702237507672319034" />
       </scope>
-      <scope id="5423338990220300238" at="1408,104,1423,47">
+      <scope id="5423338990220300238" at="1414,104,1429,47">
         <var name="defaults" id="4297162197628724877" />
         <var name="seq" id="5423338990220345234" />
       </scope>
-      <scope id="3340252814673340856" at="1730,78,1745,16">
+      <scope id="3340252814673340856" at="1736,78,1751,16">
         <var name="artifact" id="3340252814673340866" />
         <var name="helper" id="3340252814673340859" />
         <var name="jar" id="3340252814673340870" />
       </scope>
-      <scope id="5423338990220300237" at="1408,0,1425,0">
+      <scope id="5423338990220300237" at="1414,0,1431,0">
         <var name="_context" id="5423338990220300237" />
       </scope>
-      <scope id="3340252814673340855" at="1730,0,1747,0">
+      <scope id="3340252814673340855" at="1736,0,1753,0">
         <var name="_context" id="3340252814673340855" />
       </scope>
-      <scope id="5970181360963002104" at="1485,105,1504,84">
+      <scope id="5970181360963002104" at="1491,105,1510,84">
         <var name="modules" id="7354447573577595457" />
         <var name="sources" id="7354447573577627060" />
         <var name="testSources" id="7354447573577628482" />
       </scope>
-      <scope id="5970181360963002103" at="1485,0,1506,0">
+      <scope id="5970181360963002103" at="1491,0,1512,0">
         <var name="_context" id="5970181360963002103" />
       </scope>
-      <unit id="7354447573577627073" at="1490,164,1494,7" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$1" />
-      <unit id="7354447573577628495" at="1497,164,1501,7" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$2" />
+      <unit id="7354447573577627073" at="1496,164,1500,7" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$1" />
+      <unit id="7354447573577628495" at="1503,164,1507,7" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$2" />
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/2105528055260559263">
     <file name="QueriesGenerated.java">
       <node id="7918752904810003846" at="289,88,290,124" concept="6" />
       <node id="5836395116734508884" at="292,88,293,90" concept="6" />
-      <node id="8369506495128850765" at="878,78,879,130" concept="6" />
-      <node id="8137134783397636873" at="881,78,882,118" concept="6" />
-      <node id="8654221991637263565" at="884,78,885,130" concept="6" />
-      <node id="8369506495128850712" at="1129,92,1130,120" concept="6" />
-      <node id="8654221991637263397" at="1132,92,1133,73" concept="6" />
-      <node id="8137134783397638491" at="1342,104,1343,81" concept="6" />
-      <node id="8137134783397639426" at="1345,104,1346,80" concept="6" />
-      <node id="3944422889387711513" at="1348,104,1349,82" concept="7" />
-      <node id="1517654889523732819" at="1349,82,1350,76" concept="5" />
-      <node id="1517654889523778939" at="1350,76,1351,300" concept="1" />
-      <node id="1517654889523986612" at="1351,300,1352,0" concept="8" />
-      <node id="1517654889523808870" at="1353,136,1354,412" concept="1" />
-      <node id="1517654889523986980" at="1355,5,1356,0" concept="8" />
-      <node id="1517654889523792259" at="1356,0,1357,22" concept="6" />
-      <node id="7918752904809458130" at="1660,78,1661,30" concept="6" />
-      <node id="8137134783397652240" at="1663,78,1664,30" concept="6" />
-      <node id="8369506495128850710" at="1933,56,1934,56" concept="1" />
-      <node id="8654221991637263395" at="1934,56,1935,56" concept="1" />
-      <node id="8369506495128850710" at="1979,15,1980,59" concept="6" />
-      <node id="8654221991637263395" at="1981,15,1982,59" concept="6" />
-      <node id="8137134783397638484" at="2043,58,2044,58" concept="1" />
-      <node id="8137134783397639419" at="2044,58,2045,58" concept="1" />
-      <node id="8654221991637263183" at="2045,58,2046,58" concept="1" />
-      <node id="8137134783397638484" at="2135,16,2136,87" concept="6" />
-      <node id="8137134783397639419" at="2137,16,2138,87" concept="6" />
-      <node id="8654221991637263183" at="2139,16,2140,87" concept="6" />
-      <node id="7918752904809327283" at="2245,192,2246,200" concept="1" />
-      <node id="8654221991637263444" at="2246,200,2247,190" concept="1" />
-      <node id="7918752904809327283" at="2436,16,2437,66" concept="6" />
-      <node id="8654221991637263444" at="2438,16,2439,66" concept="6" />
-      <node id="8369506495128850762" at="2722,57,2723,57" concept="1" />
-      <node id="8137134783397636863" at="2723,57,2724,57" concept="1" />
-      <node id="8654221991637263557" at="2724,57,2725,57" concept="1" />
-      <node id="8369506495128850762" at="2824,15,2825,61" concept="6" />
-      <node id="8137134783397636863" at="2826,15,2827,61" concept="6" />
-      <node id="8654221991637263557" at="2828,15,2829,61" concept="6" />
-      <node id="2409421742521905590" at="3098,54,3099,54" concept="1" />
-      <node id="8137134783397647618" at="3099,54,3100,54" concept="1" />
-      <node id="2409421742521905590" at="3141,15,3142,58" concept="6" />
-      <node id="8137134783397647618" at="3143,15,3144,58" concept="6" />
+      <node id="8369506495128850765" at="881,78,882,130" concept="6" />
+      <node id="8137134783397636873" at="884,78,885,118" concept="6" />
+      <node id="8654221991637263565" at="887,78,888,130" concept="6" />
+      <node id="8369506495128850712" at="1135,92,1136,120" concept="6" />
+      <node id="8654221991637263397" at="1138,92,1139,73" concept="6" />
+      <node id="8137134783397638491" at="1348,104,1349,81" concept="6" />
+      <node id="8137134783397639426" at="1351,104,1352,80" concept="6" />
+      <node id="3944422889387711513" at="1354,104,1355,82" concept="7" />
+      <node id="1517654889523732819" at="1355,82,1356,76" concept="5" />
+      <node id="1517654889523778939" at="1356,76,1357,300" concept="1" />
+      <node id="1517654889523986612" at="1357,300,1358,0" concept="8" />
+      <node id="1517654889523808870" at="1359,136,1360,412" concept="1" />
+      <node id="1517654889523986980" at="1361,5,1362,0" concept="8" />
+      <node id="1517654889523792259" at="1362,0,1363,22" concept="6" />
+      <node id="7918752904809458130" at="1666,78,1667,30" concept="6" />
+      <node id="8137134783397652240" at="1669,78,1670,30" concept="6" />
+      <node id="8369506495128850710" at="1939,56,1940,56" concept="1" />
+      <node id="8654221991637263395" at="1940,56,1941,56" concept="1" />
+      <node id="8369506495128850710" at="1985,15,1986,59" concept="6" />
+      <node id="8654221991637263395" at="1987,15,1988,59" concept="6" />
+      <node id="8137134783397638484" at="2049,58,2050,58" concept="1" />
+      <node id="8137134783397639419" at="2050,58,2051,58" concept="1" />
+      <node id="8654221991637263183" at="2051,58,2052,58" concept="1" />
+      <node id="8137134783397638484" at="2141,16,2142,87" concept="6" />
+      <node id="8137134783397639419" at="2143,16,2144,87" concept="6" />
+      <node id="8654221991637263183" at="2145,16,2146,87" concept="6" />
+      <node id="7918752904809327283" at="2251,192,2252,200" concept="1" />
+      <node id="8654221991637263444" at="2252,200,2253,190" concept="1" />
+      <node id="7918752904809327283" at="2443,16,2444,66" concept="6" />
+      <node id="8654221991637263444" at="2445,16,2446,66" concept="6" />
+      <node id="8369506495128850762" at="2731,57,2732,57" concept="1" />
+      <node id="8137134783397636863" at="2732,57,2733,57" concept="1" />
+      <node id="8654221991637263557" at="2733,57,2734,57" concept="1" />
+      <node id="8369506495128850762" at="2834,15,2835,61" concept="6" />
+      <node id="8137134783397636863" at="2836,15,2837,61" concept="6" />
+      <node id="8654221991637263557" at="2838,15,2839,61" concept="6" />
+      <node id="2409421742521905590" at="3110,54,3111,54" concept="1" />
+      <node id="8137134783397647618" at="3111,54,3112,54" concept="1" />
+      <node id="2409421742521905590" at="3153,15,3154,58" concept="6" />
+      <node id="8137134783397647618" at="3155,15,3156,58" concept="6" />
       <node id="7918752904809327284" at="289,0,292,0" concept="9" trace="propertyMacro_GetValue_2_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="8654221991637263445" at="292,0,295,0" concept="9" trace="propertyMacro_GetValue_2_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8369506495128850763" at="878,0,881,0" concept="9" trace="ifMacro_Condition_2_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="8137134783397636866" at="881,0,884,0" concept="9" trace="ifMacro_Condition_2_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="8654221991637263558" at="884,0,887,0" concept="9" trace="ifMacro_Condition_2_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="8369506495128850710" at="1129,0,1132,0" concept="9" trace="sourceNodeQuery_2_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="8654221991637263395" at="1132,0,1135,0" concept="9" trace="sourceNodeQuery_2_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="8137134783397638484" at="1342,0,1345,0" concept="9" trace="sourceNodesQuery_2_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="8137134783397639419" at="1345,0,1348,0" concept="9" trace="sourceNodesQuery_2_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="1517654889523808746" at="1352,0,1355,5" concept="3" />
-      <node id="7918752904809369311" at="1660,0,1663,0" concept="9" trace="varMacro_Value_2_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="8137134783397647619" at="1663,0,1666,0" concept="9" trace="varMacro_Value_2_1#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="8654221991637263183" at="1348,0,1359,0" concept="9" trace="sourceNodesQuery_2_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8369506495128850763" at="881,0,884,0" concept="9" trace="ifMacro_Condition_2_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="8137134783397636866" at="884,0,887,0" concept="9" trace="ifMacro_Condition_2_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="8654221991637263558" at="887,0,890,0" concept="9" trace="ifMacro_Condition_2_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="8369506495128850710" at="1135,0,1138,0" concept="9" trace="sourceNodeQuery_2_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="8654221991637263395" at="1138,0,1141,0" concept="9" trace="sourceNodeQuery_2_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="8137134783397638484" at="1348,0,1351,0" concept="9" trace="sourceNodesQuery_2_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8137134783397639419" at="1351,0,1354,0" concept="9" trace="sourceNodesQuery_2_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="1517654889523808746" at="1358,0,1361,5" concept="3" />
+      <node id="7918752904809369311" at="1666,0,1669,0" concept="9" trace="varMacro_Value_2_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="8137134783397647619" at="1669,0,1672,0" concept="9" trace="varMacro_Value_2_1#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="8654221991637263183" at="1354,0,1365,0" concept="9" trace="sourceNodesQuery_2_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
       <scope id="7918752904809327285" at="289,88,290,124" />
       <scope id="8654221991637263446" at="292,88,293,90" />
-      <scope id="8369506495128850764" at="878,78,879,130" />
-      <scope id="8137134783397636867" at="881,78,882,118" />
-      <scope id="8654221991637263559" at="884,78,885,130" />
-      <scope id="8369506495128850711" at="1129,92,1130,120" />
-      <scope id="8654221991637263396" at="1132,92,1133,73" />
-      <scope id="8137134783397638485" at="1342,104,1343,81" />
-      <scope id="8137134783397639420" at="1345,104,1346,80" />
-      <scope id="1517654889523808749" at="1353,136,1354,412" />
-      <scope id="7918752904809369313" at="1660,78,1661,30" />
-      <scope id="8137134783397647620" at="1663,78,1664,30" />
-      <scope id="8369506495128850710" at="1979,15,1980,59" />
-      <scope id="8654221991637263395" at="1981,15,1982,59" />
-      <scope id="8137134783397638484" at="2135,16,2136,87" />
-      <scope id="8137134783397639419" at="2137,16,2138,87" />
-      <scope id="8654221991637263183" at="2139,16,2140,87" />
-      <scope id="7918752904809327283" at="2436,16,2437,66" />
-      <scope id="8654221991637263444" at="2438,16,2439,66" />
-      <scope id="8369506495128850762" at="2824,15,2825,61" />
-      <scope id="8137134783397636863" at="2826,15,2827,61" />
-      <scope id="8654221991637263557" at="2828,15,2829,61" />
-      <scope id="2409421742521905590" at="3141,15,3142,58" />
-      <scope id="8137134783397647618" at="3143,15,3144,58" />
+      <scope id="8369506495128850764" at="881,78,882,130" />
+      <scope id="8137134783397636867" at="884,78,885,118" />
+      <scope id="8654221991637263559" at="887,78,888,130" />
+      <scope id="8369506495128850711" at="1135,92,1136,120" />
+      <scope id="8654221991637263396" at="1138,92,1139,73" />
+      <scope id="8137134783397638485" at="1348,104,1349,81" />
+      <scope id="8137134783397639420" at="1351,104,1352,80" />
+      <scope id="1517654889523808749" at="1359,136,1360,412" />
+      <scope id="7918752904809369313" at="1666,78,1667,30" />
+      <scope id="8137134783397647620" at="1669,78,1670,30" />
+      <scope id="8369506495128850710" at="1985,15,1986,59" />
+      <scope id="8654221991637263395" at="1987,15,1988,59" />
+      <scope id="8137134783397638484" at="2141,16,2142,87" />
+      <scope id="8137134783397639419" at="2143,16,2144,87" />
+      <scope id="8654221991637263183" at="2145,16,2146,87" />
+      <scope id="7918752904809327283" at="2443,16,2444,66" />
+      <scope id="8654221991637263444" at="2445,16,2446,66" />
+      <scope id="8369506495128850762" at="2834,15,2835,61" />
+      <scope id="8137134783397636863" at="2836,15,2837,61" />
+      <scope id="8654221991637263557" at="2838,15,2839,61" />
+      <scope id="2409421742521905590" at="3153,15,3154,58" />
+      <scope id="8137134783397647618" at="3155,15,3156,58" />
       <scope id="7918752904809327284" at="289,0,292,0">
         <var name="_context" id="7918752904809327284" />
       </scope>
       <scope id="8654221991637263445" at="292,0,295,0">
         <var name="_context" id="8654221991637263445" />
       </scope>
-      <scope id="8369506495128850763" at="878,0,881,0">
+      <scope id="8369506495128850763" at="881,0,884,0">
         <var name="_context" id="8369506495128850763" />
       </scope>
-      <scope id="8137134783397636866" at="881,0,884,0">
+      <scope id="8137134783397636866" at="884,0,887,0">
         <var name="_context" id="8137134783397636866" />
       </scope>
-      <scope id="8654221991637263558" at="884,0,887,0">
+      <scope id="8654221991637263558" at="887,0,890,0">
         <var name="_context" id="8654221991637263558" />
       </scope>
-      <scope id="8369506495128850710" at="1129,0,1132,0">
+      <scope id="8369506495128850710" at="1135,0,1138,0">
         <var name="_context" id="8369506495128850710" />
       </scope>
-      <scope id="8654221991637263395" at="1132,0,1135,0">
+      <scope id="8654221991637263395" at="1138,0,1141,0">
         <var name="_context" id="8654221991637263395" />
       </scope>
-      <scope id="8137134783397638484" at="1342,0,1345,0">
+      <scope id="8137134783397638484" at="1348,0,1351,0">
         <var name="_context" id="8137134783397638484" />
       </scope>
-      <scope id="8137134783397639419" at="1345,0,1348,0">
+      <scope id="8137134783397639419" at="1351,0,1354,0">
         <var name="_context" id="8137134783397639419" />
       </scope>
-      <scope id="7918752904809369311" at="1660,0,1663,0">
+      <scope id="7918752904809369311" at="1666,0,1669,0">
         <var name="_context" id="7918752904809369311" />
       </scope>
-      <scope id="8137134783397647619" at="1663,0,1666,0">
+      <scope id="8137134783397647619" at="1669,0,1672,0">
         <var name="_context" id="8137134783397647619" />
       </scope>
-      <scope id="8654221991637263184" at="1348,104,1357,22">
+      <scope id="8654221991637263184" at="1354,104,1363,22">
         <var name="modelRoots" id="1517654889523732822" />
       </scope>
-      <scope id="8654221991637263183" at="1348,0,1359,0">
+      <scope id="8654221991637263183" at="1354,0,1365,0">
         <var name="_context" id="8654221991637263183" />
       </scope>
     </file>
@@ -1453,252 +1471,252 @@
       <node id="506537499308818007" at="280,89,281,136" concept="6" />
       <node id="4743026300739110636" at="283,89,284,138" concept="6" />
       <node id="7840993736066065407" at="286,89,287,264" concept="6" />
-      <node id="7259033139236507289" at="805,93,806,96" concept="5" />
-      <node id="868032131020828198" at="806,96,807,169" concept="6" />
-      <node id="202934866058978719" at="809,93,810,80" concept="6" />
-      <node id="884473973751230705" at="854,103,855,191" concept="6" />
-      <node id="4571516170015253056" at="857,78,858,86" concept="6" />
-      <node id="8488591998065757177" at="860,78,861,124" concept="6" />
-      <node id="7477562766052507086" at="863,78,864,96" concept="6" />
-      <node id="7477562766052514323" at="866,78,867,98" concept="6" />
-      <node id="4743026300739110565" at="869,78,870,186" concept="6" />
-      <node id="4972001163782669460" at="872,78,873,140" concept="6" />
-      <node id="2151778867069498448" at="875,78,876,206" concept="6" />
-      <node id="2303926226081111384" at="1114,92,1115,76" concept="6" />
-      <node id="1065091787225360806" at="1117,92,1118,120" concept="6" />
-      <node id="6859736767834858757" at="1120,92,1121,59" concept="6" />
-      <node id="4571516170015289013" at="1123,92,1124,76" concept="6" />
-      <node id="6592112598314985662" at="1126,92,1127,155" concept="6" />
-      <node id="8252715012761560442" at="1195,90,1196,59" concept="6" />
-      <node id="4964617264469629189" at="1198,90,1199,80" concept="6" />
-      <node id="4676212293436886238" at="1201,90,1202,76" concept="6" />
-      <node id="4031822141870046784" at="1204,90,1205,76" concept="6" />
-      <node id="7135065582587537216" at="1207,90,1208,76" concept="6" />
-      <node id="2303926226081111360" at="1255,104,1256,145" concept="6" />
-      <node id="2389279258789752833" at="1258,104,1259,145" concept="6" />
-      <node id="9095843441492716614" at="1261,104,1262,273" concept="6" />
-      <node id="8169228734285862847" at="1264,104,1265,135" concept="5" />
-      <node id="7259033139236584408" at="1265,135,1266,48" concept="5" />
-      <node id="7259033139236584968" at="1267,147,1268,141" concept="5" />
-      <node id="4964617264469120493" at="1268,141,1269,72" concept="1" />
-      <node id="4964617264469120570" at="1269,72,1270,103" concept="1" />
-      <node id="7259033139236584984" at="1270,103,1271,57" concept="1" />
-      <node id="7259033139236584415" at="1272,5,1273,18" concept="6" />
-      <node id="3717132724153192093" at="1275,104,1276,48" concept="5" />
-      <node id="4421917191016427109" at="1277,399,1278,373" concept="1" />
-      <node id="3717132724153192164" at="1279,5,1280,18" concept="6" />
-      <node id="6859736767834855057" at="1282,104,1283,48" concept="5" />
-      <node id="4421917191016427143" at="1284,299,1285,378" concept="1" />
-      <node id="4421917191016860795" at="1287,68,1288,134" concept="5" />
-      <node id="4964617264469629058" at="1288,134,1289,69" concept="1" />
-      <node id="4421917191016860847" at="1289,69,1290,22" concept="6" />
-      <node id="202934866058978496" at="1293,104,1294,48" concept="5" />
-      <node id="202934866058978572" at="1295,289,1296,388" concept="1" />
-      <node id="202934866058978665" at="1298,68,1299,141" concept="5" />
-      <node id="4964617264469340442" at="1299,141,1300,112" concept="1" />
-      <node id="202934866058978681" at="1300,112,1301,22" concept="6" />
-      <node id="1500819558096263529" at="1304,104,1305,79" concept="6" />
-      <node id="8315586463637239067" at="1307,104,1308,80" concept="6" />
-      <node id="8944013247832594565" at="1310,104,1311,183" concept="6" />
-      <node id="1362762974883028547" at="1313,105,1314,189" concept="6" />
-      <node id="1362762974887689899" at="1316,105,1317,144" concept="7" />
-      <node id="1362762974888397825" at="1317,144,1318,135" concept="7" />
-      <node id="1362762974889369081" at="1318,135,1319,88" concept="7" />
-      <node id="1362762974883722817" at="1319,88,1320,180" concept="6" />
-      <node id="4743026300739027023" at="1322,105,1323,319" concept="6" />
-      <node id="5471664488998043498" at="1325,105,1326,156" concept="7" />
-      <node id="5471664488997984159" at="1326,156,1327,428" concept="5" />
-      <node id="5471664489000814818" at="1328,123,1329,146" concept="5" />
-      <node id="5471664488998054843" at="1329,146,1330,165" concept="6" />
-      <node id="6654070855064104841" at="1333,105,1334,86" concept="6" />
-      <node id="8488591998065732069" at="1336,105,1337,88" concept="6" />
-      <node id="6673387549253815205" at="1339,105,1340,80" concept="6" />
-      <node id="687702229766679340" at="1546,86,1547,152" concept="5" />
-      <node id="687702229766679350" at="1547,152,1548,144" concept="5" />
-      <node id="687702229766682259" at="1548,144,1549,164" concept="5" />
-      <node id="687702229765088733" at="1549,164,1550,127" concept="1" />
-      <node id="687702229768150161" at="1552,86,1553,152" concept="5" />
-      <node id="687702229768173487" at="1553,152,1554,143" concept="5" />
-      <node id="687702229768150199" at="1555,172,1556,130" concept="1" />
-      <node id="8849917859618854586" at="1559,86,1560,109" concept="7" />
-      <node id="4031822141869971727" at="1560,109,1561,207" concept="1" />
-      <node id="7135065582586672920" at="1561,207,1562,143" concept="1" />
-      <node id="7135065582587550607" at="1564,86,1565,143" concept="1" />
-      <node id="2413798559262850626" at="1570,94,1571,72" concept="6" />
-      <node id="5397230782653147319" at="1573,94,1574,107" concept="6" />
-      <node id="8252715012761560348" at="1621,78,1622,114" concept="6" />
-      <node id="4567115369870223423" at="1624,78,1625,30" concept="6" />
-      <node id="4034100441902363633" at="1627,78,1628,30" concept="6" />
-      <node id="4034100441902352465" at="1630,78,1631,40" concept="7" />
-      <node id="4034100441902352472" at="1631,40,1632,75" concept="5" />
-      <node id="4034100441902352480" at="1633,92,1634,69" concept="1" />
-      <node id="4034100441902352492" at="1636,89,1637,108" concept="1" />
-      <node id="4034100441902352498" at="1637,108,1638,18" concept="6" />
-      <node id="4034100441902352791" at="1639,5,1640,79" concept="6" />
-      <node id="4034100441902341637" at="1642,78,1643,112" concept="5" />
-      <node id="4034100441902412962" at="1644,26,1645,82" concept="1" />
-      <node id="4034100441902412968" at="1645,82,1646,18" concept="6" />
-      <node id="4034100441902412973" at="1647,5,1648,0" concept="8" />
-      <node id="4034100441902330805" at="1648,0,1649,68" concept="5" />
-      <node id="4034100441902330811" at="1649,68,1650,45" concept="1" />
-      <node id="4034100441902332094" at="1650,45,1651,26" concept="6" />
-      <node id="1362762974881508542" at="1653,78,1654,59" concept="5" />
-      <node id="1362762974881508547" at="1655,134,1656,139" concept="1" />
-      <node id="1362762974882004088" at="1657,5,1658,18" concept="6" />
-      <node id="687702229766529098" at="1795,14,1796,55" concept="1" />
-      <node id="687702229768099918" at="1796,55,1797,55" concept="1" />
-      <node id="884473973751152856" at="1800,56,1801,55" concept="1" />
-      <node id="687702229766529098" at="1817,15,1818,58" concept="6" />
-      <node id="687702229768099918" at="1819,15,1820,58" concept="6" />
-      <node id="884473973751152856" at="1827,15,1828,58" concept="6" />
-      <node id="2413798559262849242" at="1836,14,1837,57" concept="1" />
-      <node id="5397230782653143327" at="1837,57,1838,57" concept="1" />
-      <node id="2413798559262849242" at="1866,15,1867,58" concept="6" />
-      <node id="5397230782653143327" at="1868,15,1869,22" concept="6" />
-      <node id="2413798559262849242" at="1877,15,1878,68" concept="6" />
-      <node id="5397230782653143327" at="1879,15,1880,68" concept="6" />
-      <node id="2413798559262849242" at="1890,15,1891,22" concept="6" />
-      <node id="5397230782653143327" at="1892,15,1893,22" concept="6" />
-      <node id="2303926226081111358" at="1928,14,1929,56" concept="1" />
-      <node id="1065091787225169766" at="1929,56,1930,56" concept="1" />
-      <node id="6859736767834858755" at="1930,56,1931,56" concept="1" />
-      <node id="4571516170015288837" at="1931,56,1932,56" concept="1" />
-      <node id="6592112598314985660" at="1932,56,1933,56" concept="1" />
-      <node id="2303926226081111358" at="1969,15,1970,59" concept="6" />
-      <node id="1065091787225169766" at="1971,15,1972,59" concept="6" />
-      <node id="6859736767834858755" at="1973,15,1974,59" concept="6" />
-      <node id="4571516170015288837" at="1975,15,1976,59" concept="6" />
-      <node id="6592112598314985660" at="1977,15,1978,59" concept="6" />
-      <node id="2303926226081111354" at="2026,14,2027,58" concept="1" />
-      <node id="2389279258789752324" at="2027,58,2028,58" concept="1" />
-      <node id="4267986820121149056" at="2028,58,2029,58" concept="1" />
-      <node id="7259033139236497711" at="2029,58,2030,58" concept="1" />
-      <node id="3717132724153192091" at="2030,58,2031,58" concept="1" />
-      <node id="6859736767834858211" at="2031,58,2032,58" concept="1" />
-      <node id="202934866058978115" at="2032,58,2033,57" concept="1" />
-      <node id="1500819558096263527" at="2033,57,2034,58" concept="1" />
-      <node id="8315586463637239065" at="2034,58,2035,58" concept="1" />
-      <node id="4643216374596368654" at="2035,58,2036,58" concept="1" />
-      <node id="1362762974883028545" at="2036,58,2037,58" concept="1" />
-      <node id="1362762974883681814" at="2037,58,2038,58" concept="1" />
-      <node id="4743026300739026814" at="2038,58,2039,58" concept="1" />
-      <node id="5471664488997884105" at="2039,58,2040,58" concept="1" />
-      <node id="6654070855064104839" at="2040,58,2041,58" concept="1" />
-      <node id="8488591998065731739" at="2041,58,2042,58" concept="1" />
-      <node id="6673387549253815203" at="2042,58,2043,58" concept="1" />
-      <node id="2303926226081111354" at="2101,15,2102,87" concept="6" />
-      <node id="2389279258789752324" at="2103,15,2104,87" concept="6" />
-      <node id="4267986820121149056" at="2105,15,2106,87" concept="6" />
-      <node id="7259033139236497711" at="2107,15,2108,87" concept="6" />
-      <node id="3717132724153192091" at="2109,15,2110,87" concept="6" />
-      <node id="6859736767834858211" at="2111,15,2112,87" concept="6" />
-      <node id="202934866058978115" at="2113,15,2114,87" concept="6" />
-      <node id="1500819558096263527" at="2115,15,2116,87" concept="6" />
-      <node id="8315586463637239065" at="2117,15,2118,87" concept="6" />
-      <node id="4643216374596368654" at="2119,15,2120,87" concept="6" />
-      <node id="1362762974883028545" at="2121,16,2122,88" concept="6" />
-      <node id="1362762974883681814" at="2123,16,2124,88" concept="6" />
-      <node id="4743026300739026814" at="2125,16,2126,88" concept="6" />
-      <node id="5471664488997884105" at="2127,16,2128,88" concept="6" />
-      <node id="6654070855064104839" at="2129,16,2130,88" concept="6" />
-      <node id="8488591998065731739" at="2131,16,2132,88" concept="6" />
-      <node id="6673387549253815203" at="2133,16,2134,88" concept="6" />
-      <node id="2389279258789759929" at="2226,14,2227,196" concept="1" />
-      <node id="1500819558096225937" at="2227,196,2228,184" concept="1" />
-      <node id="7259033139236585057" at="2228,184,2229,192" concept="1" />
-      <node id="8206585334428452729" at="2229,192,2230,200" concept="1" />
-      <node id="295480548702159651" at="2230,200,2231,191" concept="1" />
-      <node id="2105528055260559334" at="2231,191,2232,188" concept="1" />
-      <node id="4643216374596368556" at="2232,188,2233,186" concept="1" />
-      <node id="4643216374596368424" at="2233,186,2234,192" concept="1" />
-      <node id="4643216374596368502" at="2234,192,2235,220" concept="1" />
-      <node id="4643216374596368656" at="2235,220,2236,211" concept="1" />
-      <node id="1362762974883028535" at="2236,211,2237,211" concept="1" />
-      <node id="1362762974883585622" at="2237,211,2238,200" concept="1" />
-      <node id="4743026300739052425" at="2238,200,2239,192" concept="1" />
-      <node id="5471664488997883966" at="2239,192,2240,192" concept="1" />
-      <node id="6654070855064472579" at="2240,192,2241,204" concept="1" />
-      <node id="8488591998065733682" at="2241,204,2242,185" concept="1" />
-      <node id="4743026300739110531" at="2242,185,2243,198" concept="1" />
-      <node id="4743026300739110546" at="2243,198,2244,194" concept="1" />
-      <node id="7840993736066063441" at="2244,194,2245,192" concept="1" />
-      <node id="2389279258789759929" at="2398,15,2399,66" concept="6" />
-      <node id="1500819558096225937" at="2400,15,2401,66" concept="6" />
-      <node id="7259033139236585057" at="2402,15,2403,66" concept="6" />
-      <node id="8206585334428452729" at="2404,15,2405,66" concept="6" />
-      <node id="295480548702159651" at="2406,15,2407,66" concept="6" />
-      <node id="2105528055260559334" at="2408,15,2409,66" concept="6" />
-      <node id="4643216374596368556" at="2410,15,2411,66" concept="6" />
-      <node id="4643216374596368424" at="2412,15,2413,66" concept="6" />
-      <node id="4643216374596368502" at="2414,15,2415,66" concept="6" />
-      <node id="4643216374596368656" at="2416,15,2417,66" concept="6" />
-      <node id="1362762974883028535" at="2418,16,2419,67" concept="6" />
-      <node id="1362762974883585622" at="2420,16,2421,67" concept="6" />
-      <node id="4743026300739052425" at="2422,16,2423,67" concept="6" />
-      <node id="5471664488997883966" at="2424,16,2425,67" concept="6" />
-      <node id="6654070855064472579" at="2426,16,2427,67" concept="6" />
-      <node id="8488591998065733682" at="2428,16,2429,67" concept="6" />
-      <node id="4743026300739110531" at="2430,16,2431,67" concept="6" />
-      <node id="4743026300739110546" at="2432,16,2433,67" concept="6" />
-      <node id="7840993736066063441" at="2434,16,2435,67" concept="6" />
-      <node id="4571516170015252590" at="2715,14,2716,57" concept="1" />
-      <node id="8488591998065755518" at="2716,57,2717,57" concept="1" />
-      <node id="7477562766052505826" at="2717,57,2718,57" concept="1" />
-      <node id="7477562766052512687" at="2718,57,2719,57" concept="1" />
-      <node id="4743026300739110562" at="2719,57,2720,57" concept="1" />
-      <node id="4972001163782669450" at="2720,57,2721,57" concept="1" />
-      <node id="7840993736063167249" at="2721,57,2722,57" concept="1" />
-      <node id="4571516170015252590" at="2810,15,2811,61" concept="6" />
-      <node id="8488591998065755518" at="2812,15,2813,61" concept="6" />
-      <node id="7477562766052505826" at="2814,15,2815,61" concept="6" />
-      <node id="7477562766052512687" at="2816,15,2817,61" concept="6" />
-      <node id="4743026300739110562" at="2818,15,2819,61" concept="6" />
-      <node id="4972001163782669450" at="2820,15,2821,61" concept="6" />
-      <node id="7840993736063167249" at="2822,15,2823,61" concept="6" />
-      <node id="1500819558096430319" at="2975,14,2976,58" concept="1" />
-      <node id="3570488090011334546" at="2976,58,2977,58" concept="1" />
-      <node id="1500819558096430319" at="2998,15,2999,58" concept="6" />
-      <node id="3570488090011334546" at="3000,15,3001,58" concept="6" />
-      <node id="7259033139236507286" at="3018,3,3019,62" concept="1" />
-      <node id="202934866058978110" at="3019,62,3020,64" concept="1" />
-      <node id="884473973751152856" at="3034,61,3035,60" concept="1" />
-      <node id="7259033139236507286" at="3052,15,3053,70" concept="6" />
-      <node id="202934866058978110" at="3054,15,3055,70" concept="6" />
-      <node id="884473973751152856" at="3084,16,3085,80" concept="6" />
-      <node id="2409421742521905574" at="3092,3,3093,54" concept="1" />
-      <node id="4567115369870200968" at="3093,54,3094,54" concept="1" />
-      <node id="4034100441902354106" at="3094,54,3095,54" concept="1" />
-      <node id="4034100441902341994" at="3095,54,3096,54" concept="1" />
-      <node id="4034100441902321122" at="3096,54,3097,54" concept="1" />
-      <node id="1362762974881123189" at="3097,54,3098,54" concept="1" />
-      <node id="2409421742521905574" at="3129,15,3130,58" concept="6" />
-      <node id="4567115369870200968" at="3131,15,3132,58" concept="6" />
-      <node id="4034100441902354106" at="3133,15,3134,58" concept="6" />
-      <node id="4034100441902341994" at="3135,15,3136,58" concept="6" />
-      <node id="4034100441902321122" at="3137,15,3138,58" concept="6" />
-      <node id="1362762974881123189" at="3139,15,3140,58" concept="6" />
-      <node id="8252715012761560442" at="3178,54,3179,54" concept="1" />
-      <node id="4964617264469629189" at="3179,54,3180,54" concept="1" />
-      <node id="4676212293436886238" at="3180,54,3181,54" concept="1" />
-      <node id="4031822141870046784" at="3181,54,3182,54" concept="1" />
-      <node id="7135065582587537216" at="3182,54,3183,54" concept="1" />
-      <node id="8252715012761560442" at="3216,15,3217,65" concept="6" />
-      <node id="4964617264469629189" at="3218,15,3219,65" concept="6" />
-      <node id="4676212293436886238" at="3220,15,3221,65" concept="6" />
-      <node id="4031822141870046784" at="3222,15,3223,65" concept="6" />
-      <node id="7135065582587537216" at="3224,15,3225,65" concept="6" />
-      <node id="687702229766712930" at="3262,3,3263,53" concept="1" />
-      <node id="687702229768150159" at="3263,53,3264,53" concept="1" />
-      <node id="4031822141869966867" at="3264,53,3265,54" concept="1" />
-      <node id="7135065582587550160" at="3265,54,3266,54" concept="1" />
-      <node id="687702229766712930" at="3282,15,3283,53" concept="1" />
-      <node id="687702229766712930" at="3283,53,3284,17" concept="6" />
-      <node id="687702229768150159" at="3285,15,3286,53" concept="1" />
-      <node id="687702229768150159" at="3286,53,3287,17" concept="6" />
-      <node id="4031822141869966867" at="3288,15,3289,53" concept="1" />
-      <node id="4031822141869966867" at="3289,53,3290,17" concept="6" />
-      <node id="7135065582587550160" at="3291,15,3292,53" concept="1" />
-      <node id="7135065582587550160" at="3292,53,3293,17" concept="6" />
+      <node id="7259033139236507289" at="808,93,809,96" concept="5" />
+      <node id="868032131020828198" at="809,96,810,169" concept="6" />
+      <node id="202934866058978719" at="812,93,813,80" concept="6" />
+      <node id="884473973751230705" at="857,103,858,191" concept="6" />
+      <node id="4571516170015253056" at="860,78,861,86" concept="6" />
+      <node id="8488591998065757177" at="863,78,864,124" concept="6" />
+      <node id="7477562766052507086" at="866,78,867,96" concept="6" />
+      <node id="7477562766052514323" at="869,78,870,98" concept="6" />
+      <node id="4743026300739110565" at="872,78,873,186" concept="6" />
+      <node id="4972001163782669460" at="875,78,876,140" concept="6" />
+      <node id="2151778867069498448" at="878,78,879,206" concept="6" />
+      <node id="2303926226081111384" at="1120,92,1121,76" concept="6" />
+      <node id="1065091787225360806" at="1123,92,1124,120" concept="6" />
+      <node id="6859736767834858757" at="1126,92,1127,59" concept="6" />
+      <node id="4571516170015289013" at="1129,92,1130,76" concept="6" />
+      <node id="6592112598314985662" at="1132,92,1133,155" concept="6" />
+      <node id="8252715012761560442" at="1201,90,1202,59" concept="6" />
+      <node id="4964617264469629189" at="1204,90,1205,80" concept="6" />
+      <node id="4676212293436886238" at="1207,90,1208,76" concept="6" />
+      <node id="4031822141870046784" at="1210,90,1211,76" concept="6" />
+      <node id="7135065582587537216" at="1213,90,1214,76" concept="6" />
+      <node id="2303926226081111360" at="1261,104,1262,145" concept="6" />
+      <node id="2389279258789752833" at="1264,104,1265,145" concept="6" />
+      <node id="9095843441492716614" at="1267,104,1268,273" concept="6" />
+      <node id="8169228734285862847" at="1270,104,1271,135" concept="5" />
+      <node id="7259033139236584408" at="1271,135,1272,48" concept="5" />
+      <node id="7259033139236584968" at="1273,147,1274,141" concept="5" />
+      <node id="4964617264469120493" at="1274,141,1275,72" concept="1" />
+      <node id="4964617264469120570" at="1275,72,1276,103" concept="1" />
+      <node id="7259033139236584984" at="1276,103,1277,57" concept="1" />
+      <node id="7259033139236584415" at="1278,5,1279,18" concept="6" />
+      <node id="3717132724153192093" at="1281,104,1282,48" concept="5" />
+      <node id="4421917191016427109" at="1283,399,1284,373" concept="1" />
+      <node id="3717132724153192164" at="1285,5,1286,18" concept="6" />
+      <node id="6859736767834855057" at="1288,104,1289,48" concept="5" />
+      <node id="4421917191016427143" at="1290,299,1291,378" concept="1" />
+      <node id="4421917191016860795" at="1293,68,1294,134" concept="5" />
+      <node id="4964617264469629058" at="1294,134,1295,69" concept="1" />
+      <node id="4421917191016860847" at="1295,69,1296,22" concept="6" />
+      <node id="202934866058978496" at="1299,104,1300,48" concept="5" />
+      <node id="202934866058978572" at="1301,289,1302,388" concept="1" />
+      <node id="202934866058978665" at="1304,68,1305,141" concept="5" />
+      <node id="4964617264469340442" at="1305,141,1306,112" concept="1" />
+      <node id="202934866058978681" at="1306,112,1307,22" concept="6" />
+      <node id="1500819558096263529" at="1310,104,1311,79" concept="6" />
+      <node id="8315586463637239067" at="1313,104,1314,80" concept="6" />
+      <node id="8944013247832594565" at="1316,104,1317,183" concept="6" />
+      <node id="1362762974883028547" at="1319,105,1320,189" concept="6" />
+      <node id="1362762974887689899" at="1322,105,1323,144" concept="7" />
+      <node id="1362762974888397825" at="1323,144,1324,135" concept="7" />
+      <node id="1362762974889369081" at="1324,135,1325,88" concept="7" />
+      <node id="1362762974883722817" at="1325,88,1326,180" concept="6" />
+      <node id="4743026300739027023" at="1328,105,1329,319" concept="6" />
+      <node id="5471664488998043498" at="1331,105,1332,156" concept="7" />
+      <node id="5471664488997984159" at="1332,156,1333,428" concept="5" />
+      <node id="5471664489000814818" at="1334,123,1335,146" concept="5" />
+      <node id="5471664488998054843" at="1335,146,1336,165" concept="6" />
+      <node id="6654070855064104841" at="1339,105,1340,86" concept="6" />
+      <node id="8488591998065732069" at="1342,105,1343,88" concept="6" />
+      <node id="6673387549253815205" at="1345,105,1346,80" concept="6" />
+      <node id="687702229766679340" at="1552,86,1553,152" concept="5" />
+      <node id="687702229766679350" at="1553,152,1554,144" concept="5" />
+      <node id="687702229766682259" at="1554,144,1555,164" concept="5" />
+      <node id="687702229765088733" at="1555,164,1556,127" concept="1" />
+      <node id="687702229768150161" at="1558,86,1559,152" concept="5" />
+      <node id="687702229768173487" at="1559,152,1560,143" concept="5" />
+      <node id="687702229768150199" at="1561,172,1562,130" concept="1" />
+      <node id="8849917859618854586" at="1565,86,1566,109" concept="7" />
+      <node id="4031822141869971727" at="1566,109,1567,207" concept="1" />
+      <node id="7135065582586672920" at="1567,207,1568,143" concept="1" />
+      <node id="7135065582587550607" at="1570,86,1571,143" concept="1" />
+      <node id="2413798559262850626" at="1576,94,1577,72" concept="6" />
+      <node id="5397230782653147319" at="1579,94,1580,107" concept="6" />
+      <node id="8252715012761560348" at="1627,78,1628,114" concept="6" />
+      <node id="4567115369870223423" at="1630,78,1631,30" concept="6" />
+      <node id="4034100441902363633" at="1633,78,1634,30" concept="6" />
+      <node id="4034100441902352465" at="1636,78,1637,40" concept="7" />
+      <node id="4034100441902352472" at="1637,40,1638,75" concept="5" />
+      <node id="4034100441902352480" at="1639,92,1640,69" concept="1" />
+      <node id="4034100441902352492" at="1642,89,1643,108" concept="1" />
+      <node id="4034100441902352498" at="1643,108,1644,18" concept="6" />
+      <node id="4034100441902352791" at="1645,5,1646,79" concept="6" />
+      <node id="4034100441902341637" at="1648,78,1649,112" concept="5" />
+      <node id="4034100441902412962" at="1650,26,1651,82" concept="1" />
+      <node id="4034100441902412968" at="1651,82,1652,18" concept="6" />
+      <node id="4034100441902412973" at="1653,5,1654,0" concept="8" />
+      <node id="4034100441902330805" at="1654,0,1655,68" concept="5" />
+      <node id="4034100441902330811" at="1655,68,1656,45" concept="1" />
+      <node id="4034100441902332094" at="1656,45,1657,26" concept="6" />
+      <node id="1362762974881508542" at="1659,78,1660,59" concept="5" />
+      <node id="1362762974881508547" at="1661,134,1662,139" concept="1" />
+      <node id="1362762974882004088" at="1663,5,1664,18" concept="6" />
+      <node id="687702229766529098" at="1801,14,1802,55" concept="1" />
+      <node id="687702229768099918" at="1802,55,1803,55" concept="1" />
+      <node id="884473973751152856" at="1806,56,1807,55" concept="1" />
+      <node id="687702229766529098" at="1823,15,1824,58" concept="6" />
+      <node id="687702229768099918" at="1825,15,1826,58" concept="6" />
+      <node id="884473973751152856" at="1833,15,1834,58" concept="6" />
+      <node id="2413798559262849242" at="1842,14,1843,57" concept="1" />
+      <node id="5397230782653143327" at="1843,57,1844,57" concept="1" />
+      <node id="2413798559262849242" at="1872,15,1873,58" concept="6" />
+      <node id="5397230782653143327" at="1874,15,1875,22" concept="6" />
+      <node id="2413798559262849242" at="1883,15,1884,68" concept="6" />
+      <node id="5397230782653143327" at="1885,15,1886,68" concept="6" />
+      <node id="2413798559262849242" at="1896,15,1897,22" concept="6" />
+      <node id="5397230782653143327" at="1898,15,1899,22" concept="6" />
+      <node id="2303926226081111358" at="1934,14,1935,56" concept="1" />
+      <node id="1065091787225169766" at="1935,56,1936,56" concept="1" />
+      <node id="6859736767834858755" at="1936,56,1937,56" concept="1" />
+      <node id="4571516170015288837" at="1937,56,1938,56" concept="1" />
+      <node id="6592112598314985660" at="1938,56,1939,56" concept="1" />
+      <node id="2303926226081111358" at="1975,15,1976,59" concept="6" />
+      <node id="1065091787225169766" at="1977,15,1978,59" concept="6" />
+      <node id="6859736767834858755" at="1979,15,1980,59" concept="6" />
+      <node id="4571516170015288837" at="1981,15,1982,59" concept="6" />
+      <node id="6592112598314985660" at="1983,15,1984,59" concept="6" />
+      <node id="2303926226081111354" at="2032,14,2033,58" concept="1" />
+      <node id="2389279258789752324" at="2033,58,2034,58" concept="1" />
+      <node id="4267986820121149056" at="2034,58,2035,58" concept="1" />
+      <node id="7259033139236497711" at="2035,58,2036,58" concept="1" />
+      <node id="3717132724153192091" at="2036,58,2037,58" concept="1" />
+      <node id="6859736767834858211" at="2037,58,2038,58" concept="1" />
+      <node id="202934866058978115" at="2038,58,2039,57" concept="1" />
+      <node id="1500819558096263527" at="2039,57,2040,58" concept="1" />
+      <node id="8315586463637239065" at="2040,58,2041,58" concept="1" />
+      <node id="4643216374596368654" at="2041,58,2042,58" concept="1" />
+      <node id="1362762974883028545" at="2042,58,2043,58" concept="1" />
+      <node id="1362762974883681814" at="2043,58,2044,58" concept="1" />
+      <node id="4743026300739026814" at="2044,58,2045,58" concept="1" />
+      <node id="5471664488997884105" at="2045,58,2046,58" concept="1" />
+      <node id="6654070855064104839" at="2046,58,2047,58" concept="1" />
+      <node id="8488591998065731739" at="2047,58,2048,58" concept="1" />
+      <node id="6673387549253815203" at="2048,58,2049,58" concept="1" />
+      <node id="2303926226081111354" at="2107,15,2108,87" concept="6" />
+      <node id="2389279258789752324" at="2109,15,2110,87" concept="6" />
+      <node id="4267986820121149056" at="2111,15,2112,87" concept="6" />
+      <node id="7259033139236497711" at="2113,15,2114,87" concept="6" />
+      <node id="3717132724153192091" at="2115,15,2116,87" concept="6" />
+      <node id="6859736767834858211" at="2117,15,2118,87" concept="6" />
+      <node id="202934866058978115" at="2119,15,2120,87" concept="6" />
+      <node id="1500819558096263527" at="2121,15,2122,87" concept="6" />
+      <node id="8315586463637239065" at="2123,15,2124,87" concept="6" />
+      <node id="4643216374596368654" at="2125,15,2126,87" concept="6" />
+      <node id="1362762974883028545" at="2127,16,2128,88" concept="6" />
+      <node id="1362762974883681814" at="2129,16,2130,88" concept="6" />
+      <node id="4743026300739026814" at="2131,16,2132,88" concept="6" />
+      <node id="5471664488997884105" at="2133,16,2134,88" concept="6" />
+      <node id="6654070855064104839" at="2135,16,2136,88" concept="6" />
+      <node id="8488591998065731739" at="2137,16,2138,88" concept="6" />
+      <node id="6673387549253815203" at="2139,16,2140,88" concept="6" />
+      <node id="2389279258789759929" at="2232,14,2233,196" concept="1" />
+      <node id="1500819558096225937" at="2233,196,2234,184" concept="1" />
+      <node id="7259033139236585057" at="2234,184,2235,192" concept="1" />
+      <node id="8206585334428452729" at="2235,192,2236,200" concept="1" />
+      <node id="295480548702159651" at="2236,200,2237,191" concept="1" />
+      <node id="2105528055260559334" at="2237,191,2238,188" concept="1" />
+      <node id="4643216374596368556" at="2238,188,2239,186" concept="1" />
+      <node id="4643216374596368424" at="2239,186,2240,192" concept="1" />
+      <node id="4643216374596368502" at="2240,192,2241,220" concept="1" />
+      <node id="4643216374596368656" at="2241,220,2242,211" concept="1" />
+      <node id="1362762974883028535" at="2242,211,2243,211" concept="1" />
+      <node id="1362762974883585622" at="2243,211,2244,200" concept="1" />
+      <node id="4743026300739052425" at="2244,200,2245,192" concept="1" />
+      <node id="5471664488997883966" at="2245,192,2246,192" concept="1" />
+      <node id="6654070855064472579" at="2246,192,2247,204" concept="1" />
+      <node id="8488591998065733682" at="2247,204,2248,185" concept="1" />
+      <node id="4743026300739110531" at="2248,185,2249,198" concept="1" />
+      <node id="4743026300739110546" at="2249,198,2250,194" concept="1" />
+      <node id="7840993736066063441" at="2250,194,2251,192" concept="1" />
+      <node id="2389279258789759929" at="2405,15,2406,66" concept="6" />
+      <node id="1500819558096225937" at="2407,15,2408,66" concept="6" />
+      <node id="7259033139236585057" at="2409,15,2410,66" concept="6" />
+      <node id="8206585334428452729" at="2411,15,2412,66" concept="6" />
+      <node id="295480548702159651" at="2413,15,2414,66" concept="6" />
+      <node id="2105528055260559334" at="2415,15,2416,66" concept="6" />
+      <node id="4643216374596368556" at="2417,15,2418,66" concept="6" />
+      <node id="4643216374596368424" at="2419,15,2420,66" concept="6" />
+      <node id="4643216374596368502" at="2421,15,2422,66" concept="6" />
+      <node id="4643216374596368656" at="2423,15,2424,66" concept="6" />
+      <node id="1362762974883028535" at="2425,16,2426,67" concept="6" />
+      <node id="1362762974883585622" at="2427,16,2428,67" concept="6" />
+      <node id="4743026300739052425" at="2429,16,2430,67" concept="6" />
+      <node id="5471664488997883966" at="2431,16,2432,67" concept="6" />
+      <node id="6654070855064472579" at="2433,16,2434,67" concept="6" />
+      <node id="8488591998065733682" at="2435,16,2436,67" concept="6" />
+      <node id="4743026300739110531" at="2437,16,2438,67" concept="6" />
+      <node id="4743026300739110546" at="2439,16,2440,67" concept="6" />
+      <node id="7840993736066063441" at="2441,16,2442,67" concept="6" />
+      <node id="4571516170015252590" at="2724,14,2725,57" concept="1" />
+      <node id="8488591998065755518" at="2725,57,2726,57" concept="1" />
+      <node id="7477562766052505826" at="2726,57,2727,57" concept="1" />
+      <node id="7477562766052512687" at="2727,57,2728,57" concept="1" />
+      <node id="4743026300739110562" at="2728,57,2729,57" concept="1" />
+      <node id="4972001163782669450" at="2729,57,2730,57" concept="1" />
+      <node id="7840993736063167249" at="2730,57,2731,57" concept="1" />
+      <node id="4571516170015252590" at="2820,15,2821,61" concept="6" />
+      <node id="8488591998065755518" at="2822,15,2823,61" concept="6" />
+      <node id="7477562766052505826" at="2824,15,2825,61" concept="6" />
+      <node id="7477562766052512687" at="2826,15,2827,61" concept="6" />
+      <node id="4743026300739110562" at="2828,15,2829,61" concept="6" />
+      <node id="4972001163782669450" at="2830,15,2831,61" concept="6" />
+      <node id="7840993736063167249" at="2832,15,2833,61" concept="6" />
+      <node id="1500819558096430319" at="2987,14,2988,58" concept="1" />
+      <node id="3570488090011334546" at="2988,58,2989,58" concept="1" />
+      <node id="1500819558096430319" at="3010,15,3011,58" concept="6" />
+      <node id="3570488090011334546" at="3012,15,3013,58" concept="6" />
+      <node id="7259033139236507286" at="3030,3,3031,62" concept="1" />
+      <node id="202934866058978110" at="3031,62,3032,64" concept="1" />
+      <node id="884473973751152856" at="3046,61,3047,60" concept="1" />
+      <node id="7259033139236507286" at="3064,15,3065,70" concept="6" />
+      <node id="202934866058978110" at="3066,15,3067,70" concept="6" />
+      <node id="884473973751152856" at="3096,16,3097,80" concept="6" />
+      <node id="2409421742521905574" at="3104,3,3105,54" concept="1" />
+      <node id="4567115369870200968" at="3105,54,3106,54" concept="1" />
+      <node id="4034100441902354106" at="3106,54,3107,54" concept="1" />
+      <node id="4034100441902341994" at="3107,54,3108,54" concept="1" />
+      <node id="4034100441902321122" at="3108,54,3109,54" concept="1" />
+      <node id="1362762974881123189" at="3109,54,3110,54" concept="1" />
+      <node id="2409421742521905574" at="3141,15,3142,58" concept="6" />
+      <node id="4567115369870200968" at="3143,15,3144,58" concept="6" />
+      <node id="4034100441902354106" at="3145,15,3146,58" concept="6" />
+      <node id="4034100441902341994" at="3147,15,3148,58" concept="6" />
+      <node id="4034100441902321122" at="3149,15,3150,58" concept="6" />
+      <node id="1362762974881123189" at="3151,15,3152,58" concept="6" />
+      <node id="8252715012761560442" at="3190,54,3191,54" concept="1" />
+      <node id="4964617264469629189" at="3191,54,3192,54" concept="1" />
+      <node id="4676212293436886238" at="3192,54,3193,54" concept="1" />
+      <node id="4031822141870046784" at="3193,54,3194,54" concept="1" />
+      <node id="7135065582587537216" at="3194,54,3195,54" concept="1" />
+      <node id="8252715012761560442" at="3228,15,3229,65" concept="6" />
+      <node id="4964617264469629189" at="3230,15,3231,65" concept="6" />
+      <node id="4676212293436886238" at="3232,15,3233,65" concept="6" />
+      <node id="4031822141870046784" at="3234,15,3235,65" concept="6" />
+      <node id="7135065582587537216" at="3236,15,3237,65" concept="6" />
+      <node id="687702229766712930" at="3274,3,3275,53" concept="1" />
+      <node id="687702229768150159" at="3275,53,3276,53" concept="1" />
+      <node id="4031822141869966867" at="3276,53,3277,54" concept="1" />
+      <node id="7135065582587550160" at="3277,54,3278,54" concept="1" />
+      <node id="687702229766712930" at="3294,15,3295,53" concept="1" />
+      <node id="687702229766712930" at="3295,53,3296,17" concept="6" />
+      <node id="687702229768150159" at="3297,15,3298,53" concept="1" />
+      <node id="687702229768150159" at="3298,53,3299,17" concept="6" />
+      <node id="4031822141869966867" at="3300,15,3301,53" concept="1" />
+      <node id="4031822141869966867" at="3301,53,3302,17" concept="6" />
+      <node id="7135065582587550160" at="3303,15,3304,53" concept="1" />
+      <node id="7135065582587550160" at="3304,53,3305,17" concept="6" />
       <node id="2591537044436204156" at="108,0,111,0" concept="9" trace="rule_Condition_0_0#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
       <node id="2413798559262850299" at="111,0,114,0" concept="9" trace="rule_Condition_0_1#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
       <node id="1500819558096430320" at="114,0,117,0" concept="9" trace="rule_Condition_0_2#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
@@ -1727,73 +1745,73 @@
       <node id="4743026300739110532" at="280,0,283,0" concept="9" trace="propertyMacro_GetValue_0_16#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="4743026300739110547" at="283,0,286,0" concept="9" trace="propertyMacro_GetValue_0_17#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="7840993736066063442" at="286,0,289,0" concept="9" trace="propertyMacro_GetValue_0_18#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="202934866058978111" at="809,0,812,0" concept="9" trace="referenceMacro_GetReferent_0_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="884473973751152857" at="854,0,857,0" concept="9" trace="referenceReduction_GetReferent_0_zu1o_a0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="4571516170015252591" at="857,0,860,0" concept="9" trace="ifMacro_Condition_0_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="8488591998065755520" at="860,0,863,0" concept="9" trace="ifMacro_Condition_0_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7477562766052505828" at="863,0,866,0" concept="9" trace="ifMacro_Condition_0_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7477562766052512689" at="866,0,869,0" concept="9" trace="ifMacro_Condition_0_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="4743026300739110563" at="869,0,872,0" concept="9" trace="ifMacro_Condition_0_4#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="4972001163782669453" at="872,0,875,0" concept="9" trace="ifMacro_Condition_0_5#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7840993736063167252" at="875,0,878,0" concept="9" trace="ifMacro_Condition_0_6#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="2303926226081111358" at="1114,0,1117,0" concept="9" trace="sourceNodeQuery_0_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1065091787225169766" at="1117,0,1120,0" concept="9" trace="sourceNodeQuery_0_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="6859736767834858755" at="1120,0,1123,0" concept="9" trace="sourceNodeQuery_0_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4571516170015288837" at="1123,0,1126,0" concept="9" trace="sourceNodeQuery_0_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="6592112598314985660" at="1126,0,1129,0" concept="9" trace="sourceNodeQuery_0_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="8252715012761560442" at="1195,0,1198,0" concept="9" trace="templateArgumentQuery_0_0#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="4964617264469629189" at="1198,0,1201,0" concept="9" trace="templateArgumentQuery_0_1#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="4676212293436886238" at="1201,0,1204,0" concept="9" trace="templateArgumentQuery_0_2#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="4031822141870046784" at="1204,0,1207,0" concept="9" trace="templateArgumentQuery_0_3#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="7135065582587537216" at="1207,0,1210,0" concept="9" trace="templateArgumentQuery_0_4#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="2303926226081111354" at="1255,0,1258,0" concept="9" trace="sourceNodesQuery_0_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="2389279258789752324" at="1258,0,1261,0" concept="9" trace="sourceNodesQuery_0_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4267986820121149056" at="1261,0,1264,0" concept="9" trace="sourceNodesQuery_0_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4421917191016394832" at="1276,48,1279,5" concept="2" />
-      <node id="4421917191016427141" at="1283,48,1286,5" concept="2" />
-      <node id="202934866058978570" at="1294,48,1297,5" concept="2" />
-      <node id="1500819558096263527" at="1304,0,1307,0" concept="9" trace="sourceNodesQuery_0_7#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="8315586463637239065" at="1307,0,1310,0" concept="9" trace="sourceNodesQuery_0_8#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4643216374596368654" at="1310,0,1313,0" concept="9" trace="sourceNodesQuery_0_9#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="1362762974883028545" at="1313,0,1316,0" concept="9" trace="sourceNodesQuery_0_10#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4743026300739026814" at="1322,0,1325,0" concept="9" trace="sourceNodesQuery_0_12#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="6654070855064104839" at="1333,0,1336,0" concept="9" trace="sourceNodesQuery_0_14#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="8488591998065731739" at="1336,0,1339,0" concept="9" trace="sourceNodesQuery_0_15#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="6673387549253815203" at="1339,0,1342,0" concept="9" trace="sourceNodesQuery_0_16#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="687702229768177235" at="1554,143,1557,5" concept="2" />
-      <node id="7135065582587550160" at="1564,0,1567,0" concept="9" trace="mapSrcMacro_post_0_3#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
-      <node id="2413798559262849243" at="1570,0,1573,0" concept="9" trace="weavingRule_ContextQuery_0_0#(Ljetbrains/mps/generator/template/WeavingMappingRuleContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="5397230782653143329" at="1573,0,1576,0" concept="9" trace="weavingRule_ContextQuery_0_1#(Ljetbrains/mps/generator/template/WeavingMappingRuleContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4267986820121148965" at="1621,0,1624,0" concept="9" trace="varMacro_Value_0_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="4567115369870200969" at="1624,0,1627,0" concept="9" trace="varMacro_Value_0_1#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="4034100441902354111" at="1627,0,1630,0" concept="9" trace="varMacro_Value_0_2#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="4034100441902352478" at="1632,75,1635,5" concept="11" />
-      <node id="1362762974881607490" at="1654,59,1657,5" concept="3" />
+      <node id="202934866058978111" at="812,0,815,0" concept="9" trace="referenceMacro_GetReferent_0_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="884473973751152857" at="857,0,860,0" concept="9" trace="referenceReduction_GetReferent_0_zu1o_a0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="4571516170015252591" at="860,0,863,0" concept="9" trace="ifMacro_Condition_0_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="8488591998065755520" at="863,0,866,0" concept="9" trace="ifMacro_Condition_0_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7477562766052505828" at="866,0,869,0" concept="9" trace="ifMacro_Condition_0_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7477562766052512689" at="869,0,872,0" concept="9" trace="ifMacro_Condition_0_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="4743026300739110563" at="872,0,875,0" concept="9" trace="ifMacro_Condition_0_4#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="4972001163782669453" at="875,0,878,0" concept="9" trace="ifMacro_Condition_0_5#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7840993736063167252" at="878,0,881,0" concept="9" trace="ifMacro_Condition_0_6#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="2303926226081111358" at="1120,0,1123,0" concept="9" trace="sourceNodeQuery_0_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1065091787225169766" at="1123,0,1126,0" concept="9" trace="sourceNodeQuery_0_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="6859736767834858755" at="1126,0,1129,0" concept="9" trace="sourceNodeQuery_0_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="4571516170015288837" at="1129,0,1132,0" concept="9" trace="sourceNodeQuery_0_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="6592112598314985660" at="1132,0,1135,0" concept="9" trace="sourceNodeQuery_0_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="8252715012761560442" at="1201,0,1204,0" concept="9" trace="templateArgumentQuery_0_0#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="4964617264469629189" at="1204,0,1207,0" concept="9" trace="templateArgumentQuery_0_1#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="4676212293436886238" at="1207,0,1210,0" concept="9" trace="templateArgumentQuery_0_2#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="4031822141870046784" at="1210,0,1213,0" concept="9" trace="templateArgumentQuery_0_3#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="7135065582587537216" at="1213,0,1216,0" concept="9" trace="templateArgumentQuery_0_4#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="2303926226081111354" at="1261,0,1264,0" concept="9" trace="sourceNodesQuery_0_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="2389279258789752324" at="1264,0,1267,0" concept="9" trace="sourceNodesQuery_0_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4267986820121149056" at="1267,0,1270,0" concept="9" trace="sourceNodesQuery_0_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4421917191016394832" at="1282,48,1285,5" concept="2" />
+      <node id="4421917191016427141" at="1289,48,1292,5" concept="2" />
+      <node id="202934866058978570" at="1300,48,1303,5" concept="2" />
+      <node id="1500819558096263527" at="1310,0,1313,0" concept="9" trace="sourceNodesQuery_0_7#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8315586463637239065" at="1313,0,1316,0" concept="9" trace="sourceNodesQuery_0_8#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4643216374596368654" at="1316,0,1319,0" concept="9" trace="sourceNodesQuery_0_9#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="1362762974883028545" at="1319,0,1322,0" concept="9" trace="sourceNodesQuery_0_10#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4743026300739026814" at="1328,0,1331,0" concept="9" trace="sourceNodesQuery_0_12#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="6654070855064104839" at="1339,0,1342,0" concept="9" trace="sourceNodesQuery_0_14#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8488591998065731739" at="1342,0,1345,0" concept="9" trace="sourceNodesQuery_0_15#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="6673387549253815203" at="1345,0,1348,0" concept="9" trace="sourceNodesQuery_0_16#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="687702229768177235" at="1560,143,1563,5" concept="2" />
+      <node id="7135065582587550160" at="1570,0,1573,0" concept="9" trace="mapSrcMacro_post_0_3#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
+      <node id="2413798559262849243" at="1576,0,1579,0" concept="9" trace="weavingRule_ContextQuery_0_0#(Ljetbrains/mps/generator/template/WeavingMappingRuleContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="5397230782653143329" at="1579,0,1582,0" concept="9" trace="weavingRule_ContextQuery_0_1#(Ljetbrains/mps/generator/template/WeavingMappingRuleContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="4267986820121148965" at="1627,0,1630,0" concept="9" trace="varMacro_Value_0_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="4567115369870200969" at="1630,0,1633,0" concept="9" trace="varMacro_Value_0_1#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="4034100441902354111" at="1633,0,1636,0" concept="9" trace="varMacro_Value_0_2#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="4034100441902352478" at="1638,75,1641,5" concept="11" />
+      <node id="1362762974881607490" at="1660,59,1663,5" concept="3" />
       <node id="687702229766732113" at="122,144,126,5" concept="3" />
       <node id="687702229768152211" at="134,143,138,5" concept="3" />
-      <node id="7259033139236507287" at="805,0,809,0" concept="9" trace="referenceMacro_GetReferent_0_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="5471664488997993578" at="1327,428,1331,7" concept="6" />
-      <node id="4034100441902352490" at="1635,5,1639,5" concept="3" />
-      <node id="4034100441902412960" at="1643,112,1647,5" concept="3" />
-      <node id="6859736767834855122" at="1286,5,1291,7" concept="6" />
-      <node id="202934866058978657" at="1297,5,1302,7" concept="6" />
-      <node id="4031822141869966867" at="1559,0,1564,0" concept="9" trace="mapSrcMacro_post_0_2#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
+      <node id="7259033139236507287" at="808,0,812,0" concept="9" trace="referenceMacro_GetReferent_0_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="5471664488997993578" at="1333,428,1337,7" concept="6" />
+      <node id="4034100441902352490" at="1641,5,1645,5" concept="3" />
+      <node id="4034100441902412960" at="1649,112,1653,5" concept="3" />
+      <node id="6859736767834855122" at="1292,5,1297,7" concept="6" />
+      <node id="202934866058978657" at="1303,5,1308,7" concept="6" />
+      <node id="4031822141869966867" at="1565,0,1570,0" concept="9" trace="mapSrcMacro_post_0_2#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
       <node id="1362762974883585623" at="243,0,249,0" concept="9" trace="propertyMacro_GetValue_0_11#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7259033139236584509" at="1266,48,1272,5" concept="2" />
-      <node id="1362762974883681814" at="1316,0,1322,0" concept="9" trace="sourceNodesQuery_0_11#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="687702229766712930" at="1546,0,1552,0" concept="9" trace="mapSrcMacro_post_0_0#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
+      <node id="7259033139236584509" at="1272,48,1278,5" concept="2" />
+      <node id="1362762974883681814" at="1322,0,1328,0" concept="9" trace="sourceNodesQuery_0_11#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="687702229766712930" at="1552,0,1558,0" concept="9" trace="mapSrcMacro_post_0_0#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
       <node id="6742269484291367224" at="262,5,269,5" concept="10" />
-      <node id="3717132724153192091" at="1275,0,1282,0" concept="9" trace="sourceNodesQuery_0_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="687702229768150159" at="1552,0,1559,0" concept="9" trace="mapSrcMacro_post_0_1#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
-      <node id="1362762974881123190" at="1653,0,1660,0" concept="9" trace="varMacro_Value_0_5#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <node id="5471664488997884105" at="1325,0,1333,0" concept="9" trace="sourceNodesQuery_0_13#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7259033139236497711" at="1264,0,1275,0" concept="9" trace="sourceNodesQuery_0_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="6859736767834858211" at="1282,0,1293,0" concept="9" trace="sourceNodesQuery_0_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="202934866058978115" at="1293,0,1304,0" concept="9" trace="sourceNodesQuery_0_6#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4034100441902321123" at="1642,0,1653,0" concept="9" trace="varMacro_Value_0_4#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="3717132724153192091" at="1281,0,1288,0" concept="9" trace="sourceNodesQuery_0_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="687702229768150159" at="1558,0,1565,0" concept="9" trace="mapSrcMacro_post_0_1#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
+      <node id="1362762974881123190" at="1659,0,1666,0" concept="9" trace="varMacro_Value_0_5#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="5471664488997884105" at="1331,0,1339,0" concept="9" trace="sourceNodesQuery_0_13#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7259033139236497711" at="1270,0,1281,0" concept="9" trace="sourceNodesQuery_0_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="6859736767834858211" at="1288,0,1299,0" concept="9" trace="sourceNodesQuery_0_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="202934866058978115" at="1299,0,1310,0" concept="9" trace="sourceNodesQuery_0_6#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4034100441902321123" at="1648,0,1659,0" concept="9" trace="varMacro_Value_0_4#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
       <node id="687702229766560996" at="117,0,129,0" concept="9" trace="rule_Condition_0_3#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
       <node id="687702229768151791" at="129,0,141,0" concept="9" trace="rule_Condition_0_4#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
-      <node id="4034100441902341995" at="1630,0,1642,0" concept="9" trace="varMacro_Value_0_3#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="4034100441902341995" at="1636,0,1648,0" concept="9" trace="varMacro_Value_0_3#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
       <node id="4643216374596368425" at="218,0,234,0" concept="9" trace="propertyMacro_GetValue_0_7#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="4743026300739052426" at="249,0,271,0" concept="9" trace="propertyMacro_GetValue_0_12#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <scope id="2591537044436204157" at="108,83,109,135" />
@@ -1825,135 +1843,135 @@
       <scope id="4743026300739110533" at="280,89,281,136" />
       <scope id="4743026300739110548" at="283,89,284,138" />
       <scope id="7840993736066063443" at="286,89,287,264" />
-      <scope id="202934866058978112" at="809,93,810,80" />
-      <scope id="884473973751152858" at="854,103,855,191" />
-      <scope id="4571516170015252592" at="857,78,858,86" />
-      <scope id="8488591998065755522" at="860,78,861,124" />
-      <scope id="7477562766052505830" at="863,78,864,96" />
-      <scope id="7477562766052512691" at="866,78,867,98" />
-      <scope id="4743026300739110564" at="869,78,870,186" />
-      <scope id="4972001163782669454" at="872,78,873,140" />
-      <scope id="7840993736063167253" at="875,78,876,206" />
-      <scope id="2303926226081111359" at="1114,92,1115,76" />
-      <scope id="1065091787225169768" at="1117,92,1118,120" />
-      <scope id="6859736767834858756" at="1120,92,1121,59" />
-      <scope id="4571516170015288838" at="1123,92,1124,76" />
-      <scope id="6592112598314985661" at="1126,92,1127,155" />
-      <scope id="8252715012761560442" at="1195,90,1196,59" />
-      <scope id="4964617264469629189" at="1198,90,1199,80" />
-      <scope id="4676212293436886238" at="1201,90,1202,76" />
-      <scope id="4031822141870046784" at="1204,90,1205,76" />
-      <scope id="7135065582587537216" at="1207,90,1208,76" />
-      <scope id="2303926226081111355" at="1255,104,1256,145" />
-      <scope id="2389279258789752326" at="1258,104,1259,145" />
-      <scope id="4267986820121149057" at="1261,104,1262,273" />
-      <scope id="4421917191016394833" at="1277,399,1278,373" />
-      <scope id="4421917191016427142" at="1284,299,1285,378" />
-      <scope id="202934866058978571" at="1295,289,1296,388" />
-      <scope id="1500819558096263528" at="1304,104,1305,79" />
-      <scope id="8315586463637239066" at="1307,104,1308,80" />
-      <scope id="4643216374596368655" at="1310,104,1311,183" />
-      <scope id="1362762974883028546" at="1313,105,1314,189" />
-      <scope id="4743026300739026815" at="1322,105,1323,319" />
-      <scope id="6654070855064104840" at="1333,105,1334,86" />
-      <scope id="8488591998065731749" at="1336,105,1337,88" />
-      <scope id="6673387549253815204" at="1339,105,1340,80" />
-      <scope id="687702229768177241" at="1555,172,1556,130" />
-      <scope id="7135065582587550161" at="1564,86,1565,143" />
-      <scope id="2413798559262849244" at="1570,94,1571,72" />
-      <scope id="5397230782653143330" at="1573,94,1574,107" />
-      <scope id="4267986820121148966" at="1621,78,1622,114" />
-      <scope id="4567115369870200970" at="1624,78,1625,30" />
-      <scope id="4034100441902354112" at="1627,78,1628,30" />
-      <scope id="4034100441902352479" at="1633,92,1634,69" />
-      <scope id="1362762974881607492" at="1655,134,1656,139" />
-      <scope id="687702229766529098" at="1817,15,1818,58" />
-      <scope id="687702229768099918" at="1819,15,1820,58" />
-      <scope id="884473973751152856" at="1827,15,1828,58" />
-      <scope id="2413798559262849242" at="1866,15,1867,58" />
-      <scope id="5397230782653143327" at="1868,15,1869,22" />
-      <scope id="2413798559262849242" at="1877,15,1878,68" />
-      <scope id="5397230782653143327" at="1879,15,1880,68" />
-      <scope id="2413798559262849242" at="1890,15,1891,22" />
-      <scope id="5397230782653143327" at="1892,15,1893,22" />
-      <scope id="2303926226081111358" at="1969,15,1970,59" />
-      <scope id="1065091787225169766" at="1971,15,1972,59" />
-      <scope id="6859736767834858755" at="1973,15,1974,59" />
-      <scope id="4571516170015288837" at="1975,15,1976,59" />
-      <scope id="6592112598314985660" at="1977,15,1978,59" />
-      <scope id="2303926226081111354" at="2101,15,2102,87" />
-      <scope id="2389279258789752324" at="2103,15,2104,87" />
-      <scope id="4267986820121149056" at="2105,15,2106,87" />
-      <scope id="7259033139236497711" at="2107,15,2108,87" />
-      <scope id="3717132724153192091" at="2109,15,2110,87" />
-      <scope id="6859736767834858211" at="2111,15,2112,87" />
-      <scope id="202934866058978115" at="2113,15,2114,87" />
-      <scope id="1500819558096263527" at="2115,15,2116,87" />
-      <scope id="8315586463637239065" at="2117,15,2118,87" />
-      <scope id="4643216374596368654" at="2119,15,2120,87" />
-      <scope id="1362762974883028545" at="2121,16,2122,88" />
-      <scope id="1362762974883681814" at="2123,16,2124,88" />
-      <scope id="4743026300739026814" at="2125,16,2126,88" />
-      <scope id="5471664488997884105" at="2127,16,2128,88" />
-      <scope id="6654070855064104839" at="2129,16,2130,88" />
-      <scope id="8488591998065731739" at="2131,16,2132,88" />
-      <scope id="6673387549253815203" at="2133,16,2134,88" />
-      <scope id="2389279258789759929" at="2398,15,2399,66" />
-      <scope id="1500819558096225937" at="2400,15,2401,66" />
-      <scope id="7259033139236585057" at="2402,15,2403,66" />
-      <scope id="8206585334428452729" at="2404,15,2405,66" />
-      <scope id="295480548702159651" at="2406,15,2407,66" />
-      <scope id="2105528055260559334" at="2408,15,2409,66" />
-      <scope id="4643216374596368556" at="2410,15,2411,66" />
-      <scope id="4643216374596368424" at="2412,15,2413,66" />
-      <scope id="4643216374596368502" at="2414,15,2415,66" />
-      <scope id="4643216374596368656" at="2416,15,2417,66" />
-      <scope id="1362762974883028535" at="2418,16,2419,67" />
-      <scope id="1362762974883585622" at="2420,16,2421,67" />
-      <scope id="4743026300739052425" at="2422,16,2423,67" />
-      <scope id="5471664488997883966" at="2424,16,2425,67" />
-      <scope id="6654070855064472579" at="2426,16,2427,67" />
-      <scope id="8488591998065733682" at="2428,16,2429,67" />
-      <scope id="4743026300739110531" at="2430,16,2431,67" />
-      <scope id="4743026300739110546" at="2432,16,2433,67" />
-      <scope id="7840993736066063441" at="2434,16,2435,67" />
-      <scope id="4571516170015252590" at="2810,15,2811,61" />
-      <scope id="8488591998065755518" at="2812,15,2813,61" />
-      <scope id="7477562766052505826" at="2814,15,2815,61" />
-      <scope id="7477562766052512687" at="2816,15,2817,61" />
-      <scope id="4743026300739110562" at="2818,15,2819,61" />
-      <scope id="4972001163782669450" at="2820,15,2821,61" />
-      <scope id="7840993736063167249" at="2822,15,2823,61" />
-      <scope id="1500819558096430319" at="2998,15,2999,58" />
-      <scope id="3570488090011334546" at="3000,15,3001,58" />
-      <scope id="7259033139236507286" at="3052,15,3053,70" />
-      <scope id="202934866058978110" at="3054,15,3055,70" />
-      <scope id="884473973751152856" at="3084,16,3085,80" />
-      <scope id="2409421742521905574" at="3129,15,3130,58" />
-      <scope id="4567115369870200968" at="3131,15,3132,58" />
-      <scope id="4034100441902354106" at="3133,15,3134,58" />
-      <scope id="4034100441902341994" at="3135,15,3136,58" />
-      <scope id="4034100441902321122" at="3137,15,3138,58" />
-      <scope id="1362762974881123189" at="3139,15,3140,58" />
-      <scope id="8252715012761560442" at="3216,15,3217,65" />
-      <scope id="4964617264469629189" at="3218,15,3219,65" />
-      <scope id="4676212293436886238" at="3220,15,3221,65" />
-      <scope id="4031822141870046784" at="3222,15,3223,65" />
-      <scope id="7135065582587537216" at="3224,15,3225,65" />
+      <scope id="202934866058978112" at="812,93,813,80" />
+      <scope id="884473973751152858" at="857,103,858,191" />
+      <scope id="4571516170015252592" at="860,78,861,86" />
+      <scope id="8488591998065755522" at="863,78,864,124" />
+      <scope id="7477562766052505830" at="866,78,867,96" />
+      <scope id="7477562766052512691" at="869,78,870,98" />
+      <scope id="4743026300739110564" at="872,78,873,186" />
+      <scope id="4972001163782669454" at="875,78,876,140" />
+      <scope id="7840993736063167253" at="878,78,879,206" />
+      <scope id="2303926226081111359" at="1120,92,1121,76" />
+      <scope id="1065091787225169768" at="1123,92,1124,120" />
+      <scope id="6859736767834858756" at="1126,92,1127,59" />
+      <scope id="4571516170015288838" at="1129,92,1130,76" />
+      <scope id="6592112598314985661" at="1132,92,1133,155" />
+      <scope id="8252715012761560442" at="1201,90,1202,59" />
+      <scope id="4964617264469629189" at="1204,90,1205,80" />
+      <scope id="4676212293436886238" at="1207,90,1208,76" />
+      <scope id="4031822141870046784" at="1210,90,1211,76" />
+      <scope id="7135065582587537216" at="1213,90,1214,76" />
+      <scope id="2303926226081111355" at="1261,104,1262,145" />
+      <scope id="2389279258789752326" at="1264,104,1265,145" />
+      <scope id="4267986820121149057" at="1267,104,1268,273" />
+      <scope id="4421917191016394833" at="1283,399,1284,373" />
+      <scope id="4421917191016427142" at="1290,299,1291,378" />
+      <scope id="202934866058978571" at="1301,289,1302,388" />
+      <scope id="1500819558096263528" at="1310,104,1311,79" />
+      <scope id="8315586463637239066" at="1313,104,1314,80" />
+      <scope id="4643216374596368655" at="1316,104,1317,183" />
+      <scope id="1362762974883028546" at="1319,105,1320,189" />
+      <scope id="4743026300739026815" at="1328,105,1329,319" />
+      <scope id="6654070855064104840" at="1339,105,1340,86" />
+      <scope id="8488591998065731749" at="1342,105,1343,88" />
+      <scope id="6673387549253815204" at="1345,105,1346,80" />
+      <scope id="687702229768177241" at="1561,172,1562,130" />
+      <scope id="7135065582587550161" at="1570,86,1571,143" />
+      <scope id="2413798559262849244" at="1576,94,1577,72" />
+      <scope id="5397230782653143330" at="1579,94,1580,107" />
+      <scope id="4267986820121148966" at="1627,78,1628,114" />
+      <scope id="4567115369870200970" at="1630,78,1631,30" />
+      <scope id="4034100441902354112" at="1633,78,1634,30" />
+      <scope id="4034100441902352479" at="1639,92,1640,69" />
+      <scope id="1362762974881607492" at="1661,134,1662,139" />
+      <scope id="687702229766529098" at="1823,15,1824,58" />
+      <scope id="687702229768099918" at="1825,15,1826,58" />
+      <scope id="884473973751152856" at="1833,15,1834,58" />
+      <scope id="2413798559262849242" at="1872,15,1873,58" />
+      <scope id="5397230782653143327" at="1874,15,1875,22" />
+      <scope id="2413798559262849242" at="1883,15,1884,68" />
+      <scope id="5397230782653143327" at="1885,15,1886,68" />
+      <scope id="2413798559262849242" at="1896,15,1897,22" />
+      <scope id="5397230782653143327" at="1898,15,1899,22" />
+      <scope id="2303926226081111358" at="1975,15,1976,59" />
+      <scope id="1065091787225169766" at="1977,15,1978,59" />
+      <scope id="6859736767834858755" at="1979,15,1980,59" />
+      <scope id="4571516170015288837" at="1981,15,1982,59" />
+      <scope id="6592112598314985660" at="1983,15,1984,59" />
+      <scope id="2303926226081111354" at="2107,15,2108,87" />
+      <scope id="2389279258789752324" at="2109,15,2110,87" />
+      <scope id="4267986820121149056" at="2111,15,2112,87" />
+      <scope id="7259033139236497711" at="2113,15,2114,87" />
+      <scope id="3717132724153192091" at="2115,15,2116,87" />
+      <scope id="6859736767834858211" at="2117,15,2118,87" />
+      <scope id="202934866058978115" at="2119,15,2120,87" />
+      <scope id="1500819558096263527" at="2121,15,2122,87" />
+      <scope id="8315586463637239065" at="2123,15,2124,87" />
+      <scope id="4643216374596368654" at="2125,15,2126,87" />
+      <scope id="1362762974883028545" at="2127,16,2128,88" />
+      <scope id="1362762974883681814" at="2129,16,2130,88" />
+      <scope id="4743026300739026814" at="2131,16,2132,88" />
+      <scope id="5471664488997884105" at="2133,16,2134,88" />
+      <scope id="6654070855064104839" at="2135,16,2136,88" />
+      <scope id="8488591998065731739" at="2137,16,2138,88" />
+      <scope id="6673387549253815203" at="2139,16,2140,88" />
+      <scope id="2389279258789759929" at="2405,15,2406,66" />
+      <scope id="1500819558096225937" at="2407,15,2408,66" />
+      <scope id="7259033139236585057" at="2409,15,2410,66" />
+      <scope id="8206585334428452729" at="2411,15,2412,66" />
+      <scope id="295480548702159651" at="2413,15,2414,66" />
+      <scope id="2105528055260559334" at="2415,15,2416,66" />
+      <scope id="4643216374596368556" at="2417,15,2418,66" />
+      <scope id="4643216374596368424" at="2419,15,2420,66" />
+      <scope id="4643216374596368502" at="2421,15,2422,66" />
+      <scope id="4643216374596368656" at="2423,15,2424,66" />
+      <scope id="1362762974883028535" at="2425,16,2426,67" />
+      <scope id="1362762974883585622" at="2427,16,2428,67" />
+      <scope id="4743026300739052425" at="2429,16,2430,67" />
+      <scope id="5471664488997883966" at="2431,16,2432,67" />
+      <scope id="6654070855064472579" at="2433,16,2434,67" />
+      <scope id="8488591998065733682" at="2435,16,2436,67" />
+      <scope id="4743026300739110531" at="2437,16,2438,67" />
+      <scope id="4743026300739110546" at="2439,16,2440,67" />
+      <scope id="7840993736066063441" at="2441,16,2442,67" />
+      <scope id="4571516170015252590" at="2820,15,2821,61" />
+      <scope id="8488591998065755518" at="2822,15,2823,61" />
+      <scope id="7477562766052505826" at="2824,15,2825,61" />
+      <scope id="7477562766052512687" at="2826,15,2827,61" />
+      <scope id="4743026300739110562" at="2828,15,2829,61" />
+      <scope id="4972001163782669450" at="2830,15,2831,61" />
+      <scope id="7840993736063167249" at="2832,15,2833,61" />
+      <scope id="1500819558096430319" at="3010,15,3011,58" />
+      <scope id="3570488090011334546" at="3012,15,3013,58" />
+      <scope id="7259033139236507286" at="3064,15,3065,70" />
+      <scope id="202934866058978110" at="3066,15,3067,70" />
+      <scope id="884473973751152856" at="3096,16,3097,80" />
+      <scope id="2409421742521905574" at="3141,15,3142,58" />
+      <scope id="4567115369870200968" at="3143,15,3144,58" />
+      <scope id="4034100441902354106" at="3145,15,3146,58" />
+      <scope id="4034100441902341994" at="3147,15,3148,58" />
+      <scope id="4034100441902321122" at="3149,15,3150,58" />
+      <scope id="1362762974881123189" at="3151,15,3152,58" />
+      <scope id="8252715012761560442" at="3228,15,3229,65" />
+      <scope id="4964617264469629189" at="3230,15,3231,65" />
+      <scope id="4676212293436886238" at="3232,15,3233,65" />
+      <scope id="4031822141870046784" at="3234,15,3235,65" />
+      <scope id="7135065582587537216" at="3236,15,3237,65" />
       <scope id="687702229766732115" at="123,164,125,18" />
       <scope id="687702229768152212" at="135,172,137,18" />
-      <scope id="7259033139236507288" at="805,93,807,169">
+      <scope id="7259033139236507288" at="808,93,810,169">
         <var name="targetModule" id="7259033139236507290" />
       </scope>
-      <scope id="5471664488998054842" at="1328,123,1330,165">
+      <scope id="5471664488998054842" at="1334,123,1336,165">
         <var name="rp" id="5471664489000814819" />
       </scope>
-      <scope id="4034100441902352491" at="1636,89,1638,18" />
-      <scope id="4034100441902412961" at="1644,26,1646,18" />
-      <scope id="687702229766712930" at="3282,15,3284,17" />
-      <scope id="687702229768150159" at="3285,15,3287,17" />
-      <scope id="4031822141869966867" at="3288,15,3290,17" />
-      <scope id="7135065582587550160" at="3291,15,3293,17" />
+      <scope id="4034100441902352491" at="1642,89,1644,18" />
+      <scope id="4034100441902412961" at="1650,26,1652,18" />
+      <scope id="687702229766712930" at="3294,15,3296,17" />
+      <scope id="687702229768150159" at="3297,15,3299,17" />
+      <scope id="4031822141869966867" at="3300,15,3302,17" />
+      <scope id="7135065582587550160" at="3303,15,3305,17" />
       <scope id="2591537044436204156" at="108,0,111,0">
         <var name="_context" id="2591537044436204156" />
       </scope>
@@ -2017,131 +2035,131 @@
       <scope id="7840993736066063442" at="286,0,289,0">
         <var name="_context" id="7840993736066063442" />
       </scope>
-      <scope id="202934866058978111" at="809,0,812,0">
+      <scope id="202934866058978111" at="812,0,815,0">
         <var name="_context" id="202934866058978111" />
       </scope>
-      <scope id="884473973751152857" at="854,0,857,0">
+      <scope id="884473973751152857" at="857,0,860,0">
         <var name="_context" id="884473973751152857" />
       </scope>
-      <scope id="4571516170015252591" at="857,0,860,0">
+      <scope id="4571516170015252591" at="860,0,863,0">
         <var name="_context" id="4571516170015252591" />
       </scope>
-      <scope id="8488591998065755520" at="860,0,863,0">
+      <scope id="8488591998065755520" at="863,0,866,0">
         <var name="_context" id="8488591998065755520" />
       </scope>
-      <scope id="7477562766052505828" at="863,0,866,0">
+      <scope id="7477562766052505828" at="866,0,869,0">
         <var name="_context" id="7477562766052505828" />
       </scope>
-      <scope id="7477562766052512689" at="866,0,869,0">
+      <scope id="7477562766052512689" at="869,0,872,0">
         <var name="_context" id="7477562766052512689" />
       </scope>
-      <scope id="4743026300739110563" at="869,0,872,0">
+      <scope id="4743026300739110563" at="872,0,875,0">
         <var name="_context" id="4743026300739110563" />
       </scope>
-      <scope id="4972001163782669453" at="872,0,875,0">
+      <scope id="4972001163782669453" at="875,0,878,0">
         <var name="_context" id="4972001163782669453" />
       </scope>
-      <scope id="7840993736063167252" at="875,0,878,0">
+      <scope id="7840993736063167252" at="878,0,881,0">
         <var name="_context" id="7840993736063167252" />
       </scope>
-      <scope id="2303926226081111358" at="1114,0,1117,0">
+      <scope id="2303926226081111358" at="1120,0,1123,0">
         <var name="_context" id="2303926226081111358" />
       </scope>
-      <scope id="1065091787225169766" at="1117,0,1120,0">
+      <scope id="1065091787225169766" at="1123,0,1126,0">
         <var name="_context" id="1065091787225169766" />
       </scope>
-      <scope id="6859736767834858755" at="1120,0,1123,0">
+      <scope id="6859736767834858755" at="1126,0,1129,0">
         <var name="_context" id="6859736767834858755" />
       </scope>
-      <scope id="4571516170015288837" at="1123,0,1126,0">
+      <scope id="4571516170015288837" at="1129,0,1132,0">
         <var name="_context" id="4571516170015288837" />
       </scope>
-      <scope id="6592112598314985660" at="1126,0,1129,0">
+      <scope id="6592112598314985660" at="1132,0,1135,0">
         <var name="_context" id="6592112598314985660" />
       </scope>
-      <scope id="8252715012761560442" at="1195,0,1198,0">
+      <scope id="8252715012761560442" at="1201,0,1204,0">
         <var name="_context" id="8252715012761560442" />
       </scope>
-      <scope id="4964617264469629189" at="1198,0,1201,0">
+      <scope id="4964617264469629189" at="1204,0,1207,0">
         <var name="_context" id="4964617264469629189" />
       </scope>
-      <scope id="4676212293436886238" at="1201,0,1204,0">
+      <scope id="4676212293436886238" at="1207,0,1210,0">
         <var name="_context" id="4676212293436886238" />
       </scope>
-      <scope id="4031822141870046784" at="1204,0,1207,0">
+      <scope id="4031822141870046784" at="1210,0,1213,0">
         <var name="_context" id="4031822141870046784" />
       </scope>
-      <scope id="7135065582587537216" at="1207,0,1210,0">
+      <scope id="7135065582587537216" at="1213,0,1216,0">
         <var name="_context" id="7135065582587537216" />
       </scope>
-      <scope id="2303926226081111354" at="1255,0,1258,0">
+      <scope id="2303926226081111354" at="1261,0,1264,0">
         <var name="_context" id="2303926226081111354" />
       </scope>
-      <scope id="2389279258789752324" at="1258,0,1261,0">
+      <scope id="2389279258789752324" at="1264,0,1267,0">
         <var name="_context" id="2389279258789752324" />
       </scope>
-      <scope id="4267986820121149056" at="1261,0,1264,0">
+      <scope id="4267986820121149056" at="1267,0,1270,0">
         <var name="_context" id="4267986820121149056" />
       </scope>
-      <scope id="4421917191016394832" at="1276,48,1279,5">
+      <scope id="4421917191016394832" at="1282,48,1285,5">
         <var name="module" id="4421917191016394859" />
       </scope>
-      <scope id="4421917191016427141" at="1283,48,1286,5">
+      <scope id="4421917191016427141" at="1289,48,1292,5">
         <var name="module" id="4421917191016427172" />
       </scope>
-      <scope id="4421917191016860791" at="1287,68,1290,22">
+      <scope id="4421917191016860791" at="1293,68,1296,22">
         <var name="loopnode" id="4421917191016860796" />
       </scope>
-      <scope id="202934866058978570" at="1294,48,1297,5">
+      <scope id="202934866058978570" at="1300,48,1303,5">
         <var name="module" id="202934866058978625" />
       </scope>
-      <scope id="202934866058978664" at="1298,68,1301,22">
+      <scope id="202934866058978664" at="1304,68,1307,22">
         <var name="loopnode" id="202934866058978666" />
       </scope>
-      <scope id="1500819558096263527" at="1304,0,1307,0">
+      <scope id="1500819558096263527" at="1310,0,1313,0">
         <var name="_context" id="1500819558096263527" />
       </scope>
-      <scope id="8315586463637239065" at="1307,0,1310,0">
+      <scope id="8315586463637239065" at="1313,0,1316,0">
         <var name="_context" id="8315586463637239065" />
       </scope>
-      <scope id="4643216374596368654" at="1310,0,1313,0">
+      <scope id="4643216374596368654" at="1316,0,1319,0">
         <var name="_context" id="4643216374596368654" />
       </scope>
-      <scope id="1362762974883028545" at="1313,0,1316,0">
+      <scope id="1362762974883028545" at="1319,0,1322,0">
         <var name="_context" id="1362762974883028545" />
       </scope>
-      <scope id="4743026300739026814" at="1322,0,1325,0">
+      <scope id="4743026300739026814" at="1328,0,1331,0">
         <var name="_context" id="4743026300739026814" />
       </scope>
-      <scope id="6654070855064104839" at="1333,0,1336,0">
+      <scope id="6654070855064104839" at="1339,0,1342,0">
         <var name="_context" id="6654070855064104839" />
       </scope>
-      <scope id="8488591998065731739" at="1336,0,1339,0">
+      <scope id="8488591998065731739" at="1342,0,1345,0">
         <var name="_context" id="8488591998065731739" />
       </scope>
-      <scope id="6673387549253815203" at="1339,0,1342,0">
+      <scope id="6673387549253815203" at="1345,0,1348,0">
         <var name="_context" id="6673387549253815203" />
       </scope>
-      <scope id="687702229768177235" at="1554,143,1557,5">
+      <scope id="687702229768177235" at="1560,143,1563,5">
         <var name="fws" id="687702229768177237" />
       </scope>
-      <scope id="4031822141869966868" at="1559,86,1562,143" />
-      <scope id="7135065582587550160" at="1564,0,1567,0">
+      <scope id="4031822141869966868" at="1565,86,1568,143" />
+      <scope id="7135065582587550160" at="1570,0,1573,0">
         <var name="_context" id="7135065582587550160" />
       </scope>
-      <scope id="2413798559262849243" at="1570,0,1573,0">
+      <scope id="2413798559262849243" at="1576,0,1579,0">
         <var name="_context" id="2413798559262849243" />
       </scope>
-      <scope id="5397230782653143329" at="1573,0,1576,0">
+      <scope id="5397230782653143329" at="1579,0,1582,0">
         <var name="_context" id="5397230782653143329" />
       </scope>
-      <scope id="4267986820121148965" at="1621,0,1624,0">
+      <scope id="4267986820121148965" at="1627,0,1630,0">
         <var name="_context" id="4267986820121148965" />
       </scope>
-      <scope id="4567115369870200969" at="1624,0,1627,0">
+      <scope id="4567115369870200969" at="1630,0,1633,0">
         <var name="_context" id="4567115369870200969" />
       </scope>
-      <scope id="4034100441902354111" at="1627,0,1630,0">
+      <scope id="4034100441902354111" at="1633,0,1636,0">
         <var name="_context" id="4034100441902354111" />
       </scope>
       <scope id="1362762974883585624" at="243,89,247,62">
@@ -2150,69 +2168,69 @@
       <scope id="6742269484291367235" at="265,5,269,5">
         <var name="ex" id="6742269484291367236" />
       </scope>
-      <scope id="7259033139236507287" at="805,0,809,0">
+      <scope id="7259033139236507287" at="808,0,812,0">
         <var name="_context" id="7259033139236507287" />
       </scope>
-      <scope id="7259033139236584510" at="1267,147,1271,57">
+      <scope id="7259033139236584510" at="1273,147,1277,57">
         <var name="loopnode" id="7259033139236584969" />
       </scope>
-      <scope id="1362762974883681815" at="1316,105,1320,180" />
-      <scope id="687702229766712931" at="1546,86,1550,127">
+      <scope id="1362762974883681815" at="1322,105,1326,180" />
+      <scope id="687702229766712931" at="1552,86,1556,127">
         <var name="f" id="687702229766679341" />
         <var name="ff" id="687702229766679351" />
         <var name="md" id="687702229766682260" />
       </scope>
-      <scope id="3717132724153192092" at="1275,104,1280,18">
+      <scope id="3717132724153192092" at="1281,104,1286,18">
         <var name="result" id="3717132724153192094" />
       </scope>
-      <scope id="687702229768150160" at="1552,86,1557,5">
+      <scope id="687702229768150160" at="1558,86,1563,5">
         <var name="f" id="687702229768150162" />
         <var name="ff" id="687702229768173488" />
       </scope>
-      <scope id="4031822141869966867" at="1559,0,1564,0">
+      <scope id="4031822141869966867" at="1565,0,1570,0">
         <var name="_context" id="4031822141869966867" />
       </scope>
-      <scope id="1362762974881123191" at="1653,78,1658,18">
+      <scope id="1362762974881123191" at="1659,78,1664,18">
         <var name="rtDeps" id="1362762974881508543" />
       </scope>
       <scope id="1362762974883585623" at="243,0,249,0">
         <var name="_context" id="1362762974883585623" />
       </scope>
-      <scope id="7259033139236584509" at="1266,48,1272,5">
+      <scope id="7259033139236584509" at="1272,48,1278,5">
         <var name="mod" id="7259033139236584512" />
       </scope>
-      <scope id="1362762974883681814" at="1316,0,1322,0">
+      <scope id="1362762974883681814" at="1322,0,1328,0">
         <var name="_context" id="1362762974883681814" />
       </scope>
-      <scope id="5471664488997884106" at="1325,105,1331,7">
+      <scope id="5471664488997884106" at="1331,105,1337,7">
         <var name="javaLibsOfModule" id="5471664488997984160" />
       </scope>
-      <scope id="687702229766712930" at="1546,0,1552,0">
+      <scope id="687702229766712930" at="1552,0,1558,0">
         <var name="_context" id="687702229766712930" />
       </scope>
-      <scope id="3717132724153192091" at="1275,0,1282,0">
+      <scope id="3717132724153192091" at="1281,0,1288,0">
         <var name="_context" id="3717132724153192091" />
       </scope>
-      <scope id="687702229768150159" at="1552,0,1559,0">
+      <scope id="687702229768150159" at="1558,0,1565,0">
         <var name="_context" id="687702229768150159" />
       </scope>
-      <scope id="1362762974881123190" at="1653,0,1660,0">
+      <scope id="1362762974881123190" at="1659,0,1666,0">
         <var name="_context" id="1362762974881123190" />
       </scope>
-      <scope id="5471664488997884105" at="1325,0,1333,0">
+      <scope id="5471664488997884105" at="1331,0,1339,0">
         <var name="_context" id="5471664488997884105" />
       </scope>
-      <scope id="7259033139236497712" at="1264,104,1273,18">
+      <scope id="7259033139236497712" at="1270,104,1279,18">
         <var name="requiredAndReexp" id="8169228734285862848" />
         <var name="result" id="7259033139236584409" />
       </scope>
-      <scope id="6859736767834858212" at="1282,104,1291,7">
+      <scope id="6859736767834858212" at="1288,104,1297,7">
         <var name="result" id="6859736767834855058" />
       </scope>
-      <scope id="202934866058978116" at="1293,104,1302,7">
+      <scope id="202934866058978116" at="1299,104,1308,7">
         <var name="result" id="202934866058978497" />
       </scope>
-      <scope id="4034100441902321124" at="1642,78,1651,26">
+      <scope id="4034100441902321124" at="1648,78,1657,26">
         <var name="localArtifacts" id="4034100441902330806" />
         <var name="project" id="4034100441902341638" />
       </scope>
@@ -2224,19 +2242,19 @@
         <var name="f" id="687702229768152144" />
         <var name="ff" id="687702229768152154" />
       </scope>
-      <scope id="4034100441902341996" at="1630,78,1640,79">
+      <scope id="4034100441902341996" at="1636,78,1646,79">
         <var name="firstAncestorJar" id="4034100441902352473" />
       </scope>
-      <scope id="7259033139236497711" at="1264,0,1275,0">
+      <scope id="7259033139236497711" at="1270,0,1281,0">
         <var name="_context" id="7259033139236497711" />
       </scope>
-      <scope id="6859736767834858211" at="1282,0,1293,0">
+      <scope id="6859736767834858211" at="1288,0,1299,0">
         <var name="_context" id="6859736767834858211" />
       </scope>
-      <scope id="202934866058978115" at="1293,0,1304,0">
+      <scope id="202934866058978115" at="1299,0,1310,0">
         <var name="_context" id="202934866058978115" />
       </scope>
-      <scope id="4034100441902321123" at="1642,0,1653,0">
+      <scope id="4034100441902321123" at="1648,0,1659,0">
         <var name="_context" id="4034100441902321123" />
       </scope>
       <scope id="687702229766560996" at="117,0,129,0">
@@ -2245,7 +2263,7 @@
       <scope id="687702229768151791" at="129,0,141,0">
         <var name="_context" id="687702229768151791" />
       </scope>
-      <scope id="4034100441902341995" at="1630,0,1642,0">
+      <scope id="4034100441902341995" at="1636,0,1648,0">
         <var name="_context" id="4034100441902341995" />
       </scope>
       <scope id="4643216374596368426" at="218,88,232,23" />
@@ -2265,167 +2283,167 @@
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/3189788309732145594">
     <file name="QueriesGenerated.java">
-      <node id="3189788309732166476" at="1577,103,1578,0" concept="8" />
-      <node id="7141285424006931643" at="1580,42,1581,35" concept="5" />
-      <node id="7141285424006937863" at="1582,62,1583,74" concept="5" />
-      <node id="7141285424006951091" at="1584,89,1585,74" concept="1" />
-      <node id="7141285424006691476" at="1588,42,1589,63" concept="1" />
-      <node id="6603167887402265933" at="1590,51,1591,65" concept="1" />
-      <node id="6603167887402265464" at="1592,18,1593,69" concept="1" />
-      <node id="7141285424006687615" at="1596,9,1597,59" concept="1" />
-      <node id="9200313594508492433" at="1597,59,1598,0" concept="8" />
-      <node id="9200313594508498782" at="1598,0,1599,112" concept="7" />
-      <node id="7141285424006921170" at="1599,112,1600,121" concept="7" />
-      <node id="7141285424006873339" at="1600,121,1601,0" concept="8" />
-      <node id="7862711839425305741" at="1602,277,1603,111" concept="5" />
-      <node id="9200313594508590598" at="1603,111,1604,78" concept="1" />
-      <node id="9200313594508724859" at="1604,78,1605,64" concept="1" />
-      <node id="8622927341145011717" at="1605,64,1606,122" concept="5" />
-      <node id="8622927341144987116" at="1606,122,1607,81" concept="1" />
-      <node id="7862711839425306465" at="1608,111,1609,122" concept="1" />
-      <node id="8622927341145049617" at="1610,16,1611,138" concept="7" />
-      <node id="8622927341144971785" at="1611,138,1612,128" concept="1" />
-      <node id="8849917859618503337" at="1615,5,1616,0" concept="8" />
-      <node id="5745174517193856665" at="1617,94,1618,85" concept="1" />
-      <node id="3189788309732145594" at="1901,14,1902,57" concept="1" />
-      <node id="3189788309732145594" at="1918,15,1919,58" concept="1" />
-      <node id="3189788309732145594" at="1919,58,1920,17" concept="6" />
-      <node id="6603167887402268086" at="1592,16,1594,11" concept="0" />
-      <node id="7141285424006938333" at="1583,74,1586,13" concept="3" />
-      <node id="8622927341145048831" at="1610,14,1613,9" concept="0" />
-      <node id="841011766566205062" at="1616,0,1619,5" concept="2" />
-      <node id="7141285424006931983" at="1581,35,1587,11" concept="3" />
-      <node id="8622927341145012738" at="1607,81,1613,9" concept="3" />
-      <node id="6603167887402255823" at="1587,11,1594,11" concept="3" />
-      <node id="9200313594508585292" at="1601,0,1614,7" concept="2" />
-      <node id="7141285424006686470" at="1580,0,1596,0" concept="4" trace="handle#(Ljetbrains/mps/messages/IMessage;)V" />
-      <node id="7141285424006681808" at="1578,0,1596,9" concept="5" />
-      <node id="3189788309732145597" at="1576,85,1615,5" concept="2" />
-      <node id="3189788309732145595" at="1576,0,1621,0" concept="9" trace="mappingScript_CodeBlock_1#(Ljetbrains/mps/generator/template/MappingScriptContext;)V" />
-      <scope id="7141285424006938335" at="1584,89,1585,74" />
-      <scope id="6603167887402255825" at="1588,42,1589,63" />
-      <scope id="6603167887402263733" at="1590,51,1591,65" />
-      <scope id="6603167887402268087" at="1592,18,1593,69" />
-      <scope id="8622927341145012740" at="1608,111,1609,122" />
-      <scope id="841011766566205065" at="1617,94,1618,85" />
-      <scope id="8622927341145048832" at="1610,16,1612,128" />
-      <scope id="3189788309732145594" at="1918,15,1920,17" />
-      <scope id="841011766566205062" at="1616,0,1619,5">
+      <node id="3189788309732166476" at="1583,103,1584,0" concept="8" />
+      <node id="7141285424006931643" at="1586,42,1587,35" concept="5" />
+      <node id="7141285424006937863" at="1588,62,1589,74" concept="5" />
+      <node id="7141285424006951091" at="1590,89,1591,74" concept="1" />
+      <node id="7141285424006691476" at="1594,42,1595,63" concept="1" />
+      <node id="6603167887402265933" at="1596,51,1597,65" concept="1" />
+      <node id="6603167887402265464" at="1598,18,1599,69" concept="1" />
+      <node id="7141285424006687615" at="1602,9,1603,59" concept="1" />
+      <node id="9200313594508492433" at="1603,59,1604,0" concept="8" />
+      <node id="9200313594508498782" at="1604,0,1605,112" concept="7" />
+      <node id="7141285424006921170" at="1605,112,1606,121" concept="7" />
+      <node id="7141285424006873339" at="1606,121,1607,0" concept="8" />
+      <node id="7862711839425305741" at="1608,277,1609,111" concept="5" />
+      <node id="9200313594508590598" at="1609,111,1610,78" concept="1" />
+      <node id="9200313594508724859" at="1610,78,1611,64" concept="1" />
+      <node id="8622927341145011717" at="1611,64,1612,122" concept="5" />
+      <node id="8622927341144987116" at="1612,122,1613,81" concept="1" />
+      <node id="7862711839425306465" at="1614,111,1615,122" concept="1" />
+      <node id="8622927341145049617" at="1616,16,1617,138" concept="7" />
+      <node id="8622927341144971785" at="1617,138,1618,128" concept="1" />
+      <node id="8849917859618503337" at="1621,5,1622,0" concept="8" />
+      <node id="5745174517193856665" at="1623,94,1624,85" concept="1" />
+      <node id="3189788309732145594" at="1907,14,1908,57" concept="1" />
+      <node id="3189788309732145594" at="1924,15,1925,58" concept="1" />
+      <node id="3189788309732145594" at="1925,58,1926,17" concept="6" />
+      <node id="6603167887402268086" at="1598,16,1600,11" concept="0" />
+      <node id="7141285424006938333" at="1589,74,1592,13" concept="3" />
+      <node id="8622927341145048831" at="1616,14,1619,9" concept="0" />
+      <node id="841011766566205062" at="1622,0,1625,5" concept="2" />
+      <node id="7141285424006931983" at="1587,35,1593,11" concept="3" />
+      <node id="8622927341145012738" at="1613,81,1619,9" concept="3" />
+      <node id="6603167887402255823" at="1593,11,1600,11" concept="3" />
+      <node id="9200313594508585292" at="1607,0,1620,7" concept="2" />
+      <node id="7141285424006686470" at="1586,0,1602,0" concept="4" trace="handle#(Ljetbrains/mps/messages/IMessage;)V" />
+      <node id="7141285424006681808" at="1584,0,1602,9" concept="5" />
+      <node id="3189788309732145597" at="1582,85,1621,5" concept="2" />
+      <node id="3189788309732145595" at="1582,0,1627,0" concept="9" trace="mappingScript_CodeBlock_1#(Ljetbrains/mps/generator/template/MappingScriptContext;)V" />
+      <scope id="7141285424006938335" at="1590,89,1591,74" />
+      <scope id="6603167887402255825" at="1594,42,1595,63" />
+      <scope id="6603167887402263733" at="1596,51,1597,65" />
+      <scope id="6603167887402268087" at="1598,18,1599,69" />
+      <scope id="8622927341145012740" at="1614,111,1615,122" />
+      <scope id="841011766566205065" at="1623,94,1624,85" />
+      <scope id="8622927341145048832" at="1616,16,1618,128" />
+      <scope id="3189788309732145594" at="1924,15,1926,17" />
+      <scope id="841011766566205062" at="1622,0,1625,5">
         <var name="root" id="841011766566205063" />
       </scope>
-      <scope id="7141285424006931985" at="1582,62,1586,13">
+      <scope id="7141285424006931985" at="1588,62,1592,13">
         <var name="nodePtr" id="7141285424006937864" />
       </scope>
-      <scope id="9200313594508585295" at="1602,277,1613,9">
+      <scope id="9200313594508585295" at="1608,277,1619,9">
         <var name="generatorRef" id="8622927341145011718" />
         <var name="lang" id="7862711839425305742" />
       </scope>
-      <scope id="9200313594508585292" at="1601,0,1614,7">
+      <scope id="9200313594508585292" at="1607,0,1620,7">
         <var name="generator" id="9200313594508585298" />
       </scope>
-      <scope id="7141285424006686477" at="1580,42,1594,11">
+      <scope id="7141285424006686477" at="1586,42,1600,11">
         <var name="location" id="7141285424006931646" />
       </scope>
-      <scope id="7141285424006686470" at="1580,0,1596,0">
+      <scope id="7141285424006686470" at="1586,0,1602,0">
         <var name="msg" id="7141285424006686474" />
       </scope>
-      <scope id="3189788309732145600" at="1577,103,1614,7">
+      <scope id="3189788309732145600" at="1583,103,1620,7">
         <var name="ml" id="7141285424006681809" />
       </scope>
-      <scope id="3189788309732145597" at="1576,85,1615,5">
+      <scope id="3189788309732145597" at="1582,85,1621,5">
         <var name="project" id="3189788309732145598" />
       </scope>
-      <scope id="3189788309732145596" at="1576,85,1619,5" />
-      <scope id="3189788309732145595" at="1576,0,1621,0">
+      <scope id="3189788309732145596" at="1582,85,1625,5" />
+      <scope id="3189788309732145595" at="1582,0,1627,0">
         <var name="_context" id="3189788309732145595" />
       </scope>
-      <unit id="7141285424006686468" at="1579,64,1596,7" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$3" />
+      <unit id="7141285424006686468" at="1585,64,1602,7" name="jetbrains.mps.build.mps.generator.template.main.QueriesGenerated$3" />
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/3389822811994116526">
     <file name="QueriesGenerated.java">
-      <node id="3389822811994148437" at="674,89,675,123" concept="6" />
-      <node id="3570488090022006368" at="677,89,678,123" concept="6" />
-      <node id="3570488090022006416" at="680,89,681,123" concept="6" />
-      <node id="3389822811994148418" at="830,94,831,76" concept="6" />
-      <node id="3570488090022006411" at="833,94,834,30" concept="6" />
-      <node id="5829439739854703196" at="1509,105,1510,119" concept="7" />
-      <node id="5829439739854712616" at="1510,119,1511,144" concept="7" />
-      <node id="5829439739854692113" at="1511,144,1512,449" concept="5" />
-      <node id="3570488090022006387" at="1512,449,1513,198" concept="6" />
-      <node id="3570488090022006376" at="2076,58,2077,58" concept="1" />
-      <node id="3570488090022006376" at="2201,16,2202,88" concept="6" />
-      <node id="3389822811994148423" at="2341,193,2342,200" concept="1" />
-      <node id="3570488090022006365" at="2342,200,2343,193" concept="1" />
-      <node id="3570488090022006413" at="2343,193,2344,200" concept="1" />
-      <node id="3389822811994148423" at="2628,17,2629,67" concept="6" />
-      <node id="3570488090022006365" at="2630,17,2631,67" concept="6" />
-      <node id="3570488090022006413" at="2632,17,2633,67" concept="6" />
-      <node id="3389822811994148415" at="3026,60,3027,61" concept="1" />
-      <node id="3570488090022006408" at="3027,61,3028,61" concept="1" />
-      <node id="3389822811994148415" at="3068,15,3069,71" concept="6" />
-      <node id="3570488090022006408" at="3070,15,3071,71" concept="6" />
-      <node id="3389822811994148424" at="674,0,677,0" concept="9" trace="propertyMacro_GetValue_11_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="3570488090022006366" at="677,0,680,0" concept="9" trace="propertyMacro_GetValue_11_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="3570488090022006414" at="680,0,683,0" concept="9" trace="propertyMacro_GetValue_11_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="3389822811994148416" at="830,0,833,0" concept="9" trace="referenceMacro_GetReferent_11_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="3570488090022006409" at="833,0,836,0" concept="9" trace="referenceMacro_GetReferent_11_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="3570488090022006376" at="1509,0,1515,0" concept="9" trace="sourceNodesQuery_11_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <scope id="3389822811994148425" at="674,89,675,123" />
-      <scope id="3570488090022006367" at="677,89,678,123" />
-      <scope id="3570488090022006415" at="680,89,681,123" />
-      <scope id="3389822811994148417" at="830,94,831,76" />
-      <scope id="3570488090022006410" at="833,94,834,30" />
-      <scope id="3570488090022006376" at="2201,16,2202,88" />
-      <scope id="3389822811994148423" at="2628,17,2629,67" />
-      <scope id="3570488090022006365" at="2630,17,2631,67" />
-      <scope id="3570488090022006413" at="2632,17,2633,67" />
-      <scope id="3389822811994148415" at="3068,15,3069,71" />
-      <scope id="3570488090022006408" at="3070,15,3071,71" />
-      <scope id="3389822811994148424" at="674,0,677,0">
+      <node id="3389822811994148437" at="677,89,678,123" concept="6" />
+      <node id="3570488090022006368" at="680,89,681,123" concept="6" />
+      <node id="3570488090022006416" at="683,89,684,123" concept="6" />
+      <node id="3389822811994148418" at="833,94,834,76" concept="6" />
+      <node id="3570488090022006411" at="836,94,837,30" concept="6" />
+      <node id="5829439739854703196" at="1515,105,1516,119" concept="7" />
+      <node id="5829439739854712616" at="1516,119,1517,144" concept="7" />
+      <node id="5829439739854692113" at="1517,144,1518,449" concept="5" />
+      <node id="3570488090022006387" at="1518,449,1519,198" concept="6" />
+      <node id="3570488090022006376" at="2082,58,2083,58" concept="1" />
+      <node id="3570488090022006376" at="2207,16,2208,88" concept="6" />
+      <node id="3389822811994148423" at="2348,193,2349,200" concept="1" />
+      <node id="3570488090022006365" at="2349,200,2350,193" concept="1" />
+      <node id="3570488090022006413" at="2350,193,2351,200" concept="1" />
+      <node id="3389822811994148423" at="2637,17,2638,67" concept="6" />
+      <node id="3570488090022006365" at="2639,17,2640,67" concept="6" />
+      <node id="3570488090022006413" at="2641,17,2642,67" concept="6" />
+      <node id="3389822811994148415" at="3038,60,3039,61" concept="1" />
+      <node id="3570488090022006408" at="3039,61,3040,61" concept="1" />
+      <node id="3389822811994148415" at="3080,15,3081,71" concept="6" />
+      <node id="3570488090022006408" at="3082,15,3083,71" concept="6" />
+      <node id="3389822811994148424" at="677,0,680,0" concept="9" trace="propertyMacro_GetValue_11_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="3570488090022006366" at="680,0,683,0" concept="9" trace="propertyMacro_GetValue_11_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="3570488090022006414" at="683,0,686,0" concept="9" trace="propertyMacro_GetValue_11_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="3389822811994148416" at="833,0,836,0" concept="9" trace="referenceMacro_GetReferent_11_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="3570488090022006409" at="836,0,839,0" concept="9" trace="referenceMacro_GetReferent_11_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="3570488090022006376" at="1515,0,1521,0" concept="9" trace="sourceNodesQuery_11_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <scope id="3389822811994148425" at="677,89,678,123" />
+      <scope id="3570488090022006367" at="680,89,681,123" />
+      <scope id="3570488090022006415" at="683,89,684,123" />
+      <scope id="3389822811994148417" at="833,94,834,76" />
+      <scope id="3570488090022006410" at="836,94,837,30" />
+      <scope id="3570488090022006376" at="2207,16,2208,88" />
+      <scope id="3389822811994148423" at="2637,17,2638,67" />
+      <scope id="3570488090022006365" at="2639,17,2640,67" />
+      <scope id="3570488090022006413" at="2641,17,2642,67" />
+      <scope id="3389822811994148415" at="3080,15,3081,71" />
+      <scope id="3570488090022006408" at="3082,15,3083,71" />
+      <scope id="3389822811994148424" at="677,0,680,0">
         <var name="_context" id="3389822811994148424" />
       </scope>
-      <scope id="3570488090022006366" at="677,0,680,0">
+      <scope id="3570488090022006366" at="680,0,683,0">
         <var name="_context" id="3570488090022006366" />
       </scope>
-      <scope id="3570488090022006414" at="680,0,683,0">
+      <scope id="3570488090022006414" at="683,0,686,0">
         <var name="_context" id="3570488090022006414" />
       </scope>
-      <scope id="3389822811994148416" at="830,0,833,0">
+      <scope id="3389822811994148416" at="833,0,836,0">
         <var name="_context" id="3389822811994148416" />
       </scope>
-      <scope id="3570488090022006409" at="833,0,836,0">
+      <scope id="3570488090022006409" at="836,0,839,0">
         <var name="_context" id="3570488090022006409" />
       </scope>
-      <scope id="3570488090022006377" at="1509,105,1513,198">
+      <scope id="3570488090022006377" at="1515,105,1519,198">
         <var name="managedGenerators" id="5829439739854692114" />
       </scope>
-      <scope id="3570488090022006376" at="1509,0,1515,0">
+      <scope id="3570488090022006376" at="1515,0,1521,0">
         <var name="_context" id="3570488090022006376" />
       </scope>
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/3535927011723045853">
     <file name="QueriesGenerated.java">
-      <node id="8849917859617341016" at="851,94,852,97" concept="6" />
-      <node id="3535927011723077407" at="1536,105,1537,107" concept="5" />
-      <node id="3535927011723115580" at="1537,107,1538,332" concept="6" />
-      <node id="3535927011723074303" at="2082,58,2083,58" concept="1" />
-      <node id="3535927011723074303" at="2213,16,2214,88" concept="6" />
-      <node id="3535927011723235443" at="3033,62,3034,61" concept="1" />
-      <node id="3535927011723235443" at="3082,16,3083,71" concept="6" />
-      <node id="3535927011723235444" at="851,0,854,0" concept="9" trace="referenceMacro_GetReferent_20_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="3535927011723074303" at="1536,0,1540,0" concept="9" trace="sourceNodesQuery_20_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <scope id="3535927011723235445" at="851,94,852,97" />
-      <scope id="3535927011723074303" at="2213,16,2214,88" />
-      <scope id="3535927011723235443" at="3082,16,3083,71" />
-      <scope id="3535927011723074304" at="1536,105,1538,332">
+      <node id="8849917859617341016" at="854,94,855,97" concept="6" />
+      <node id="3535927011723077407" at="1542,105,1543,107" concept="5" />
+      <node id="3535927011723115580" at="1543,107,1544,332" concept="6" />
+      <node id="3535927011723074303" at="2088,58,2089,58" concept="1" />
+      <node id="3535927011723074303" at="2219,16,2220,88" concept="6" />
+      <node id="3535927011723235443" at="3045,62,3046,61" concept="1" />
+      <node id="3535927011723235443" at="3094,16,3095,71" concept="6" />
+      <node id="3535927011723235444" at="854,0,857,0" concept="9" trace="referenceMacro_GetReferent_20_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="3535927011723074303" at="1542,0,1546,0" concept="9" trace="sourceNodesQuery_20_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <scope id="3535927011723235445" at="854,94,855,97" />
+      <scope id="3535927011723074303" at="2219,16,2220,88" />
+      <scope id="3535927011723235443" at="3094,16,3095,71" />
+      <scope id="3535927011723074304" at="1542,105,1544,332">
         <var name="bp" id="3535927011723077408" />
       </scope>
-      <scope id="3535927011723235444" at="851,0,854,0">
+      <scope id="3535927011723235444" at="854,0,857,0">
         <var name="_context" id="3535927011723235444" />
       </scope>
-      <scope id="3535927011723074303" at="1536,0,1540,0">
+      <scope id="3535927011723074303" at="1542,0,1546,0">
         <var name="_context" id="3535927011723074303" />
       </scope>
     </file>
@@ -2449,67 +2467,67 @@
       <node id="4912951749633520092" at="187,105,188,151" concept="6" />
       <node id="4912951749633548241" at="190,84,191,36" concept="7" />
       <node id="4912951749633547164" at="191,36,192,151" concept="6" />
-      <node id="4912951749633544942" at="683,89,684,54" concept="6" />
-      <node id="8849917859618890559" at="686,89,687,218" concept="6" />
-      <node id="4912951749633464473" at="689,89,690,54" concept="6" />
-      <node id="4912951749633461671" at="692,89,693,54" concept="6" />
-      <node id="4912951749633431394" at="836,94,837,30" concept="6" />
-      <node id="4912951749633455197" at="839,94,840,30" concept="6" />
-      <node id="4912951749633439328" at="2344,200,2345,191" concept="1" />
-      <node id="4912951749633463342" at="2345,191,2346,187" concept="1" />
-      <node id="4912951749633463930" at="2346,187,2347,191" concept="1" />
-      <node id="4912951749633460798" at="2347,191,2348,191" concept="1" />
-      <node id="4912951749633439328" at="2634,17,2635,67" concept="6" />
-      <node id="4912951749633463342" at="2636,17,2637,67" concept="6" />
-      <node id="4912951749633463930" at="2638,17,2639,67" concept="6" />
-      <node id="4912951749633460798" at="2640,17,2641,67" concept="6" />
-      <node id="4912951749633403033" at="2979,58,2980,58" concept="1" />
-      <node id="4912951749633403526" at="2980,58,2981,58" concept="1" />
-      <node id="4912951749633403033" at="3006,15,3007,59" concept="6" />
-      <node id="4912951749633403526" at="3008,15,3009,59" concept="6" />
-      <node id="4912951749633427588" at="3028,61,3029,61" concept="1" />
-      <node id="4912951749633454964" at="3029,61,3030,59" concept="1" />
-      <node id="4912951749633427588" at="3072,16,3073,71" concept="6" />
-      <node id="4912951749633454964" at="3074,16,3075,71" concept="6" />
-      <node id="4912951749633439329" at="683,0,686,0" concept="9" trace="propertyMacro_GetValue_12_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="4912951749633463343" at="686,0,689,0" concept="9" trace="propertyMacro_GetValue_12_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="4912951749633463931" at="689,0,692,0" concept="9" trace="propertyMacro_GetValue_12_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="4912951749633460799" at="692,0,695,0" concept="9" trace="propertyMacro_GetValue_12_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="4912951749633427589" at="836,0,839,0" concept="9" trace="referenceMacro_GetReferent_12_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="4912951749633454965" at="839,0,842,0" concept="9" trace="referenceMacro_GetReferent_12_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="4912951749633544942" at="686,89,687,54" concept="6" />
+      <node id="8849917859618890559" at="689,89,690,218" concept="6" />
+      <node id="4912951749633464473" at="692,89,693,54" concept="6" />
+      <node id="4912951749633461671" at="695,89,696,54" concept="6" />
+      <node id="4912951749633431394" at="839,94,840,30" concept="6" />
+      <node id="4912951749633455197" at="842,94,843,30" concept="6" />
+      <node id="4912951749633439328" at="2351,200,2352,191" concept="1" />
+      <node id="4912951749633463342" at="2352,191,2353,187" concept="1" />
+      <node id="4912951749633463930" at="2353,187,2354,191" concept="1" />
+      <node id="4912951749633460798" at="2354,191,2355,191" concept="1" />
+      <node id="4912951749633439328" at="2643,17,2644,67" concept="6" />
+      <node id="4912951749633463342" at="2645,17,2646,67" concept="6" />
+      <node id="4912951749633463930" at="2647,17,2648,67" concept="6" />
+      <node id="4912951749633460798" at="2649,17,2650,67" concept="6" />
+      <node id="4912951749633403033" at="2991,58,2992,58" concept="1" />
+      <node id="4912951749633403526" at="2992,58,2993,58" concept="1" />
+      <node id="4912951749633403033" at="3018,15,3019,59" concept="6" />
+      <node id="4912951749633403526" at="3020,15,3021,59" concept="6" />
+      <node id="4912951749633427588" at="3040,61,3041,61" concept="1" />
+      <node id="4912951749633454964" at="3041,61,3042,59" concept="1" />
+      <node id="4912951749633427588" at="3084,16,3085,71" concept="6" />
+      <node id="4912951749633454964" at="3086,16,3087,71" concept="6" />
+      <node id="4912951749633439329" at="686,0,689,0" concept="9" trace="propertyMacro_GetValue_12_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="4912951749633463343" at="689,0,692,0" concept="9" trace="propertyMacro_GetValue_12_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="4912951749633463931" at="692,0,695,0" concept="9" trace="propertyMacro_GetValue_12_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="4912951749633460799" at="695,0,698,0" concept="9" trace="propertyMacro_GetValue_12_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="4912951749633427589" at="839,0,842,0" concept="9" trace="referenceMacro_GetReferent_12_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="4912951749633454965" at="842,0,845,0" concept="9" trace="referenceMacro_GetReferent_12_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
       <node id="4912951749633403527" at="190,0,194,0" concept="9" trace="rule_Condition_12_1#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
       <node id="4912951749633403034" at="173,0,190,0" concept="9" trace="rule_Condition_12_0#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
-      <scope id="4912951749633439330" at="683,89,684,54" />
-      <scope id="4912951749633463344" at="686,89,687,218" />
-      <scope id="4912951749633463932" at="689,89,690,54" />
-      <scope id="4912951749633460800" at="692,89,693,54" />
-      <scope id="4912951749633427590" at="836,94,837,30" />
-      <scope id="4912951749633454966" at="839,94,840,30" />
-      <scope id="4912951749633439328" at="2634,17,2635,67" />
-      <scope id="4912951749633463342" at="2636,17,2637,67" />
-      <scope id="4912951749633463930" at="2638,17,2639,67" />
-      <scope id="4912951749633460798" at="2640,17,2641,67" />
-      <scope id="4912951749633403033" at="3006,15,3007,59" />
-      <scope id="4912951749633403526" at="3008,15,3009,59" />
-      <scope id="4912951749633427588" at="3072,16,3073,71" />
-      <scope id="4912951749633454964" at="3074,16,3075,71" />
+      <scope id="4912951749633439330" at="686,89,687,54" />
+      <scope id="4912951749633463344" at="689,89,690,218" />
+      <scope id="4912951749633463932" at="692,89,693,54" />
+      <scope id="4912951749633460800" at="695,89,696,54" />
+      <scope id="4912951749633427590" at="839,94,840,30" />
+      <scope id="4912951749633454966" at="842,94,843,30" />
+      <scope id="4912951749633439328" at="2643,17,2644,67" />
+      <scope id="4912951749633463342" at="2645,17,2646,67" />
+      <scope id="4912951749633463930" at="2647,17,2648,67" />
+      <scope id="4912951749633460798" at="2649,17,2650,67" />
+      <scope id="4912951749633403033" at="3018,15,3019,59" />
+      <scope id="4912951749633403526" at="3020,15,3021,59" />
+      <scope id="4912951749633427588" at="3084,16,3085,71" />
+      <scope id="4912951749633454964" at="3086,16,3087,71" />
       <scope id="4912951749633403528" at="190,84,192,151" />
-      <scope id="4912951749633439329" at="683,0,686,0">
+      <scope id="4912951749633439329" at="686,0,689,0">
         <var name="_context" id="4912951749633439329" />
       </scope>
-      <scope id="4912951749633463343" at="686,0,689,0">
+      <scope id="4912951749633463343" at="689,0,692,0">
         <var name="_context" id="4912951749633463343" />
       </scope>
-      <scope id="4912951749633463931" at="689,0,692,0">
+      <scope id="4912951749633463931" at="692,0,695,0">
         <var name="_context" id="4912951749633463931" />
       </scope>
-      <scope id="4912951749633460799" at="692,0,695,0">
+      <scope id="4912951749633460799" at="695,0,698,0">
         <var name="_context" id="4912951749633460799" />
       </scope>
-      <scope id="4912951749633427589" at="836,0,839,0">
+      <scope id="4912951749633427589" at="839,0,842,0">
         <var name="_context" id="4912951749633427589" />
       </scope>
-      <scope id="4912951749633454965" at="839,0,842,0">
+      <scope id="4912951749633454965" at="842,0,845,0">
         <var name="_context" id="4912951749633454965" />
       </scope>
       <scope id="4912951749633403527" at="190,0,194,0">
@@ -2523,578 +2541,578 @@
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/5397230782652850492">
     <file name="QueriesGenerated.java">
-      <node id="6437930869737376612" at="704,89,705,108" concept="6" />
-      <node id="6437930869737386360" at="707,89,708,111" concept="6" />
-      <node id="153860590143920197" at="710,89,711,109" concept="6" />
-      <node id="5730480978686920510" at="713,89,714,103" concept="6" />
-      <node id="5730480978687427547" at="716,89,717,261" concept="6" />
-      <node id="5730480978696335904" at="719,89,720,157" concept="6" />
-      <node id="5730480978688705688" at="722,89,723,261" concept="6" />
-      <node id="8624281949501634391" at="725,89,726,175" concept="5" />
-      <node id="5730480978690368455" at="726,175,727,0" concept="8" />
-      <node id="8624281949502066903" at="727,0,728,168" concept="6" />
-      <node id="8624281949502071250" at="730,89,731,170" concept="5" />
-      <node id="8624281949502071261" at="731,170,732,0" concept="8" />
-      <node id="8624281949502071262" at="732,0,733,174" concept="6" />
-      <node id="5730480978697709708" at="735,89,736,168" concept="6" />
-      <node id="8624281949501239233" at="738,90,739,157" concept="6" />
-      <node id="5730480978689391325" at="741,90,742,108" concept="6" />
-      <node id="5730480978689411027" at="744,90,745,104" concept="6" />
-      <node id="153860590145878371" at="747,90,748,97" concept="6" />
-      <node id="153860590145891356" at="750,90,751,105" concept="6" />
-      <node id="5730480978689422889" at="753,90,754,129" concept="6" />
-      <node id="5730480978689433238" at="756,90,757,129" concept="6" />
-      <node id="5730480978689435982" at="759,90,760,129" concept="6" />
-      <node id="5730480978698432052" at="762,90,763,96" concept="6" />
-      <node id="7001357232192369198" at="1092,79,1093,178" concept="6" />
-      <node id="4274875986684469704" at="1095,79,1096,353" concept="6" />
-      <node id="5730480978687377659" at="1527,105,1528,136" concept="6" />
-      <node id="5397230782653454315" at="1530,105,1531,141" concept="6" />
-      <node id="8624281949505153372" at="2079,57,2080,58" concept="1" />
-      <node id="5397230782653454313" at="2080,58,2081,58" concept="1" />
-      <node id="8624281949505153372" at="2207,16,2208,88" concept="6" />
-      <node id="5397230782653454313" at="2209,16,2210,88" concept="6" />
-      <node id="6437930869737376609" at="2350,194,2351,187" concept="1" />
-      <node id="6437930869737386357" at="2351,187,2352,187" concept="1" />
-      <node id="153860590143915509" at="2352,187,2353,195" concept="1" />
-      <node id="5730480978686915483" at="2353,195,2354,188" concept="1" />
-      <node id="5397230782653454095" at="2354,188,2355,187" concept="1" />
-      <node id="5397230782653454221" at="2355,187,2356,190" concept="1" />
-      <node id="5397230782653454237" at="2356,190,2357,187" concept="1" />
-      <node id="8624281949501633848" at="2357,187,2358,190" concept="1" />
-      <node id="8624281949502070708" at="2358,190,2359,188" concept="1" />
-      <node id="5730480978697699469" at="2359,188,2360,187" concept="1" />
-      <node id="8624281949501237519" at="2360,187,2361,191" concept="1" />
-      <node id="5730480978689390785" at="2361,191,2362,192" concept="1" />
-      <node id="5730480978689410244" at="2362,192,2363,187" concept="1" />
-      <node id="153860590145873689" at="2363,187,2364,196" concept="1" />
-      <node id="153860590145890816" at="2364,196,2365,199" concept="1" />
-      <node id="5730480978689422103" at="2365,199,2366,204" concept="1" />
-      <node id="5730480978689432453" at="2366,204,2367,204" concept="1" />
-      <node id="5730480978689435200" at="2367,204,2368,204" concept="1" />
-      <node id="5730480978698427344" at="2368,204,2369,186" concept="1" />
-      <node id="6437930869737376609" at="2646,17,2647,67" concept="6" />
-      <node id="6437930869737386357" at="2648,17,2649,67" concept="6" />
-      <node id="153860590143915509" at="2650,17,2651,67" concept="6" />
-      <node id="5730480978686915483" at="2652,17,2653,67" concept="6" />
-      <node id="5397230782653454095" at="2654,17,2655,67" concept="6" />
-      <node id="5397230782653454221" at="2656,17,2657,67" concept="6" />
-      <node id="5397230782653454237" at="2658,17,2659,67" concept="6" />
-      <node id="8624281949501633848" at="2660,17,2661,67" concept="6" />
-      <node id="8624281949502070708" at="2662,17,2663,67" concept="6" />
-      <node id="5730480978697699469" at="2664,17,2665,67" concept="6" />
-      <node id="8624281949501237519" at="2666,17,2667,68" concept="6" />
-      <node id="5730480978689390785" at="2668,17,2669,68" concept="6" />
-      <node id="5730480978689410244" at="2670,17,2671,68" concept="6" />
-      <node id="153860590145873689" at="2672,17,2673,68" concept="6" />
-      <node id="153860590145890816" at="2674,17,2675,68" concept="6" />
-      <node id="5730480978689422103" at="2676,17,2677,68" concept="6" />
-      <node id="5730480978689432453" at="2678,17,2679,68" concept="6" />
-      <node id="5730480978689435200" at="2680,17,2681,68" concept="6" />
-      <node id="5730480978698427344" at="2682,17,2683,68" concept="6" />
-      <node id="7001357232192368450" at="2787,57,2788,57" concept="1" />
-      <node id="7300774466309442727" at="2788,57,2789,57" concept="1" />
-      <node id="7001357232192368450" at="2954,16,2955,62" concept="6" />
-      <node id="7300774466309442727" at="2956,16,2957,62" concept="6" />
-      <node id="6437930869737376610" at="704,0,707,0" concept="9" trace="propertyMacro_GetValue_16_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="6437930869737386358" at="707,0,710,0" concept="9" trace="propertyMacro_GetValue_16_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="153860590143915510" at="710,0,713,0" concept="9" trace="propertyMacro_GetValue_16_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5730480978686915484" at="713,0,716,0" concept="9" trace="propertyMacro_GetValue_16_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5397230782653454096" at="716,0,719,0" concept="9" trace="propertyMacro_GetValue_16_4#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5397230782653454222" at="719,0,722,0" concept="9" trace="propertyMacro_GetValue_16_5#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5397230782653454238" at="722,0,725,0" concept="9" trace="propertyMacro_GetValue_16_6#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5730480978697699470" at="735,0,738,0" concept="9" trace="propertyMacro_GetValue_16_9#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8624281949501237520" at="738,0,741,0" concept="9" trace="propertyMacro_GetValue_16_10#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5730480978689390786" at="741,0,744,0" concept="9" trace="propertyMacro_GetValue_16_11#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5730480978689410245" at="744,0,747,0" concept="9" trace="propertyMacro_GetValue_16_12#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="153860590145873690" at="747,0,750,0" concept="9" trace="propertyMacro_GetValue_16_13#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="153860590145890817" at="750,0,753,0" concept="9" trace="propertyMacro_GetValue_16_14#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5730480978689422104" at="753,0,756,0" concept="9" trace="propertyMacro_GetValue_16_15#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5730480978689432454" at="756,0,759,0" concept="9" trace="propertyMacro_GetValue_16_16#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5730480978689435201" at="759,0,762,0" concept="9" trace="propertyMacro_GetValue_16_17#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5730480978698427345" at="762,0,765,0" concept="9" trace="propertyMacro_GetValue_16_18#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7001357232192368452" at="1092,0,1095,0" concept="9" trace="ifMacro_Condition_16_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7300774466309442729" at="1095,0,1098,0" concept="9" trace="ifMacro_Condition_16_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="8624281949505153372" at="1527,0,1530,0" concept="9" trace="sourceNodesQuery_16_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="5397230782653454313" at="1530,0,1533,0" concept="9" trace="sourceNodesQuery_16_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="8624281949501633849" at="725,0,730,0" concept="9" trace="propertyMacro_GetValue_16_7#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8624281949502070709" at="730,0,735,0" concept="9" trace="propertyMacro_GetValue_16_8#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <scope id="6437930869737376611" at="704,89,705,108" />
-      <scope id="6437930869737386359" at="707,89,708,111" />
-      <scope id="153860590143915511" at="710,89,711,109" />
-      <scope id="5730480978686915485" at="713,89,714,103" />
-      <scope id="5397230782653454097" at="716,89,717,261" />
-      <scope id="5397230782653454223" at="719,89,720,157" />
-      <scope id="5397230782653454239" at="722,89,723,261" />
-      <scope id="5730480978697699471" at="735,89,736,168" />
-      <scope id="8624281949501237521" at="738,90,739,157" />
-      <scope id="5730480978689390787" at="741,90,742,108" />
-      <scope id="5730480978689410246" at="744,90,745,104" />
-      <scope id="153860590145873691" at="747,90,748,97" />
-      <scope id="153860590145890818" at="750,90,751,105" />
-      <scope id="5730480978689422105" at="753,90,754,129" />
-      <scope id="5730480978689432455" at="756,90,757,129" />
-      <scope id="5730480978689435202" at="759,90,760,129" />
-      <scope id="5730480978698427346" at="762,90,763,96" />
-      <scope id="7001357232192368454" at="1092,79,1093,178" />
-      <scope id="7300774466309442731" at="1095,79,1096,353" />
-      <scope id="8624281949505153373" at="1527,105,1528,136" />
-      <scope id="5397230782653454314" at="1530,105,1531,141" />
-      <scope id="8624281949505153372" at="2207,16,2208,88" />
-      <scope id="5397230782653454313" at="2209,16,2210,88" />
-      <scope id="6437930869737376609" at="2646,17,2647,67" />
-      <scope id="6437930869737386357" at="2648,17,2649,67" />
-      <scope id="153860590143915509" at="2650,17,2651,67" />
-      <scope id="5730480978686915483" at="2652,17,2653,67" />
-      <scope id="5397230782653454095" at="2654,17,2655,67" />
-      <scope id="5397230782653454221" at="2656,17,2657,67" />
-      <scope id="5397230782653454237" at="2658,17,2659,67" />
-      <scope id="8624281949501633848" at="2660,17,2661,67" />
-      <scope id="8624281949502070708" at="2662,17,2663,67" />
-      <scope id="5730480978697699469" at="2664,17,2665,67" />
-      <scope id="8624281949501237519" at="2666,17,2667,68" />
-      <scope id="5730480978689390785" at="2668,17,2669,68" />
-      <scope id="5730480978689410244" at="2670,17,2671,68" />
-      <scope id="153860590145873689" at="2672,17,2673,68" />
-      <scope id="153860590145890816" at="2674,17,2675,68" />
-      <scope id="5730480978689422103" at="2676,17,2677,68" />
-      <scope id="5730480978689432453" at="2678,17,2679,68" />
-      <scope id="5730480978689435200" at="2680,17,2681,68" />
-      <scope id="5730480978698427344" at="2682,17,2683,68" />
-      <scope id="7001357232192368450" at="2954,16,2955,62" />
-      <scope id="7300774466309442727" at="2956,16,2957,62" />
-      <scope id="6437930869737376610" at="704,0,707,0">
+      <node id="6437930869737376612" at="707,89,708,108" concept="6" />
+      <node id="6437930869737386360" at="710,89,711,111" concept="6" />
+      <node id="153860590143920197" at="713,89,714,109" concept="6" />
+      <node id="5730480978686920510" at="716,89,717,103" concept="6" />
+      <node id="5730480978687427547" at="719,89,720,261" concept="6" />
+      <node id="5730480978696335904" at="722,89,723,157" concept="6" />
+      <node id="5730480978688705688" at="725,89,726,261" concept="6" />
+      <node id="8624281949501634391" at="728,89,729,175" concept="5" />
+      <node id="5730480978690368455" at="729,175,730,0" concept="8" />
+      <node id="8624281949502066903" at="730,0,731,168" concept="6" />
+      <node id="8624281949502071250" at="733,89,734,170" concept="5" />
+      <node id="8624281949502071261" at="734,170,735,0" concept="8" />
+      <node id="8624281949502071262" at="735,0,736,174" concept="6" />
+      <node id="5730480978697709708" at="738,89,739,168" concept="6" />
+      <node id="8624281949501239233" at="741,90,742,157" concept="6" />
+      <node id="5730480978689391325" at="744,90,745,108" concept="6" />
+      <node id="5730480978689411027" at="747,90,748,104" concept="6" />
+      <node id="153860590145878371" at="750,90,751,97" concept="6" />
+      <node id="153860590145891356" at="753,90,754,105" concept="6" />
+      <node id="5730480978689422889" at="756,90,757,129" concept="6" />
+      <node id="5730480978689433238" at="759,90,760,129" concept="6" />
+      <node id="5730480978689435982" at="762,90,763,129" concept="6" />
+      <node id="5730480978698432052" at="765,90,766,96" concept="6" />
+      <node id="7001357232192369198" at="1098,79,1099,178" concept="6" />
+      <node id="4274875986684469704" at="1101,79,1102,353" concept="6" />
+      <node id="5730480978687377659" at="1533,105,1534,136" concept="6" />
+      <node id="5397230782653454315" at="1536,105,1537,141" concept="6" />
+      <node id="8624281949505153372" at="2085,57,2086,58" concept="1" />
+      <node id="5397230782653454313" at="2086,58,2087,58" concept="1" />
+      <node id="8624281949505153372" at="2213,16,2214,88" concept="6" />
+      <node id="5397230782653454313" at="2215,16,2216,88" concept="6" />
+      <node id="6437930869737376609" at="2357,194,2358,187" concept="1" />
+      <node id="6437930869737386357" at="2358,187,2359,187" concept="1" />
+      <node id="153860590143915509" at="2359,187,2360,195" concept="1" />
+      <node id="5730480978686915483" at="2360,195,2361,188" concept="1" />
+      <node id="5397230782653454095" at="2361,188,2362,187" concept="1" />
+      <node id="5397230782653454221" at="2362,187,2363,190" concept="1" />
+      <node id="5397230782653454237" at="2363,190,2364,187" concept="1" />
+      <node id="8624281949501633848" at="2364,187,2365,190" concept="1" />
+      <node id="8624281949502070708" at="2365,190,2366,188" concept="1" />
+      <node id="5730480978697699469" at="2366,188,2367,187" concept="1" />
+      <node id="8624281949501237519" at="2367,187,2368,191" concept="1" />
+      <node id="5730480978689390785" at="2368,191,2369,192" concept="1" />
+      <node id="5730480978689410244" at="2369,192,2370,187" concept="1" />
+      <node id="153860590145873689" at="2370,187,2371,196" concept="1" />
+      <node id="153860590145890816" at="2371,196,2372,199" concept="1" />
+      <node id="5730480978689422103" at="2372,199,2373,204" concept="1" />
+      <node id="5730480978689432453" at="2373,204,2374,204" concept="1" />
+      <node id="5730480978689435200" at="2374,204,2375,204" concept="1" />
+      <node id="5730480978698427344" at="2375,204,2376,186" concept="1" />
+      <node id="6437930869737376609" at="2655,17,2656,67" concept="6" />
+      <node id="6437930869737386357" at="2657,17,2658,67" concept="6" />
+      <node id="153860590143915509" at="2659,17,2660,67" concept="6" />
+      <node id="5730480978686915483" at="2661,17,2662,67" concept="6" />
+      <node id="5397230782653454095" at="2663,17,2664,67" concept="6" />
+      <node id="5397230782653454221" at="2665,17,2666,67" concept="6" />
+      <node id="5397230782653454237" at="2667,17,2668,67" concept="6" />
+      <node id="8624281949501633848" at="2669,17,2670,67" concept="6" />
+      <node id="8624281949502070708" at="2671,17,2672,67" concept="6" />
+      <node id="5730480978697699469" at="2673,17,2674,67" concept="6" />
+      <node id="8624281949501237519" at="2675,17,2676,68" concept="6" />
+      <node id="5730480978689390785" at="2677,17,2678,68" concept="6" />
+      <node id="5730480978689410244" at="2679,17,2680,68" concept="6" />
+      <node id="153860590145873689" at="2681,17,2682,68" concept="6" />
+      <node id="153860590145890816" at="2683,17,2684,68" concept="6" />
+      <node id="5730480978689422103" at="2685,17,2686,68" concept="6" />
+      <node id="5730480978689432453" at="2687,17,2688,68" concept="6" />
+      <node id="5730480978689435200" at="2689,17,2690,68" concept="6" />
+      <node id="5730480978698427344" at="2691,17,2692,68" concept="6" />
+      <node id="7001357232192368450" at="2797,57,2798,57" concept="1" />
+      <node id="7300774466309442727" at="2798,57,2799,57" concept="1" />
+      <node id="7001357232192368450" at="2966,16,2967,62" concept="6" />
+      <node id="7300774466309442727" at="2968,16,2969,62" concept="6" />
+      <node id="6437930869737376610" at="707,0,710,0" concept="9" trace="propertyMacro_GetValue_16_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="6437930869737386358" at="710,0,713,0" concept="9" trace="propertyMacro_GetValue_16_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="153860590143915510" at="713,0,716,0" concept="9" trace="propertyMacro_GetValue_16_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5730480978686915484" at="716,0,719,0" concept="9" trace="propertyMacro_GetValue_16_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5397230782653454096" at="719,0,722,0" concept="9" trace="propertyMacro_GetValue_16_4#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5397230782653454222" at="722,0,725,0" concept="9" trace="propertyMacro_GetValue_16_5#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5397230782653454238" at="725,0,728,0" concept="9" trace="propertyMacro_GetValue_16_6#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5730480978697699470" at="738,0,741,0" concept="9" trace="propertyMacro_GetValue_16_9#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="8624281949501237520" at="741,0,744,0" concept="9" trace="propertyMacro_GetValue_16_10#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5730480978689390786" at="744,0,747,0" concept="9" trace="propertyMacro_GetValue_16_11#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5730480978689410245" at="747,0,750,0" concept="9" trace="propertyMacro_GetValue_16_12#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="153860590145873690" at="750,0,753,0" concept="9" trace="propertyMacro_GetValue_16_13#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="153860590145890817" at="753,0,756,0" concept="9" trace="propertyMacro_GetValue_16_14#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5730480978689422104" at="756,0,759,0" concept="9" trace="propertyMacro_GetValue_16_15#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5730480978689432454" at="759,0,762,0" concept="9" trace="propertyMacro_GetValue_16_16#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5730480978689435201" at="762,0,765,0" concept="9" trace="propertyMacro_GetValue_16_17#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5730480978698427345" at="765,0,768,0" concept="9" trace="propertyMacro_GetValue_16_18#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7001357232192368452" at="1098,0,1101,0" concept="9" trace="ifMacro_Condition_16_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7300774466309442729" at="1101,0,1104,0" concept="9" trace="ifMacro_Condition_16_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="8624281949505153372" at="1533,0,1536,0" concept="9" trace="sourceNodesQuery_16_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="5397230782653454313" at="1536,0,1539,0" concept="9" trace="sourceNodesQuery_16_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8624281949501633849" at="728,0,733,0" concept="9" trace="propertyMacro_GetValue_16_7#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="8624281949502070709" at="733,0,738,0" concept="9" trace="propertyMacro_GetValue_16_8#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <scope id="6437930869737376611" at="707,89,708,108" />
+      <scope id="6437930869737386359" at="710,89,711,111" />
+      <scope id="153860590143915511" at="713,89,714,109" />
+      <scope id="5730480978686915485" at="716,89,717,103" />
+      <scope id="5397230782653454097" at="719,89,720,261" />
+      <scope id="5397230782653454223" at="722,89,723,157" />
+      <scope id="5397230782653454239" at="725,89,726,261" />
+      <scope id="5730480978697699471" at="738,89,739,168" />
+      <scope id="8624281949501237521" at="741,90,742,157" />
+      <scope id="5730480978689390787" at="744,90,745,108" />
+      <scope id="5730480978689410246" at="747,90,748,104" />
+      <scope id="153860590145873691" at="750,90,751,97" />
+      <scope id="153860590145890818" at="753,90,754,105" />
+      <scope id="5730480978689422105" at="756,90,757,129" />
+      <scope id="5730480978689432455" at="759,90,760,129" />
+      <scope id="5730480978689435202" at="762,90,763,129" />
+      <scope id="5730480978698427346" at="765,90,766,96" />
+      <scope id="7001357232192368454" at="1098,79,1099,178" />
+      <scope id="7300774466309442731" at="1101,79,1102,353" />
+      <scope id="8624281949505153373" at="1533,105,1534,136" />
+      <scope id="5397230782653454314" at="1536,105,1537,141" />
+      <scope id="8624281949505153372" at="2213,16,2214,88" />
+      <scope id="5397230782653454313" at="2215,16,2216,88" />
+      <scope id="6437930869737376609" at="2655,17,2656,67" />
+      <scope id="6437930869737386357" at="2657,17,2658,67" />
+      <scope id="153860590143915509" at="2659,17,2660,67" />
+      <scope id="5730480978686915483" at="2661,17,2662,67" />
+      <scope id="5397230782653454095" at="2663,17,2664,67" />
+      <scope id="5397230782653454221" at="2665,17,2666,67" />
+      <scope id="5397230782653454237" at="2667,17,2668,67" />
+      <scope id="8624281949501633848" at="2669,17,2670,67" />
+      <scope id="8624281949502070708" at="2671,17,2672,67" />
+      <scope id="5730480978697699469" at="2673,17,2674,67" />
+      <scope id="8624281949501237519" at="2675,17,2676,68" />
+      <scope id="5730480978689390785" at="2677,17,2678,68" />
+      <scope id="5730480978689410244" at="2679,17,2680,68" />
+      <scope id="153860590145873689" at="2681,17,2682,68" />
+      <scope id="153860590145890816" at="2683,17,2684,68" />
+      <scope id="5730480978689422103" at="2685,17,2686,68" />
+      <scope id="5730480978689432453" at="2687,17,2688,68" />
+      <scope id="5730480978689435200" at="2689,17,2690,68" />
+      <scope id="5730480978698427344" at="2691,17,2692,68" />
+      <scope id="7001357232192368450" at="2966,16,2967,62" />
+      <scope id="7300774466309442727" at="2968,16,2969,62" />
+      <scope id="6437930869737376610" at="707,0,710,0">
         <var name="_context" id="6437930869737376610" />
       </scope>
-      <scope id="6437930869737386358" at="707,0,710,0">
+      <scope id="6437930869737386358" at="710,0,713,0">
         <var name="_context" id="6437930869737386358" />
       </scope>
-      <scope id="153860590143915510" at="710,0,713,0">
+      <scope id="153860590143915510" at="713,0,716,0">
         <var name="_context" id="153860590143915510" />
       </scope>
-      <scope id="5730480978686915484" at="713,0,716,0">
+      <scope id="5730480978686915484" at="716,0,719,0">
         <var name="_context" id="5730480978686915484" />
       </scope>
-      <scope id="5397230782653454096" at="716,0,719,0">
+      <scope id="5397230782653454096" at="719,0,722,0">
         <var name="_context" id="5397230782653454096" />
       </scope>
-      <scope id="5397230782653454222" at="719,0,722,0">
+      <scope id="5397230782653454222" at="722,0,725,0">
         <var name="_context" id="5397230782653454222" />
       </scope>
-      <scope id="5397230782653454238" at="722,0,725,0">
+      <scope id="5397230782653454238" at="725,0,728,0">
         <var name="_context" id="5397230782653454238" />
       </scope>
-      <scope id="8624281949501633850" at="725,89,728,168">
+      <scope id="8624281949501633850" at="728,89,731,168">
         <var name="index" id="8624281949501634394" />
       </scope>
-      <scope id="8624281949502070710" at="730,89,733,174">
+      <scope id="8624281949502070710" at="733,89,736,174">
         <var name="index" id="8624281949502071251" />
       </scope>
-      <scope id="5730480978697699470" at="735,0,738,0">
+      <scope id="5730480978697699470" at="738,0,741,0">
         <var name="_context" id="5730480978697699470" />
       </scope>
-      <scope id="8624281949501237520" at="738,0,741,0">
+      <scope id="8624281949501237520" at="741,0,744,0">
         <var name="_context" id="8624281949501237520" />
       </scope>
-      <scope id="5730480978689390786" at="741,0,744,0">
+      <scope id="5730480978689390786" at="744,0,747,0">
         <var name="_context" id="5730480978689390786" />
       </scope>
-      <scope id="5730480978689410245" at="744,0,747,0">
+      <scope id="5730480978689410245" at="747,0,750,0">
         <var name="_context" id="5730480978689410245" />
       </scope>
-      <scope id="153860590145873690" at="747,0,750,0">
+      <scope id="153860590145873690" at="750,0,753,0">
         <var name="_context" id="153860590145873690" />
       </scope>
-      <scope id="153860590145890817" at="750,0,753,0">
+      <scope id="153860590145890817" at="753,0,756,0">
         <var name="_context" id="153860590145890817" />
       </scope>
-      <scope id="5730480978689422104" at="753,0,756,0">
+      <scope id="5730480978689422104" at="756,0,759,0">
         <var name="_context" id="5730480978689422104" />
       </scope>
-      <scope id="5730480978689432454" at="756,0,759,0">
+      <scope id="5730480978689432454" at="759,0,762,0">
         <var name="_context" id="5730480978689432454" />
       </scope>
-      <scope id="5730480978689435201" at="759,0,762,0">
+      <scope id="5730480978689435201" at="762,0,765,0">
         <var name="_context" id="5730480978689435201" />
       </scope>
-      <scope id="5730480978698427345" at="762,0,765,0">
+      <scope id="5730480978698427345" at="765,0,768,0">
         <var name="_context" id="5730480978698427345" />
       </scope>
-      <scope id="7001357232192368452" at="1092,0,1095,0">
+      <scope id="7001357232192368452" at="1098,0,1101,0">
         <var name="_context" id="7001357232192368452" />
       </scope>
-      <scope id="7300774466309442729" at="1095,0,1098,0">
+      <scope id="7300774466309442729" at="1101,0,1104,0">
         <var name="_context" id="7300774466309442729" />
       </scope>
-      <scope id="8624281949505153372" at="1527,0,1530,0">
+      <scope id="8624281949505153372" at="1533,0,1536,0">
         <var name="_context" id="8624281949505153372" />
       </scope>
-      <scope id="5397230782653454313" at="1530,0,1533,0">
+      <scope id="5397230782653454313" at="1536,0,1539,0">
         <var name="_context" id="5397230782653454313" />
       </scope>
-      <scope id="8624281949501633849" at="725,0,730,0">
+      <scope id="8624281949501633849" at="728,0,733,0">
         <var name="_context" id="8624281949501633849" />
       </scope>
-      <scope id="8624281949502070709" at="730,0,735,0">
+      <scope id="8624281949502070709" at="733,0,738,0">
         <var name="_context" id="8624281949502070709" />
       </scope>
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/6592112598314985825">
     <file name="QueriesGenerated.java">
-      <node id="6592112598314984959" at="784,89,785,98" concept="6" />
-      <node id="6592112598314985025" at="787,89,788,231" concept="6" />
-      <node id="2172791612911014885" at="790,89,791,238" concept="6" />
-      <node id="6592112598314985146" at="793,89,794,234" concept="6" />
-      <node id="7832771629085133943" at="796,89,797,145" concept="6" />
-      <node id="7832771629085133856" at="799,89,800,146" concept="6" />
-      <node id="6592112598314985449" at="802,89,803,122" concept="6" />
-      <node id="2172791612910917528" at="1101,79,1102,113" concept="6" />
-      <node id="7832771629085134031" at="1104,79,1105,163" concept="6" />
-      <node id="7832771629085133715" at="1107,79,1108,264" concept="6" />
-      <node id="4972001163782151887" at="1110,79,1111,27" concept="7" />
-      <node id="2339934328870304193" at="1111,27,1112,111" concept="6" />
-      <node id="2339934328870356489" at="1189,93,1190,101" concept="6" />
-      <node id="6592112598314985298" at="1540,105,1541,106" concept="6" />
-      <node id="1359186315027134101" at="1543,105,1544,97" concept="6" />
-      <node id="2339934328870356487" at="1952,55,1953,56" concept="1" />
-      <node id="2339934328870356487" at="2017,16,2018,60" concept="6" />
-      <node id="6592112598314985296" at="2083,58,2084,58" concept="1" />
-      <node id="1359186315027134099" at="2084,58,2085,58" concept="1" />
-      <node id="6592112598314985296" at="2215,16,2216,88" concept="6" />
-      <node id="1359186315027134099" at="2217,16,2218,88" concept="6" />
-      <node id="6592112598314984956" at="2374,195,2375,205" concept="1" />
-      <node id="6592112598314985022" at="2375,205,2376,191" concept="1" />
-      <node id="2172791612911012485" at="2376,191,2377,196" concept="1" />
-      <node id="6592112598314985143" at="2377,196,2378,190" concept="1" />
-      <node id="7832771629085133940" at="2378,190,2379,213" concept="1" />
-      <node id="7832771629085133853" at="2379,213,2380,194" concept="1" />
-      <node id="6592112598314985446" at="2380,194,2381,203" concept="1" />
-      <node id="6592112598314984956" at="2694,17,2695,67" concept="6" />
-      <node id="6592112598314985022" at="2696,17,2697,67" concept="6" />
-      <node id="2172791612911012485" at="2698,17,2699,67" concept="6" />
-      <node id="6592112598314985143" at="2700,17,2701,67" concept="6" />
-      <node id="7832771629085133940" at="2702,17,2703,67" concept="6" />
-      <node id="7832771629085133853" at="2704,17,2705,67" concept="6" />
-      <node id="6592112598314985446" at="2706,17,2707,67" concept="6" />
-      <node id="2172791612910915661" at="2790,57,2791,57" concept="1" />
-      <node id="7832771629085134028" at="2791,57,2792,57" concept="1" />
-      <node id="7832771629085133712" at="2792,57,2793,57" concept="1" />
-      <node id="2339934328870304022" at="2793,57,2794,57" concept="1" />
-      <node id="2172791612910915661" at="2960,16,2961,62" concept="6" />
-      <node id="7832771629085134028" at="2962,16,2963,62" concept="6" />
-      <node id="7832771629085133712" at="2964,16,2965,62" concept="6" />
-      <node id="2339934328870304022" at="2966,16,2967,62" concept="6" />
-      <node id="6592112598314984957" at="784,0,787,0" concept="9" trace="propertyMacro_GetValue_21_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="6592112598314985023" at="787,0,790,0" concept="9" trace="propertyMacro_GetValue_21_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="2172791612911012486" at="790,0,793,0" concept="9" trace="propertyMacro_GetValue_21_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="6592112598314985144" at="793,0,796,0" concept="9" trace="propertyMacro_GetValue_21_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7832771629085133941" at="796,0,799,0" concept="9" trace="propertyMacro_GetValue_21_4#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7832771629085133854" at="799,0,802,0" concept="9" trace="propertyMacro_GetValue_21_5#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="6592112598314985447" at="802,0,805,0" concept="9" trace="propertyMacro_GetValue_21_6#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="2172791612910915663" at="1101,0,1104,0" concept="9" trace="ifMacro_Condition_21_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7832771629085134029" at="1104,0,1107,0" concept="9" trace="ifMacro_Condition_21_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7832771629085133713" at="1107,0,1110,0" concept="9" trace="ifMacro_Condition_21_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="2339934328870356487" at="1189,0,1192,0" concept="9" trace="sourceNodeQuery_21_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="6592112598314985296" at="1540,0,1543,0" concept="9" trace="sourceNodesQuery_21_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="1359186315027134099" at="1543,0,1546,0" concept="9" trace="sourceNodesQuery_21_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="2339934328870304024" at="1110,0,1114,0" concept="9" trace="ifMacro_Condition_21_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <scope id="6592112598314984958" at="784,89,785,98" />
-      <scope id="6592112598314985024" at="787,89,788,231" />
-      <scope id="2172791612911012487" at="790,89,791,238" />
-      <scope id="6592112598314985145" at="793,89,794,234" />
-      <scope id="7832771629085133942" at="796,89,797,145" />
-      <scope id="7832771629085133855" at="799,89,800,146" />
-      <scope id="6592112598314985448" at="802,89,803,122" />
-      <scope id="2172791612910915665" at="1101,79,1102,113" />
-      <scope id="7832771629085134030" at="1104,79,1105,163" />
-      <scope id="7832771629085133714" at="1107,79,1108,264" />
-      <scope id="2339934328870356488" at="1189,93,1190,101" />
-      <scope id="6592112598314985297" at="1540,105,1541,106" />
-      <scope id="1359186315027134100" at="1543,105,1544,97" />
-      <scope id="2339934328870356487" at="2017,16,2018,60" />
-      <scope id="6592112598314985296" at="2215,16,2216,88" />
-      <scope id="1359186315027134099" at="2217,16,2218,88" />
-      <scope id="6592112598314984956" at="2694,17,2695,67" />
-      <scope id="6592112598314985022" at="2696,17,2697,67" />
-      <scope id="2172791612911012485" at="2698,17,2699,67" />
-      <scope id="6592112598314985143" at="2700,17,2701,67" />
-      <scope id="7832771629085133940" at="2702,17,2703,67" />
-      <scope id="7832771629085133853" at="2704,17,2705,67" />
-      <scope id="6592112598314985446" at="2706,17,2707,67" />
-      <scope id="2172791612910915661" at="2960,16,2961,62" />
-      <scope id="7832771629085134028" at="2962,16,2963,62" />
-      <scope id="7832771629085133712" at="2964,16,2965,62" />
-      <scope id="2339934328870304022" at="2966,16,2967,62" />
-      <scope id="2339934328870304026" at="1110,79,1112,111" />
-      <scope id="6592112598314984957" at="784,0,787,0">
+      <node id="6592112598314984959" at="787,89,788,98" concept="6" />
+      <node id="6592112598314985025" at="790,89,791,231" concept="6" />
+      <node id="2172791612911014885" at="793,89,794,238" concept="6" />
+      <node id="6592112598314985146" at="796,89,797,234" concept="6" />
+      <node id="7832771629085133943" at="799,89,800,145" concept="6" />
+      <node id="7832771629085133856" at="802,89,803,146" concept="6" />
+      <node id="6592112598314985449" at="805,89,806,122" concept="6" />
+      <node id="2172791612910917528" at="1107,79,1108,113" concept="6" />
+      <node id="7832771629085134031" at="1110,79,1111,163" concept="6" />
+      <node id="7832771629085133715" at="1113,79,1114,264" concept="6" />
+      <node id="4972001163782151887" at="1116,79,1117,27" concept="7" />
+      <node id="2339934328870304193" at="1117,27,1118,111" concept="6" />
+      <node id="2339934328870356489" at="1195,93,1196,101" concept="6" />
+      <node id="6592112598314985298" at="1546,105,1547,106" concept="6" />
+      <node id="1359186315027134101" at="1549,105,1550,97" concept="6" />
+      <node id="2339934328870356487" at="1958,55,1959,56" concept="1" />
+      <node id="2339934328870356487" at="2023,16,2024,60" concept="6" />
+      <node id="6592112598314985296" at="2089,58,2090,58" concept="1" />
+      <node id="1359186315027134099" at="2090,58,2091,58" concept="1" />
+      <node id="6592112598314985296" at="2221,16,2222,88" concept="6" />
+      <node id="1359186315027134099" at="2223,16,2224,88" concept="6" />
+      <node id="6592112598314984956" at="2381,195,2382,205" concept="1" />
+      <node id="6592112598314985022" at="2382,205,2383,191" concept="1" />
+      <node id="2172791612911012485" at="2383,191,2384,196" concept="1" />
+      <node id="6592112598314985143" at="2384,196,2385,190" concept="1" />
+      <node id="7832771629085133940" at="2385,190,2386,213" concept="1" />
+      <node id="7832771629085133853" at="2386,213,2387,194" concept="1" />
+      <node id="6592112598314985446" at="2387,194,2388,203" concept="1" />
+      <node id="6592112598314984956" at="2703,17,2704,67" concept="6" />
+      <node id="6592112598314985022" at="2705,17,2706,67" concept="6" />
+      <node id="2172791612911012485" at="2707,17,2708,67" concept="6" />
+      <node id="6592112598314985143" at="2709,17,2710,67" concept="6" />
+      <node id="7832771629085133940" at="2711,17,2712,67" concept="6" />
+      <node id="7832771629085133853" at="2713,17,2714,67" concept="6" />
+      <node id="6592112598314985446" at="2715,17,2716,67" concept="6" />
+      <node id="2172791612910915661" at="2800,57,2801,57" concept="1" />
+      <node id="7832771629085134028" at="2801,57,2802,57" concept="1" />
+      <node id="7832771629085133712" at="2802,57,2803,57" concept="1" />
+      <node id="2339934328870304022" at="2803,57,2804,57" concept="1" />
+      <node id="2172791612910915661" at="2972,16,2973,62" concept="6" />
+      <node id="7832771629085134028" at="2974,16,2975,62" concept="6" />
+      <node id="7832771629085133712" at="2976,16,2977,62" concept="6" />
+      <node id="2339934328870304022" at="2978,16,2979,62" concept="6" />
+      <node id="6592112598314984957" at="787,0,790,0" concept="9" trace="propertyMacro_GetValue_21_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="6592112598314985023" at="790,0,793,0" concept="9" trace="propertyMacro_GetValue_21_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="2172791612911012486" at="793,0,796,0" concept="9" trace="propertyMacro_GetValue_21_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="6592112598314985144" at="796,0,799,0" concept="9" trace="propertyMacro_GetValue_21_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7832771629085133941" at="799,0,802,0" concept="9" trace="propertyMacro_GetValue_21_4#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="7832771629085133854" at="802,0,805,0" concept="9" trace="propertyMacro_GetValue_21_5#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="6592112598314985447" at="805,0,808,0" concept="9" trace="propertyMacro_GetValue_21_6#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="2172791612910915663" at="1107,0,1110,0" concept="9" trace="ifMacro_Condition_21_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7832771629085134029" at="1110,0,1113,0" concept="9" trace="ifMacro_Condition_21_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7832771629085133713" at="1113,0,1116,0" concept="9" trace="ifMacro_Condition_21_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="2339934328870356487" at="1195,0,1198,0" concept="9" trace="sourceNodeQuery_21_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="6592112598314985296" at="1546,0,1549,0" concept="9" trace="sourceNodesQuery_21_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="1359186315027134099" at="1549,0,1552,0" concept="9" trace="sourceNodesQuery_21_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="2339934328870304024" at="1116,0,1120,0" concept="9" trace="ifMacro_Condition_21_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <scope id="6592112598314984958" at="787,89,788,98" />
+      <scope id="6592112598314985024" at="790,89,791,231" />
+      <scope id="2172791612911012487" at="793,89,794,238" />
+      <scope id="6592112598314985145" at="796,89,797,234" />
+      <scope id="7832771629085133942" at="799,89,800,145" />
+      <scope id="7832771629085133855" at="802,89,803,146" />
+      <scope id="6592112598314985448" at="805,89,806,122" />
+      <scope id="2172791612910915665" at="1107,79,1108,113" />
+      <scope id="7832771629085134030" at="1110,79,1111,163" />
+      <scope id="7832771629085133714" at="1113,79,1114,264" />
+      <scope id="2339934328870356488" at="1195,93,1196,101" />
+      <scope id="6592112598314985297" at="1546,105,1547,106" />
+      <scope id="1359186315027134100" at="1549,105,1550,97" />
+      <scope id="2339934328870356487" at="2023,16,2024,60" />
+      <scope id="6592112598314985296" at="2221,16,2222,88" />
+      <scope id="1359186315027134099" at="2223,16,2224,88" />
+      <scope id="6592112598314984956" at="2703,17,2704,67" />
+      <scope id="6592112598314985022" at="2705,17,2706,67" />
+      <scope id="2172791612911012485" at="2707,17,2708,67" />
+      <scope id="6592112598314985143" at="2709,17,2710,67" />
+      <scope id="7832771629085133940" at="2711,17,2712,67" />
+      <scope id="7832771629085133853" at="2713,17,2714,67" />
+      <scope id="6592112598314985446" at="2715,17,2716,67" />
+      <scope id="2172791612910915661" at="2972,16,2973,62" />
+      <scope id="7832771629085134028" at="2974,16,2975,62" />
+      <scope id="7832771629085133712" at="2976,16,2977,62" />
+      <scope id="2339934328870304022" at="2978,16,2979,62" />
+      <scope id="2339934328870304026" at="1116,79,1118,111" />
+      <scope id="6592112598314984957" at="787,0,790,0">
         <var name="_context" id="6592112598314984957" />
       </scope>
-      <scope id="6592112598314985023" at="787,0,790,0">
+      <scope id="6592112598314985023" at="790,0,793,0">
         <var name="_context" id="6592112598314985023" />
       </scope>
-      <scope id="2172791612911012486" at="790,0,793,0">
+      <scope id="2172791612911012486" at="793,0,796,0">
         <var name="_context" id="2172791612911012486" />
       </scope>
-      <scope id="6592112598314985144" at="793,0,796,0">
+      <scope id="6592112598314985144" at="796,0,799,0">
         <var name="_context" id="6592112598314985144" />
       </scope>
-      <scope id="7832771629085133941" at="796,0,799,0">
+      <scope id="7832771629085133941" at="799,0,802,0">
         <var name="_context" id="7832771629085133941" />
       </scope>
-      <scope id="7832771629085133854" at="799,0,802,0">
+      <scope id="7832771629085133854" at="802,0,805,0">
         <var name="_context" id="7832771629085133854" />
       </scope>
-      <scope id="6592112598314985447" at="802,0,805,0">
+      <scope id="6592112598314985447" at="805,0,808,0">
         <var name="_context" id="6592112598314985447" />
       </scope>
-      <scope id="2172791612910915663" at="1101,0,1104,0">
+      <scope id="2172791612910915663" at="1107,0,1110,0">
         <var name="_context" id="2172791612910915663" />
       </scope>
-      <scope id="7832771629085134029" at="1104,0,1107,0">
+      <scope id="7832771629085134029" at="1110,0,1113,0">
         <var name="_context" id="7832771629085134029" />
       </scope>
-      <scope id="7832771629085133713" at="1107,0,1110,0">
+      <scope id="7832771629085133713" at="1113,0,1116,0">
         <var name="_context" id="7832771629085133713" />
       </scope>
-      <scope id="2339934328870356487" at="1189,0,1192,0">
+      <scope id="2339934328870356487" at="1195,0,1198,0">
         <var name="_context" id="2339934328870356487" />
       </scope>
-      <scope id="6592112598314985296" at="1540,0,1543,0">
+      <scope id="6592112598314985296" at="1546,0,1549,0">
         <var name="_context" id="6592112598314985296" />
       </scope>
-      <scope id="1359186315027134099" at="1543,0,1546,0">
+      <scope id="1359186315027134099" at="1549,0,1552,0">
         <var name="_context" id="1359186315027134099" />
       </scope>
-      <scope id="2339934328870304024" at="1110,0,1114,0">
+      <scope id="2339934328870304024" at="1116,0,1120,0">
         <var name="_context" id="2339934328870304024" />
       </scope>
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/6818892319993308452">
     <file name="QueriesGenerated.java">
-      <node id="5931473261455820335" at="774,89,775,245" concept="6" />
-      <node id="153860590141130255" at="778,94,779,80" concept="6" />
-      <node id="153860590141125989" at="780,12,781,89" concept="6" />
-      <node id="5931473261454730834" at="1098,79,1099,84" concept="6" />
-      <node id="5931473261454711455" at="2372,200,2373,212" concept="1" />
-      <node id="5397230782654310879" at="2373,212,2374,195" concept="1" />
-      <node id="5931473261454711455" at="2690,17,2691,67" concept="6" />
-      <node id="5397230782654310879" at="2692,17,2693,67" concept="6" />
-      <node id="5931473261454729298" at="2789,57,2790,57" concept="1" />
-      <node id="5931473261454729298" at="2958,16,2959,62" concept="6" />
-      <node id="153860590141125272" at="780,10,782,5" concept="0" />
-      <node id="5931473261454711456" at="774,0,777,0" concept="9" trace="propertyMacro_GetValue_18_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="5931473261454729300" at="1098,0,1101,0" concept="9" trace="ifMacro_Condition_18_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="153860590141099957" at="777,89,782,5" concept="3" />
-      <node id="5397230782654310880" at="777,0,784,0" concept="9" trace="propertyMacro_GetValue_18_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <scope id="5931473261454711457" at="774,89,775,245" />
-      <scope id="153860590141099959" at="778,94,779,80" />
-      <scope id="153860590141125273" at="780,12,781,89" />
-      <scope id="5931473261454729302" at="1098,79,1099,84" />
-      <scope id="5931473261454711455" at="2690,17,2691,67" />
-      <scope id="5397230782654310879" at="2692,17,2693,67" />
-      <scope id="5931473261454729298" at="2958,16,2959,62" />
-      <scope id="5931473261454711456" at="774,0,777,0">
+      <node id="5931473261455820335" at="777,89,778,245" concept="6" />
+      <node id="153860590141130255" at="781,94,782,80" concept="6" />
+      <node id="153860590141125989" at="783,12,784,89" concept="6" />
+      <node id="5931473261454730834" at="1104,79,1105,84" concept="6" />
+      <node id="5931473261454711455" at="2379,200,2380,212" concept="1" />
+      <node id="5397230782654310879" at="2380,212,2381,195" concept="1" />
+      <node id="5931473261454711455" at="2699,17,2700,67" concept="6" />
+      <node id="5397230782654310879" at="2701,17,2702,67" concept="6" />
+      <node id="5931473261454729298" at="2799,57,2800,57" concept="1" />
+      <node id="5931473261454729298" at="2970,16,2971,62" concept="6" />
+      <node id="153860590141125272" at="783,10,785,5" concept="0" />
+      <node id="5931473261454711456" at="777,0,780,0" concept="9" trace="propertyMacro_GetValue_18_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="5931473261454729300" at="1104,0,1107,0" concept="9" trace="ifMacro_Condition_18_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="153860590141099957" at="780,89,785,5" concept="3" />
+      <node id="5397230782654310880" at="780,0,787,0" concept="9" trace="propertyMacro_GetValue_18_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <scope id="5931473261454711457" at="777,89,778,245" />
+      <scope id="153860590141099959" at="781,94,782,80" />
+      <scope id="153860590141125273" at="783,12,784,89" />
+      <scope id="5931473261454729302" at="1104,79,1105,84" />
+      <scope id="5931473261454711455" at="2699,17,2700,67" />
+      <scope id="5397230782654310879" at="2701,17,2702,67" />
+      <scope id="5931473261454729298" at="2970,16,2971,62" />
+      <scope id="5931473261454711456" at="777,0,780,0">
         <var name="_context" id="5931473261454711456" />
       </scope>
-      <scope id="5931473261454729300" at="1098,0,1101,0">
+      <scope id="5931473261454729300" at="1104,0,1107,0">
         <var name="_context" id="5931473261454729300" />
       </scope>
-      <scope id="5397230782654310881" at="777,89,782,5" />
-      <scope id="5397230782654310880" at="777,0,784,0">
+      <scope id="5397230782654310881" at="780,89,785,5" />
+      <scope id="5397230782654310880" at="780,0,787,0">
         <var name="_context" id="5397230782654310880" />
       </scope>
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/6859736767834858391">
     <file name="QueriesGenerated.java">
-      <node id="4912951749633709726" at="1138,92,1139,80" concept="6" />
-      <node id="4912951749633721708" at="1249,90,1250,30" concept="6" />
-      <node id="4912951749633723518" at="1252,90,1253,80" concept="6" />
-      <node id="6859736767834858559" at="1670,78,1671,111" concept="5" />
-      <node id="6859736767834858569" at="1672,26,1673,82" concept="1" />
-      <node id="6859736767834858575" at="1673,82,1674,18" concept="6" />
-      <node id="6859736767834858580" at="1675,5,1676,87" concept="5" />
-      <node id="6859736767834858587" at="1676,87,1677,88" concept="5" />
-      <node id="5680938682774241679" at="1677,88,1678,0" concept="8" />
-      <node id="5680938682774241505" at="1678,0,1679,62" concept="5" />
-      <node id="8706695667515547271" at="1680,29,1681,49" concept="5" />
-      <node id="8706695667515546432" at="1681,49,1682,78" concept="5" />
-      <node id="8706695667515547279" at="1683,28,1684,113" concept="1" />
-      <node id="8706695667515546474" at="1684,113,1685,145" concept="1" />
-      <node id="8706695667515547199" at="1686,7,1687,69" concept="5" />
-      <node id="5680938682774242053" at="1688,31,1689,173" concept="5" />
-      <node id="8706695667515554155" at="1690,26,1691,73" concept="6" />
-      <node id="8706695667515546520" at="1692,9,1693,0" concept="8" />
-      <node id="8706695667515554221" at="1693,0,1694,122" concept="1" />
-      <node id="8706695667515546522" at="1694,122,1695,145" concept="1" />
-      <node id="5680938682774241681" at="1697,5,1698,0" concept="8" />
-      <node id="6859736767834858602" at="1699,29,1700,215" concept="1" />
-      <node id="6859736767834858616" at="1700,215,1701,170" concept="6" />
-      <node id="4912951749633834185" at="1702,5,1703,160" concept="7" />
-      <node id="4912951749633841219" at="1703,160,1704,162" concept="7" />
-      <node id="4912951749633855316" at="1704,162,1705,130" concept="7" />
-      <node id="4912951749633867306" at="1705,130,1706,158" concept="7" />
-      <node id="4912951749633872115" at="1706,158,1707,165" concept="7" />
-      <node id="4912951749633876928" at="1707,165,1708,95" concept="7" />
-      <node id="4912951749633883881" at="1708,95,1709,8" concept="7" />
-      <node id="4912951749633888702" at="1709,8,1710,154" concept="7" />
-      <node id="4912951749633895745" at="1710,154,1711,126" concept="7" />
-      <node id="5680938682774241642" at="1711,126,1712,85" concept="6" />
-      <node id="4912951749633709512" at="1936,56,1937,56" concept="1" />
-      <node id="4912951749633709512" at="1985,15,1986,59" concept="6" />
-      <node id="2409421742521905596" at="3101,54,3102,54" concept="1" />
-      <node id="2409421742521905596" at="3147,15,3148,58" concept="6" />
-      <node id="4912951749633721708" at="3196,55,3197,55" concept="1" />
-      <node id="4912951749633723518" at="3197,55,3198,55" concept="1" />
-      <node id="4912951749633721708" at="3252,16,3253,65" concept="6" />
-      <node id="4912951749633723518" at="3254,16,3255,65" concept="6" />
-      <node id="4912951749633709512" at="1138,0,1141,0" concept="9" trace="sourceNodeQuery_6_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="4912951749633721708" at="1249,0,1252,0" concept="9" trace="templateArgumentQuery_6_0#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="4912951749633723518" at="1252,0,1255,0" concept="9" trace="templateArgumentQuery_6_1#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="8706695667515546529" at="1689,173,1692,9" concept="3" />
-      <node id="6859736767834858567" at="1671,111,1675,5" concept="3" />
-      <node id="8706695667515546465" at="1682,78,1686,7" concept="3" />
-      <node id="6859736767834858600" at="1698,0,1702,5" concept="3" />
-      <node id="8706695667515546440" at="1687,69,1696,7" concept="11" />
-      <node id="5680938682774241650" at="1679,62,1697,5" concept="3" />
-      <node id="6859736767834869981" at="1670,0,1714,0" concept="9" trace="varMacro_Value_6_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
-      <scope id="4912951749633709513" at="1138,92,1139,80" />
-      <scope id="4912951749633721708" at="1249,90,1250,30" />
-      <scope id="4912951749633723518" at="1252,90,1253,80" />
-      <scope id="8706695667515546530" at="1690,26,1691,73" />
-      <scope id="4912951749633709512" at="1985,15,1986,59" />
-      <scope id="2409421742521905596" at="3147,15,3148,58" />
-      <scope id="4912951749633721708" at="3252,16,3253,65" />
-      <scope id="4912951749633723518" at="3254,16,3255,65" />
-      <scope id="6859736767834858568" at="1672,26,1674,18" />
-      <scope id="8706695667515546466" at="1683,28,1685,145" />
-      <scope id="6859736767834858601" at="1699,29,1701,170" />
-      <scope id="4912951749633709512" at="1138,0,1141,0">
+      <node id="4912951749633709726" at="1144,92,1145,80" concept="6" />
+      <node id="4912951749633721708" at="1255,90,1256,30" concept="6" />
+      <node id="4912951749633723518" at="1258,90,1259,80" concept="6" />
+      <node id="6859736767834858559" at="1676,78,1677,111" concept="5" />
+      <node id="6859736767834858569" at="1678,26,1679,82" concept="1" />
+      <node id="6859736767834858575" at="1679,82,1680,18" concept="6" />
+      <node id="6859736767834858580" at="1681,5,1682,87" concept="5" />
+      <node id="6859736767834858587" at="1682,87,1683,88" concept="5" />
+      <node id="5680938682774241679" at="1683,88,1684,0" concept="8" />
+      <node id="5680938682774241505" at="1684,0,1685,62" concept="5" />
+      <node id="8706695667515547271" at="1686,29,1687,49" concept="5" />
+      <node id="8706695667515546432" at="1687,49,1688,78" concept="5" />
+      <node id="8706695667515547279" at="1689,28,1690,113" concept="1" />
+      <node id="8706695667515546474" at="1690,113,1691,145" concept="1" />
+      <node id="8706695667515547199" at="1692,7,1693,69" concept="5" />
+      <node id="5680938682774242053" at="1694,31,1695,173" concept="5" />
+      <node id="8706695667515554155" at="1696,26,1697,73" concept="6" />
+      <node id="8706695667515546520" at="1698,9,1699,0" concept="8" />
+      <node id="8706695667515554221" at="1699,0,1700,122" concept="1" />
+      <node id="8706695667515546522" at="1700,122,1701,145" concept="1" />
+      <node id="5680938682774241681" at="1703,5,1704,0" concept="8" />
+      <node id="6859736767834858602" at="1705,29,1706,215" concept="1" />
+      <node id="6859736767834858616" at="1706,215,1707,170" concept="6" />
+      <node id="4912951749633834185" at="1708,5,1709,160" concept="7" />
+      <node id="4912951749633841219" at="1709,160,1710,162" concept="7" />
+      <node id="4912951749633855316" at="1710,162,1711,130" concept="7" />
+      <node id="4912951749633867306" at="1711,130,1712,158" concept="7" />
+      <node id="4912951749633872115" at="1712,158,1713,165" concept="7" />
+      <node id="4912951749633876928" at="1713,165,1714,95" concept="7" />
+      <node id="4912951749633883881" at="1714,95,1715,8" concept="7" />
+      <node id="4912951749633888702" at="1715,8,1716,154" concept="7" />
+      <node id="4912951749633895745" at="1716,154,1717,126" concept="7" />
+      <node id="5680938682774241642" at="1717,126,1718,85" concept="6" />
+      <node id="4912951749633709512" at="1942,56,1943,56" concept="1" />
+      <node id="4912951749633709512" at="1991,15,1992,59" concept="6" />
+      <node id="2409421742521905596" at="3113,54,3114,54" concept="1" />
+      <node id="2409421742521905596" at="3159,15,3160,58" concept="6" />
+      <node id="4912951749633721708" at="3208,55,3209,55" concept="1" />
+      <node id="4912951749633723518" at="3209,55,3210,55" concept="1" />
+      <node id="4912951749633721708" at="3264,16,3265,65" concept="6" />
+      <node id="4912951749633723518" at="3266,16,3267,65" concept="6" />
+      <node id="4912951749633709512" at="1144,0,1147,0" concept="9" trace="sourceNodeQuery_6_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="4912951749633721708" at="1255,0,1258,0" concept="9" trace="templateArgumentQuery_6_0#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="4912951749633723518" at="1258,0,1261,0" concept="9" trace="templateArgumentQuery_6_1#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="8706695667515546529" at="1695,173,1698,9" concept="3" />
+      <node id="6859736767834858567" at="1677,111,1681,5" concept="3" />
+      <node id="8706695667515546465" at="1688,78,1692,7" concept="3" />
+      <node id="6859736767834858600" at="1704,0,1708,5" concept="3" />
+      <node id="8706695667515546440" at="1693,69,1702,7" concept="11" />
+      <node id="5680938682774241650" at="1685,62,1703,5" concept="3" />
+      <node id="6859736767834869981" at="1676,0,1720,0" concept="9" trace="varMacro_Value_6_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <scope id="4912951749633709513" at="1144,92,1145,80" />
+      <scope id="4912951749633721708" at="1255,90,1256,30" />
+      <scope id="4912951749633723518" at="1258,90,1259,80" />
+      <scope id="8706695667515546530" at="1696,26,1697,73" />
+      <scope id="4912951749633709512" at="1991,15,1992,59" />
+      <scope id="2409421742521905596" at="3159,15,3160,58" />
+      <scope id="4912951749633721708" at="3264,16,3265,65" />
+      <scope id="4912951749633723518" at="3266,16,3267,65" />
+      <scope id="6859736767834858568" at="1678,26,1680,18" />
+      <scope id="8706695667515546466" at="1689,28,1691,145" />
+      <scope id="6859736767834858601" at="1705,29,1707,170" />
+      <scope id="4912951749633709512" at="1144,0,1147,0">
         <var name="_context" id="4912951749633709512" />
       </scope>
-      <scope id="4912951749633721708" at="1249,0,1252,0">
+      <scope id="4912951749633721708" at="1255,0,1258,0">
         <var name="_context" id="4912951749633721708" />
       </scope>
-      <scope id="4912951749633723518" at="1252,0,1255,0">
+      <scope id="4912951749633723518" at="1258,0,1261,0">
         <var name="_context" id="4912951749633723518" />
       </scope>
-      <scope id="8706695667515546442" at="1688,31,1695,145">
+      <scope id="8706695667515546442" at="1694,31,1701,145">
         <var name="res" id="5680938682774242054" />
       </scope>
-      <scope id="5680938682774241651" at="1680,29,1696,7">
+      <scope id="5680938682774241651" at="1686,29,1702,7">
         <var name="containingRoot" id="8706695667515547200" />
         <var name="current" id="8706695667515546433" />
         <var name="suffix" id="8706695667515547272" />
       </scope>
-      <scope id="6859736767834869982" at="1670,78,1712,85">
+      <scope id="6859736767834869982" at="1676,78,1718,85">
         <var name="helper" id="6859736767834858581" />
         <var name="layoutNode" id="6859736767834858588" />
         <var name="path" id="5680938682774241506" />
         <var name="project" id="6859736767834858560" />
       </scope>
-      <scope id="6859736767834869981" at="1670,0,1714,0">
+      <scope id="6859736767834869981" at="1676,0,1720,0">
         <var name="_context" id="6859736767834869981" />
       </scope>
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/763829979705923341">
     <file name="QueriesGenerated.java">
-      <node id="763829979705979632" at="695,89,696,117" concept="7" />
-      <node id="763829979705979634" at="696,117,697,130" concept="7" />
-      <node id="763829979705979636" at="697,130,698,44" concept="7" />
-      <node id="763829979705979638" at="698,44,699,67" concept="6" />
-      <node id="763829979706250010" at="701,89,702,56" concept="6" />
-      <node id="763829979705940745" at="842,94,843,30" concept="6" />
-      <node id="763829979706070745" at="1515,105,1516,67" concept="5" />
-      <node id="763829979706112244" at="1517,78,1518,203" concept="5" />
-      <node id="763829979706114138" at="1518,203,1519,58" concept="1" />
-      <node id="763829979706093514" at="1519,58,1520,46" concept="1" />
-      <node id="763829979706061764" at="1521,5,1522,14" concept="6" />
-      <node id="763829979705947006" at="1524,105,1525,63" concept="6" />
-      <node id="763829979706061757" at="2077,58,2078,57" concept="1" />
-      <node id="763829979705947004" at="2078,57,2079,57" concept="1" />
-      <node id="763829979706061757" at="2203,16,2204,88" concept="6" />
-      <node id="763829979705947004" at="2205,16,2206,88" concept="6" />
-      <node id="763829979705979629" at="2348,191,2349,199" concept="1" />
-      <node id="763829979706038683" at="2349,199,2350,194" concept="1" />
-      <node id="763829979705979629" at="2642,17,2643,67" concept="6" />
-      <node id="763829979706038683" at="2644,17,2645,67" concept="6" />
-      <node id="763829979705940623" at="3030,59,3031,59" concept="1" />
-      <node id="763829979705940623" at="3076,16,3077,71" concept="6" />
-      <node id="763829979706038684" at="701,0,704,0" concept="9" trace="propertyMacro_GetValue_13_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="763829979705940624" at="842,0,845,0" concept="9" trace="referenceMacro_GetReferent_13_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="763829979705947004" at="1524,0,1527,0" concept="9" trace="sourceNodesQuery_13_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="763829979706088272" at="1516,67,1521,5" concept="2" />
-      <node id="763829979705979630" at="695,0,701,0" concept="9" trace="propertyMacro_GetValue_13_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="763829979706061757" at="1515,0,1524,0" concept="9" trace="sourceNodesQuery_13_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <scope id="763829979706038685" at="701,89,702,56" />
-      <scope id="763829979705940625" at="842,94,843,30" />
-      <scope id="763829979705947005" at="1524,105,1525,63" />
-      <scope id="763829979706061757" at="2203,16,2204,88" />
-      <scope id="763829979705947004" at="2205,16,2206,88" />
-      <scope id="763829979705979629" at="2642,17,2643,67" />
-      <scope id="763829979706038683" at="2644,17,2645,67" />
-      <scope id="763829979705940623" at="3076,16,3077,71" />
-      <scope id="763829979706038684" at="701,0,704,0">
+      <node id="763829979705979632" at="698,89,699,117" concept="7" />
+      <node id="763829979705979634" at="699,117,700,130" concept="7" />
+      <node id="763829979705979636" at="700,130,701,44" concept="7" />
+      <node id="763829979705979638" at="701,44,702,67" concept="6" />
+      <node id="763829979706250010" at="704,89,705,56" concept="6" />
+      <node id="763829979705940745" at="845,94,846,30" concept="6" />
+      <node id="763829979706070745" at="1521,105,1522,67" concept="5" />
+      <node id="763829979706112244" at="1523,78,1524,203" concept="5" />
+      <node id="763829979706114138" at="1524,203,1525,58" concept="1" />
+      <node id="763829979706093514" at="1525,58,1526,46" concept="1" />
+      <node id="763829979706061764" at="1527,5,1528,14" concept="6" />
+      <node id="763829979705947006" at="1530,105,1531,63" concept="6" />
+      <node id="763829979706061757" at="2083,58,2084,57" concept="1" />
+      <node id="763829979705947004" at="2084,57,2085,57" concept="1" />
+      <node id="763829979706061757" at="2209,16,2210,88" concept="6" />
+      <node id="763829979705947004" at="2211,16,2212,88" concept="6" />
+      <node id="763829979705979629" at="2355,191,2356,199" concept="1" />
+      <node id="763829979706038683" at="2356,199,2357,194" concept="1" />
+      <node id="763829979705979629" at="2651,17,2652,67" concept="6" />
+      <node id="763829979706038683" at="2653,17,2654,67" concept="6" />
+      <node id="763829979705940623" at="3042,59,3043,59" concept="1" />
+      <node id="763829979705940623" at="3088,16,3089,71" concept="6" />
+      <node id="763829979706038684" at="704,0,707,0" concept="9" trace="propertyMacro_GetValue_13_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="763829979705940624" at="845,0,848,0" concept="9" trace="referenceMacro_GetReferent_13_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="763829979705947004" at="1530,0,1533,0" concept="9" trace="sourceNodesQuery_13_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="763829979706088272" at="1522,67,1527,5" concept="2" />
+      <node id="763829979705979630" at="698,0,704,0" concept="9" trace="propertyMacro_GetValue_13_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="763829979706061757" at="1521,0,1530,0" concept="9" trace="sourceNodesQuery_13_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <scope id="763829979706038685" at="704,89,705,56" />
+      <scope id="763829979705940625" at="845,94,846,30" />
+      <scope id="763829979705947005" at="1530,105,1531,63" />
+      <scope id="763829979706061757" at="2209,16,2210,88" />
+      <scope id="763829979705947004" at="2211,16,2212,88" />
+      <scope id="763829979705979629" at="2651,17,2652,67" />
+      <scope id="763829979706038683" at="2653,17,2654,67" />
+      <scope id="763829979705940623" at="3088,16,3089,71" />
+      <scope id="763829979706038684" at="704,0,707,0">
         <var name="_context" id="763829979706038684" />
       </scope>
-      <scope id="763829979705940624" at="842,0,845,0">
+      <scope id="763829979705940624" at="845,0,848,0">
         <var name="_context" id="763829979705940624" />
       </scope>
-      <scope id="763829979706088274" at="1517,78,1520,46">
+      <scope id="763829979706088274" at="1523,78,1526,46">
         <var name="e" id="763829979706112245" />
       </scope>
-      <scope id="763829979705947004" at="1524,0,1527,0">
+      <scope id="763829979705947004" at="1530,0,1533,0">
         <var name="_context" id="763829979705947004" />
       </scope>
-      <scope id="763829979705979631" at="695,89,699,67" />
-      <scope id="763829979706088272" at="1516,67,1521,5">
+      <scope id="763829979705979631" at="698,89,702,67" />
+      <scope id="763829979706088272" at="1522,67,1527,5">
         <var name="cpe" id="763829979706088275" />
       </scope>
-      <scope id="763829979705979630" at="695,0,701,0">
+      <scope id="763829979705979630" at="698,0,704,0">
         <var name="_context" id="763829979705979630" />
       </scope>
-      <scope id="763829979706061758" at="1515,105,1522,14">
+      <scope id="763829979706061758" at="1521,105,1528,14">
         <var name="rv" id="763829979706070748" />
       </scope>
-      <scope id="763829979706061757" at="1515,0,1524,0">
+      <scope id="763829979706061757" at="1521,0,1530,0">
         <var name="_context" id="763829979706061757" />
       </scope>
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/763829979708310792">
     <file name="QueriesGenerated.java">
-      <node id="763829979708348319" at="1180,93,1181,120" concept="6" />
-      <node id="763829979719155272" at="1183,93,1184,75" concept="6" />
-      <node id="763829979708348317" at="1949,56,1950,55" concept="1" />
-      <node id="763829979719155265" at="1950,55,1951,55" concept="1" />
-      <node id="763829979708348317" at="2011,16,2012,60" concept="6" />
-      <node id="763829979719155265" at="2013,16,2014,60" concept="6" />
-      <node id="763829979708348317" at="1180,0,1183,0" concept="9" trace="sourceNodeQuery_14_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="763829979719155265" at="1183,0,1186,0" concept="9" trace="sourceNodeQuery_14_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="763829979708348318" at="1180,93,1181,120" />
-      <scope id="763829979719155266" at="1183,93,1184,75" />
-      <scope id="763829979708348317" at="2011,16,2012,60" />
-      <scope id="763829979719155265" at="2013,16,2014,60" />
-      <scope id="763829979708348317" at="1180,0,1183,0">
+      <node id="763829979708348319" at="1186,93,1187,120" concept="6" />
+      <node id="763829979719155272" at="1189,93,1190,75" concept="6" />
+      <node id="763829979708348317" at="1955,56,1956,55" concept="1" />
+      <node id="763829979719155265" at="1956,55,1957,55" concept="1" />
+      <node id="763829979708348317" at="2017,16,2018,60" concept="6" />
+      <node id="763829979719155265" at="2019,16,2020,60" concept="6" />
+      <node id="763829979708348317" at="1186,0,1189,0" concept="9" trace="sourceNodeQuery_14_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="763829979719155265" at="1189,0,1192,0" concept="9" trace="sourceNodeQuery_14_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="763829979708348318" at="1186,93,1187,120" />
+      <scope id="763829979719155266" at="1189,93,1190,75" />
+      <scope id="763829979708348317" at="2017,16,2018,60" />
+      <scope id="763829979719155265" at="2019,16,2020,60" />
+      <scope id="763829979708348317" at="1186,0,1189,0">
         <var name="_context" id="763829979708348317" />
       </scope>
-      <scope id="763829979719155265" at="1183,0,1186,0">
+      <scope id="763829979719155265" at="1189,0,1192,0">
         <var name="_context" id="763829979719155265" />
       </scope>
     </file>
   </root>
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/763829979708328375">
     <file name="QueriesGenerated.java">
-      <node id="763829979708401261" at="1186,93,1187,120" concept="6" />
-      <node id="763829979708401259" at="1951,55,1952,55" concept="1" />
-      <node id="763829979708401259" at="2015,16,2016,60" concept="6" />
-      <node id="763829979708401259" at="1186,0,1189,0" concept="9" trace="sourceNodeQuery_15_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <scope id="763829979708401260" at="1186,93,1187,120" />
-      <scope id="763829979708401259" at="2015,16,2016,60" />
-      <scope id="763829979708401259" at="1186,0,1189,0">
+      <node id="763829979708401261" at="1192,93,1193,120" concept="6" />
+      <node id="763829979708401259" at="1957,55,1958,55" concept="1" />
+      <node id="763829979708401259" at="2021,16,2022,60" concept="6" />
+      <node id="763829979708401259" at="1192,0,1195,0" concept="9" trace="sourceNodeQuery_15_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <scope id="763829979708401260" at="1192,93,1193,120" />
+      <scope id="763829979708401259" at="2021,16,2022,60" />
+      <scope id="763829979708401259" at="1192,0,1195,0">
         <var name="_context" id="763829979708401259" />
       </scope>
     </file>
@@ -3120,103 +3138,103 @@
       <node id="1238980147630114299" at="339,88,340,133" concept="6" />
       <node id="6136186284559414613" at="342,88,343,133" concept="6" />
       <node id="4031822141866299213" at="345,88,346,94" concept="6" />
-      <node id="7753763219109706784" at="824,93,825,76" concept="6" />
-      <node id="4031822141866832075" at="827,93,828,118" concept="6" />
-      <node id="7753763219109750700" at="910,78,911,247" concept="6" />
-      <node id="7753763219109811958" at="913,78,914,245" concept="6" />
-      <node id="6136186284559414543" at="916,78,917,247" concept="6" />
-      <node id="6136186284559414569" at="919,78,920,245" concept="6" />
-      <node id="1241280061045770602" at="1141,92,1142,76" concept="6" />
-      <node id="1241280061045776348" at="1144,92,1145,76" concept="6" />
-      <node id="1241280061045081250" at="1147,92,1148,120" concept="7" />
-      <node id="1241280061045093363" at="1148,120,1149,125" concept="7" />
-      <node id="1241280061045094347" at="1149,125,1150,113" concept="7" />
-      <node id="1241280061045074210" at="1150,113,1151,120" concept="6" />
-      <node id="7753544965996903197" at="1192,90,1193,130" concept="6" />
-      <node id="1241280061045657510" at="1231,90,1232,193" concept="6" />
-      <node id="763829979706157118" at="1234,90,1235,25" concept="6" />
-      <node id="1241280061045610327" at="1237,90,1238,84" concept="6" />
-      <node id="1241280061045658611" at="1240,90,1241,193" concept="6" />
-      <node id="6136186284559414533" at="1243,90,1244,25" concept="6" />
-      <node id="1241280061046504134" at="1246,90,1247,130" concept="6" />
-      <node id="7753763219109750715" at="1384,104,1385,131" concept="6" />
-      <node id="7753763219109811973" at="1387,104,1388,129" concept="6" />
-      <node id="3944422889391638055" at="1390,104,1391,176" concept="6" />
-      <node id="6136186284559414558" at="1393,104,1394,131" concept="6" />
-      <node id="6136186284559414584" at="1396,104,1397,129" concept="6" />
-      <node id="4031822141866304314" at="1399,104,1400,125" concept="6" />
-      <node id="4031822141866302970" at="1402,104,1403,80" concept="6" />
-      <node id="8505527876123794257" at="1567,86,1568,207" concept="1" />
-      <node id="4031822141866304307" at="1714,78,1715,30" concept="6" />
-      <node id="7753544965996882283" at="1797,55,1798,56" concept="1" />
-      <node id="4031822141866244864" at="1798,56,1799,56" concept="1" />
-      <node id="4031822141866291778" at="1799,56,1800,56" concept="1" />
-      <node id="7753544965996882283" at="1821,15,1822,58" concept="6" />
-      <node id="4031822141866244864" at="1823,15,1824,58" concept="6" />
-      <node id="4031822141866291778" at="1825,15,1826,58" concept="6" />
-      <node id="1241280061045769870" at="1937,56,1938,56" concept="1" />
-      <node id="1241280061045775606" at="1938,56,1939,56" concept="1" />
-      <node id="1241280061045074208" at="1939,56,1940,56" concept="1" />
-      <node id="1241280061045769870" at="1987,15,1988,59" concept="6" />
-      <node id="1241280061045775606" at="1989,16,1990,59" concept="6" />
-      <node id="1241280061045074208" at="1991,16,1992,59" concept="6" />
-      <node id="7753763219109750713" at="2052,58,2053,58" concept="1" />
-      <node id="7753763219109811971" at="2053,58,2054,58" concept="1" />
-      <node id="3944422889391638053" at="2054,58,2055,58" concept="1" />
-      <node id="6136186284559414556" at="2055,58,2056,58" concept="1" />
-      <node id="6136186284559414582" at="2056,58,2057,58" concept="1" />
-      <node id="4031822141866304312" at="2057,58,2058,58" concept="1" />
-      <node id="4031822141866302968" at="2058,58,2059,58" concept="1" />
-      <node id="7753763219109750713" at="2153,16,2154,87" concept="6" />
-      <node id="7753763219109811971" at="2155,16,2156,87" concept="6" />
-      <node id="3944422889391638053" at="2157,16,2158,87" concept="6" />
-      <node id="6136186284559414556" at="2159,16,2160,87" concept="6" />
-      <node id="6136186284559414582" at="2161,16,2162,87" concept="6" />
-      <node id="4031822141866304312" at="2163,16,2164,87" concept="6" />
-      <node id="4031822141866302968" at="2165,16,2166,87" concept="6" />
-      <node id="7753763219109706788" at="2252,194,2253,200" concept="1" />
-      <node id="1238980147630114296" at="2253,200,2254,194" concept="1" />
-      <node id="6136186284559414610" at="2254,194,2255,194" concept="1" />
-      <node id="4031822141866299187" at="2255,194,2256,200" concept="1" />
-      <node id="7753763219109706788" at="2450,16,2451,66" concept="6" />
-      <node id="1238980147630114296" at="2452,16,2453,66" concept="6" />
-      <node id="6136186284559414610" at="2454,16,2455,66" concept="6" />
-      <node id="4031822141866299187" at="2456,16,2457,66" concept="6" />
-      <node id="7753763219109750697" at="2730,57,2731,57" concept="1" />
-      <node id="7753763219109811955" at="2731,57,2732,57" concept="1" />
-      <node id="6136186284559414540" at="2732,57,2733,57" concept="1" />
-      <node id="6136186284559414566" at="2733,57,2734,57" concept="1" />
-      <node id="7753763219109750697" at="2840,16,2841,61" concept="6" />
-      <node id="7753763219109811955" at="2842,16,2843,61" concept="6" />
-      <node id="6136186284559414540" at="2844,16,2845,61" concept="6" />
-      <node id="6136186284559414566" at="2846,16,2847,61" concept="6" />
-      <node id="1238980147630114159" at="2977,58,2978,58" concept="1" />
-      <node id="6136186284559394575" at="2978,58,2979,58" concept="1" />
-      <node id="1238980147630114159" at="3002,15,3003,58" concept="6" />
-      <node id="6136186284559394575" at="3004,15,3005,58" concept="6" />
-      <node id="7753763219109706781" at="3024,63,3025,61" concept="1" />
-      <node id="4031822141866301981" at="3025,61,3026,60" concept="1" />
-      <node id="7753763219109706781" at="3064,15,3065,70" concept="6" />
-      <node id="4031822141866301981" at="3066,15,3067,70" concept="6" />
-      <node id="4031822141866304303" at="3102,54,3103,55" concept="1" />
-      <node id="4031822141866304303" at="3149,16,3150,58" concept="6" />
-      <node id="7753544965996903194" at="3177,3,3178,54" concept="1" />
-      <node id="1241280061045657510" at="3190,55,3191,55" concept="1" />
-      <node id="763829979706157118" at="3191,55,3192,54" concept="1" />
-      <node id="1241280061045610327" at="3192,54,3193,55" concept="1" />
-      <node id="1241280061045658611" at="3193,55,3194,55" concept="1" />
-      <node id="6136186284559414533" at="3194,55,3195,55" concept="1" />
-      <node id="1241280061046504134" at="3195,55,3196,55" concept="1" />
-      <node id="7753544965996903194" at="3214,15,3215,65" concept="6" />
-      <node id="1241280061045657510" at="3240,16,3241,65" concept="6" />
-      <node id="763829979706157118" at="3242,16,3243,65" concept="6" />
-      <node id="1241280061045610327" at="3244,16,3245,65" concept="6" />
-      <node id="1241280061045658611" at="3246,16,3247,65" concept="6" />
-      <node id="6136186284559414533" at="3248,16,3249,65" concept="6" />
-      <node id="1241280061046504134" at="3250,16,3251,65" concept="6" />
-      <node id="3747750384908360402" at="3266,54,3267,54" concept="1" />
-      <node id="3747750384908360402" at="3294,15,3295,53" concept="1" />
-      <node id="3747750384908360402" at="3295,53,3296,17" concept="6" />
+      <node id="7753763219109706784" at="827,93,828,76" concept="6" />
+      <node id="4031822141866832075" at="830,93,831,118" concept="6" />
+      <node id="7753763219109750700" at="913,78,914,247" concept="6" />
+      <node id="7753763219109811958" at="916,78,917,245" concept="6" />
+      <node id="6136186284559414543" at="919,78,920,247" concept="6" />
+      <node id="6136186284559414569" at="922,78,923,245" concept="6" />
+      <node id="1241280061045770602" at="1147,92,1148,76" concept="6" />
+      <node id="1241280061045776348" at="1150,92,1151,76" concept="6" />
+      <node id="1241280061045081250" at="1153,92,1154,120" concept="7" />
+      <node id="1241280061045093363" at="1154,120,1155,125" concept="7" />
+      <node id="1241280061045094347" at="1155,125,1156,113" concept="7" />
+      <node id="1241280061045074210" at="1156,113,1157,120" concept="6" />
+      <node id="7753544965996903197" at="1198,90,1199,130" concept="6" />
+      <node id="1241280061045657510" at="1237,90,1238,193" concept="6" />
+      <node id="763829979706157118" at="1240,90,1241,25" concept="6" />
+      <node id="1241280061045610327" at="1243,90,1244,84" concept="6" />
+      <node id="1241280061045658611" at="1246,90,1247,193" concept="6" />
+      <node id="6136186284559414533" at="1249,90,1250,25" concept="6" />
+      <node id="1241280061046504134" at="1252,90,1253,130" concept="6" />
+      <node id="7753763219109750715" at="1390,104,1391,131" concept="6" />
+      <node id="7753763219109811973" at="1393,104,1394,129" concept="6" />
+      <node id="3944422889391638055" at="1396,104,1397,176" concept="6" />
+      <node id="6136186284559414558" at="1399,104,1400,131" concept="6" />
+      <node id="6136186284559414584" at="1402,104,1403,129" concept="6" />
+      <node id="4031822141866304314" at="1405,104,1406,125" concept="6" />
+      <node id="4031822141866302970" at="1408,104,1409,80" concept="6" />
+      <node id="8505527876123794257" at="1573,86,1574,207" concept="1" />
+      <node id="4031822141866304307" at="1720,78,1721,30" concept="6" />
+      <node id="7753544965996882283" at="1803,55,1804,56" concept="1" />
+      <node id="4031822141866244864" at="1804,56,1805,56" concept="1" />
+      <node id="4031822141866291778" at="1805,56,1806,56" concept="1" />
+      <node id="7753544965996882283" at="1827,15,1828,58" concept="6" />
+      <node id="4031822141866244864" at="1829,15,1830,58" concept="6" />
+      <node id="4031822141866291778" at="1831,15,1832,58" concept="6" />
+      <node id="1241280061045769870" at="1943,56,1944,56" concept="1" />
+      <node id="1241280061045775606" at="1944,56,1945,56" concept="1" />
+      <node id="1241280061045074208" at="1945,56,1946,56" concept="1" />
+      <node id="1241280061045769870" at="1993,15,1994,59" concept="6" />
+      <node id="1241280061045775606" at="1995,16,1996,59" concept="6" />
+      <node id="1241280061045074208" at="1997,16,1998,59" concept="6" />
+      <node id="7753763219109750713" at="2058,58,2059,58" concept="1" />
+      <node id="7753763219109811971" at="2059,58,2060,58" concept="1" />
+      <node id="3944422889391638053" at="2060,58,2061,58" concept="1" />
+      <node id="6136186284559414556" at="2061,58,2062,58" concept="1" />
+      <node id="6136186284559414582" at="2062,58,2063,58" concept="1" />
+      <node id="4031822141866304312" at="2063,58,2064,58" concept="1" />
+      <node id="4031822141866302968" at="2064,58,2065,58" concept="1" />
+      <node id="7753763219109750713" at="2159,16,2160,87" concept="6" />
+      <node id="7753763219109811971" at="2161,16,2162,87" concept="6" />
+      <node id="3944422889391638053" at="2163,16,2164,87" concept="6" />
+      <node id="6136186284559414556" at="2165,16,2166,87" concept="6" />
+      <node id="6136186284559414582" at="2167,16,2168,87" concept="6" />
+      <node id="4031822141866304312" at="2169,16,2170,87" concept="6" />
+      <node id="4031822141866302968" at="2171,16,2172,87" concept="6" />
+      <node id="7753763219109706788" at="2258,194,2259,200" concept="1" />
+      <node id="1238980147630114296" at="2259,200,2260,194" concept="1" />
+      <node id="6136186284559414610" at="2260,194,2261,194" concept="1" />
+      <node id="4031822141866299187" at="2261,194,2262,200" concept="1" />
+      <node id="7753763219109706788" at="2457,16,2458,66" concept="6" />
+      <node id="1238980147630114296" at="2459,16,2460,66" concept="6" />
+      <node id="6136186284559414610" at="2461,16,2462,66" concept="6" />
+      <node id="4031822141866299187" at="2463,16,2464,66" concept="6" />
+      <node id="7753763219109750697" at="2739,57,2740,57" concept="1" />
+      <node id="7753763219109811955" at="2740,57,2741,57" concept="1" />
+      <node id="6136186284559414540" at="2741,57,2742,57" concept="1" />
+      <node id="6136186284559414566" at="2742,57,2743,57" concept="1" />
+      <node id="7753763219109750697" at="2850,16,2851,61" concept="6" />
+      <node id="7753763219109811955" at="2852,16,2853,61" concept="6" />
+      <node id="6136186284559414540" at="2854,16,2855,61" concept="6" />
+      <node id="6136186284559414566" at="2856,16,2857,61" concept="6" />
+      <node id="1238980147630114159" at="2989,58,2990,58" concept="1" />
+      <node id="6136186284559394575" at="2990,58,2991,58" concept="1" />
+      <node id="1238980147630114159" at="3014,15,3015,58" concept="6" />
+      <node id="6136186284559394575" at="3016,15,3017,58" concept="6" />
+      <node id="7753763219109706781" at="3036,63,3037,61" concept="1" />
+      <node id="4031822141866301981" at="3037,61,3038,60" concept="1" />
+      <node id="7753763219109706781" at="3076,15,3077,70" concept="6" />
+      <node id="4031822141866301981" at="3078,15,3079,70" concept="6" />
+      <node id="4031822141866304303" at="3114,54,3115,55" concept="1" />
+      <node id="4031822141866304303" at="3161,16,3162,58" concept="6" />
+      <node id="7753544965996903194" at="3189,3,3190,54" concept="1" />
+      <node id="1241280061045657510" at="3202,55,3203,55" concept="1" />
+      <node id="763829979706157118" at="3203,55,3204,54" concept="1" />
+      <node id="1241280061045610327" at="3204,54,3205,55" concept="1" />
+      <node id="1241280061045658611" at="3205,55,3206,55" concept="1" />
+      <node id="6136186284559414533" at="3206,55,3207,55" concept="1" />
+      <node id="1241280061046504134" at="3207,55,3208,55" concept="1" />
+      <node id="7753544965996903194" at="3226,15,3227,65" concept="6" />
+      <node id="1241280061045657510" at="3252,16,3253,65" concept="6" />
+      <node id="763829979706157118" at="3254,16,3255,65" concept="6" />
+      <node id="1241280061045610327" at="3256,16,3257,65" concept="6" />
+      <node id="1241280061045658611" at="3258,16,3259,65" concept="6" />
+      <node id="6136186284559414533" at="3260,16,3261,65" concept="6" />
+      <node id="1241280061046504134" at="3262,16,3263,65" concept="6" />
+      <node id="3747750384908360402" at="3278,54,3279,54" concept="1" />
+      <node id="3747750384908360402" at="3306,15,3307,53" concept="1" />
+      <node id="3747750384908360402" at="3307,53,3308,17" concept="6" />
       <node id="6136186284559394576" at="156,0,159,0" concept="9" trace="rule_Condition_7_1#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
       <node id="7753544965996882285" at="159,0,162,0" concept="9" trace="rule_Condition_7_2#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
       <node id="4031822141866295173" at="170,0,173,0" concept="9" trace="rule_Condition_7_4#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
@@ -3224,32 +3242,32 @@
       <node id="1238980147630114297" at="339,0,342,0" concept="9" trace="propertyMacro_GetValue_7_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="6136186284559414611" at="342,0,345,0" concept="9" trace="propertyMacro_GetValue_7_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="4031822141866299188" at="345,0,348,0" concept="9" trace="propertyMacro_GetValue_7_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="7753763219109706782" at="824,0,827,0" concept="9" trace="referenceMacro_GetReferent_7_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="4031822141866301982" at="827,0,830,0" concept="9" trace="referenceMacro_GetReferent_7_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="7753763219109750698" at="910,0,913,0" concept="9" trace="ifMacro_Condition_7_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7753763219109811956" at="913,0,916,0" concept="9" trace="ifMacro_Condition_7_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6136186284559414541" at="916,0,919,0" concept="9" trace="ifMacro_Condition_7_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6136186284559414567" at="919,0,922,0" concept="9" trace="ifMacro_Condition_7_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1241280061045769870" at="1141,0,1144,0" concept="9" trace="sourceNodeQuery_7_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1241280061045775606" at="1144,0,1147,0" concept="9" trace="sourceNodeQuery_7_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7753544965996903194" at="1192,0,1195,0" concept="9" trace="templateArgumentQuery_7_0#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061045657510" at="1231,0,1234,0" concept="9" trace="templateArgumentQuery_7_1#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="763829979706157118" at="1234,0,1237,0" concept="9" trace="templateArgumentQuery_7_2#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061045610327" at="1237,0,1240,0" concept="9" trace="templateArgumentQuery_7_3#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061045658611" at="1240,0,1243,0" concept="9" trace="templateArgumentQuery_7_4#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="6136186284559414533" at="1243,0,1246,0" concept="9" trace="templateArgumentQuery_7_5#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="1241280061046504134" at="1246,0,1249,0" concept="9" trace="templateArgumentQuery_7_6#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
-      <node id="7753763219109750713" at="1384,0,1387,0" concept="9" trace="sourceNodesQuery_7_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="7753763219109811971" at="1387,0,1390,0" concept="9" trace="sourceNodesQuery_7_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="3944422889391638053" at="1390,0,1393,0" concept="9" trace="sourceNodesQuery_7_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="6136186284559414556" at="1393,0,1396,0" concept="9" trace="sourceNodesQuery_7_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="6136186284559414582" at="1396,0,1399,0" concept="9" trace="sourceNodesQuery_7_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4031822141866304312" at="1399,0,1402,0" concept="9" trace="sourceNodesQuery_7_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4031822141866302968" at="1402,0,1405,0" concept="9" trace="sourceNodesQuery_7_6#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="3747750384908360402" at="1567,0,1570,0" concept="9" trace="mapSrcMacro_post_7_0#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
-      <node id="4031822141866304305" at="1714,0,1717,0" concept="9" trace="varMacro_Value_7_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
+      <node id="7753763219109706782" at="827,0,830,0" concept="9" trace="referenceMacro_GetReferent_7_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="4031822141866301982" at="830,0,833,0" concept="9" trace="referenceMacro_GetReferent_7_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="7753763219109750698" at="913,0,916,0" concept="9" trace="ifMacro_Condition_7_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7753763219109811956" at="916,0,919,0" concept="9" trace="ifMacro_Condition_7_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6136186284559414541" at="919,0,922,0" concept="9" trace="ifMacro_Condition_7_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6136186284559414567" at="922,0,925,0" concept="9" trace="ifMacro_Condition_7_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1241280061045769870" at="1147,0,1150,0" concept="9" trace="sourceNodeQuery_7_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1241280061045775606" at="1150,0,1153,0" concept="9" trace="sourceNodeQuery_7_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7753544965996903194" at="1198,0,1201,0" concept="9" trace="templateArgumentQuery_7_0#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061045657510" at="1237,0,1240,0" concept="9" trace="templateArgumentQuery_7_1#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="763829979706157118" at="1240,0,1243,0" concept="9" trace="templateArgumentQuery_7_2#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061045610327" at="1243,0,1246,0" concept="9" trace="templateArgumentQuery_7_3#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061045658611" at="1246,0,1249,0" concept="9" trace="templateArgumentQuery_7_4#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="6136186284559414533" at="1249,0,1252,0" concept="9" trace="templateArgumentQuery_7_5#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="1241280061046504134" at="1252,0,1255,0" concept="9" trace="templateArgumentQuery_7_6#(Ljetbrains/mps/generator/template/TemplateArgumentContext;)Ljava/lang/Object;" />
+      <node id="7753763219109750713" at="1390,0,1393,0" concept="9" trace="sourceNodesQuery_7_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="7753763219109811971" at="1393,0,1396,0" concept="9" trace="sourceNodesQuery_7_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="3944422889391638053" at="1396,0,1399,0" concept="9" trace="sourceNodesQuery_7_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="6136186284559414556" at="1399,0,1402,0" concept="9" trace="sourceNodesQuery_7_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="6136186284559414582" at="1402,0,1405,0" concept="9" trace="sourceNodesQuery_7_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4031822141866304312" at="1405,0,1408,0" concept="9" trace="sourceNodesQuery_7_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4031822141866302968" at="1408,0,1411,0" concept="9" trace="sourceNodesQuery_7_6#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="3747750384908360402" at="1573,0,1576,0" concept="9" trace="mapSrcMacro_post_7_0#(Ljetbrains/mps/generator/template/MapSrcMacroPostProcContext;)V" />
+      <node id="4031822141866304305" at="1720,0,1723,0" concept="9" trace="varMacro_Value_7_0#(Ljetbrains/mps/generator/template/TemplateVarContext;)Ljava/lang/Object;" />
       <node id="4031822141866289553" at="162,83,167,5" concept="3" />
-      <node id="1241280061045074208" at="1147,0,1153,0" concept="9" trace="sourceNodeQuery_7_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1241280061045074208" at="1153,0,1159,0" concept="9" trace="sourceNodeQuery_7_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
       <node id="6136186284559309049" at="145,121,153,5" concept="3" />
       <node id="4031822141866289524" at="162,0,170,0" concept="9" trace="rule_Condition_7_3#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
       <node id="1238980147630114160" at="144,0,156,0" concept="9" trace="rule_Condition_7_0#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
@@ -3260,64 +3278,64 @@
       <scope id="1238980147630114298" at="339,88,340,133" />
       <scope id="6136186284559414612" at="342,88,343,133" />
       <scope id="4031822141866299189" at="345,88,346,94" />
-      <scope id="7753763219109706783" at="824,93,825,76" />
-      <scope id="4031822141866301983" at="827,93,828,118" />
-      <scope id="7753763219109750699" at="910,78,911,247" />
-      <scope id="7753763219109811957" at="913,78,914,245" />
-      <scope id="6136186284559414542" at="916,78,917,247" />
-      <scope id="6136186284559414568" at="919,78,920,245" />
-      <scope id="1241280061045769871" at="1141,92,1142,76" />
-      <scope id="1241280061045775607" at="1144,92,1145,76" />
-      <scope id="7753544965996903194" at="1192,90,1193,130" />
-      <scope id="1241280061045657510" at="1231,90,1232,193" />
-      <scope id="763829979706157118" at="1234,90,1235,25" />
-      <scope id="1241280061045610327" at="1237,90,1238,84" />
-      <scope id="1241280061045658611" at="1240,90,1241,193" />
-      <scope id="6136186284559414533" at="1243,90,1244,25" />
-      <scope id="1241280061046504134" at="1246,90,1247,130" />
-      <scope id="7753763219109750714" at="1384,104,1385,131" />
-      <scope id="7753763219109811972" at="1387,104,1388,129" />
-      <scope id="3944422889391638054" at="1390,104,1391,176" />
-      <scope id="6136186284559414557" at="1393,104,1394,131" />
-      <scope id="6136186284559414583" at="1396,104,1397,129" />
-      <scope id="4031822141866304313" at="1399,104,1400,125" />
-      <scope id="4031822141866302969" at="1402,104,1403,80" />
-      <scope id="3747750384908360403" at="1567,86,1568,207" />
-      <scope id="4031822141866304306" at="1714,78,1715,30" />
-      <scope id="7753544965996882283" at="1821,15,1822,58" />
-      <scope id="4031822141866244864" at="1823,15,1824,58" />
-      <scope id="4031822141866291778" at="1825,15,1826,58" />
-      <scope id="1241280061045769870" at="1987,15,1988,59" />
-      <scope id="1241280061045775606" at="1989,16,1990,59" />
-      <scope id="1241280061045074208" at="1991,16,1992,59" />
-      <scope id="7753763219109750713" at="2153,16,2154,87" />
-      <scope id="7753763219109811971" at="2155,16,2156,87" />
-      <scope id="3944422889391638053" at="2157,16,2158,87" />
-      <scope id="6136186284559414556" at="2159,16,2160,87" />
-      <scope id="6136186284559414582" at="2161,16,2162,87" />
-      <scope id="4031822141866304312" at="2163,16,2164,87" />
-      <scope id="4031822141866302968" at="2165,16,2166,87" />
-      <scope id="7753763219109706788" at="2450,16,2451,66" />
-      <scope id="1238980147630114296" at="2452,16,2453,66" />
-      <scope id="6136186284559414610" at="2454,16,2455,66" />
-      <scope id="4031822141866299187" at="2456,16,2457,66" />
-      <scope id="7753763219109750697" at="2840,16,2841,61" />
-      <scope id="7753763219109811955" at="2842,16,2843,61" />
-      <scope id="6136186284559414540" at="2844,16,2845,61" />
-      <scope id="6136186284559414566" at="2846,16,2847,61" />
-      <scope id="1238980147630114159" at="3002,15,3003,58" />
-      <scope id="6136186284559394575" at="3004,15,3005,58" />
-      <scope id="7753763219109706781" at="3064,15,3065,70" />
-      <scope id="4031822141866301981" at="3066,15,3067,70" />
-      <scope id="4031822141866304303" at="3149,16,3150,58" />
-      <scope id="7753544965996903194" at="3214,15,3215,65" />
-      <scope id="1241280061045657510" at="3240,16,3241,65" />
-      <scope id="763829979706157118" at="3242,16,3243,65" />
-      <scope id="1241280061045610327" at="3244,16,3245,65" />
-      <scope id="1241280061045658611" at="3246,16,3247,65" />
-      <scope id="6136186284559414533" at="3248,16,3249,65" />
-      <scope id="1241280061046504134" at="3250,16,3251,65" />
-      <scope id="3747750384908360402" at="3294,15,3296,17" />
+      <scope id="7753763219109706783" at="827,93,828,76" />
+      <scope id="4031822141866301983" at="830,93,831,118" />
+      <scope id="7753763219109750699" at="913,78,914,247" />
+      <scope id="7753763219109811957" at="916,78,917,245" />
+      <scope id="6136186284559414542" at="919,78,920,247" />
+      <scope id="6136186284559414568" at="922,78,923,245" />
+      <scope id="1241280061045769871" at="1147,92,1148,76" />
+      <scope id="1241280061045775607" at="1150,92,1151,76" />
+      <scope id="7753544965996903194" at="1198,90,1199,130" />
+      <scope id="1241280061045657510" at="1237,90,1238,193" />
+      <scope id="763829979706157118" at="1240,90,1241,25" />
+      <scope id="1241280061045610327" at="1243,90,1244,84" />
+      <scope id="1241280061045658611" at="1246,90,1247,193" />
+      <scope id="6136186284559414533" at="1249,90,1250,25" />
+      <scope id="1241280061046504134" at="1252,90,1253,130" />
+      <scope id="7753763219109750714" at="1390,104,1391,131" />
+      <scope id="7753763219109811972" at="1393,104,1394,129" />
+      <scope id="3944422889391638054" at="1396,104,1397,176" />
+      <scope id="6136186284559414557" at="1399,104,1400,131" />
+      <scope id="6136186284559414583" at="1402,104,1403,129" />
+      <scope id="4031822141866304313" at="1405,104,1406,125" />
+      <scope id="4031822141866302969" at="1408,104,1409,80" />
+      <scope id="3747750384908360403" at="1573,86,1574,207" />
+      <scope id="4031822141866304306" at="1720,78,1721,30" />
+      <scope id="7753544965996882283" at="1827,15,1828,58" />
+      <scope id="4031822141866244864" at="1829,15,1830,58" />
+      <scope id="4031822141866291778" at="1831,15,1832,58" />
+      <scope id="1241280061045769870" at="1993,15,1994,59" />
+      <scope id="1241280061045775606" at="1995,16,1996,59" />
+      <scope id="1241280061045074208" at="1997,16,1998,59" />
+      <scope id="7753763219109750713" at="2159,16,2160,87" />
+      <scope id="7753763219109811971" at="2161,16,2162,87" />
+      <scope id="3944422889391638053" at="2163,16,2164,87" />
+      <scope id="6136186284559414556" at="2165,16,2166,87" />
+      <scope id="6136186284559414582" at="2167,16,2168,87" />
+      <scope id="4031822141866304312" at="2169,16,2170,87" />
+      <scope id="4031822141866302968" at="2171,16,2172,87" />
+      <scope id="7753763219109706788" at="2457,16,2458,66" />
+      <scope id="1238980147630114296" at="2459,16,2460,66" />
+      <scope id="6136186284559414610" at="2461,16,2462,66" />
+      <scope id="4031822141866299187" at="2463,16,2464,66" />
+      <scope id="7753763219109750697" at="2850,16,2851,61" />
+      <scope id="7753763219109811955" at="2852,16,2853,61" />
+      <scope id="6136186284559414540" at="2854,16,2855,61" />
+      <scope id="6136186284559414566" at="2856,16,2857,61" />
+      <scope id="1238980147630114159" at="3014,15,3015,58" />
+      <scope id="6136186284559394575" at="3016,15,3017,58" />
+      <scope id="7753763219109706781" at="3076,15,3077,70" />
+      <scope id="4031822141866301981" at="3078,15,3079,70" />
+      <scope id="4031822141866304303" at="3161,16,3162,58" />
+      <scope id="7753544965996903194" at="3226,15,3227,65" />
+      <scope id="1241280061045657510" at="3252,16,3253,65" />
+      <scope id="763829979706157118" at="3254,16,3255,65" />
+      <scope id="1241280061045610327" at="3256,16,3257,65" />
+      <scope id="1241280061045658611" at="3258,16,3259,65" />
+      <scope id="6136186284559414533" at="3260,16,3261,65" />
+      <scope id="1241280061046504134" at="3262,16,3263,65" />
+      <scope id="3747750384908360402" at="3306,15,3308,17" />
       <scope id="6136186284559394576" at="156,0,159,0">
         <var name="_context" id="6136186284559394576" />
       </scope>
@@ -3340,84 +3358,84 @@
       <scope id="4031822141866299188" at="345,0,348,0">
         <var name="_context" id="4031822141866299188" />
       </scope>
-      <scope id="7753763219109706782" at="824,0,827,0">
+      <scope id="7753763219109706782" at="827,0,830,0">
         <var name="_context" id="7753763219109706782" />
       </scope>
-      <scope id="4031822141866301982" at="827,0,830,0">
+      <scope id="4031822141866301982" at="830,0,833,0">
         <var name="_context" id="4031822141866301982" />
       </scope>
-      <scope id="7753763219109750698" at="910,0,913,0">
+      <scope id="7753763219109750698" at="913,0,916,0">
         <var name="_context" id="7753763219109750698" />
       </scope>
-      <scope id="7753763219109811956" at="913,0,916,0">
+      <scope id="7753763219109811956" at="916,0,919,0">
         <var name="_context" id="7753763219109811956" />
       </scope>
-      <scope id="6136186284559414541" at="916,0,919,0">
+      <scope id="6136186284559414541" at="919,0,922,0">
         <var name="_context" id="6136186284559414541" />
       </scope>
-      <scope id="6136186284559414567" at="919,0,922,0">
+      <scope id="6136186284559414567" at="922,0,925,0">
         <var name="_context" id="6136186284559414567" />
       </scope>
-      <scope id="1241280061045769870" at="1141,0,1144,0">
+      <scope id="1241280061045769870" at="1147,0,1150,0">
         <var name="_context" id="1241280061045769870" />
       </scope>
-      <scope id="1241280061045775606" at="1144,0,1147,0">
+      <scope id="1241280061045775606" at="1150,0,1153,0">
         <var name="_context" id="1241280061045775606" />
       </scope>
-      <scope id="7753544965996903194" at="1192,0,1195,0">
+      <scope id="7753544965996903194" at="1198,0,1201,0">
         <var name="_context" id="7753544965996903194" />
       </scope>
-      <scope id="1241280061045657510" at="1231,0,1234,0">
+      <scope id="1241280061045657510" at="1237,0,1240,0">
         <var name="_context" id="1241280061045657510" />
       </scope>
-      <scope id="763829979706157118" at="1234,0,1237,0">
+      <scope id="763829979706157118" at="1240,0,1243,0">
         <var name="_context" id="763829979706157118" />
       </scope>
-      <scope id="1241280061045610327" at="1237,0,1240,0">
+      <scope id="1241280061045610327" at="1243,0,1246,0">
         <var name="_context" id="1241280061045610327" />
       </scope>
-      <scope id="1241280061045658611" at="1240,0,1243,0">
+      <scope id="1241280061045658611" at="1246,0,1249,0">
         <var name="_context" id="1241280061045658611" />
       </scope>
-      <scope id="6136186284559414533" at="1243,0,1246,0">
+      <scope id="6136186284559414533" at="1249,0,1252,0">
         <var name="_context" id="6136186284559414533" />
       </scope>
-      <scope id="1241280061046504134" at="1246,0,1249,0">
+      <scope id="1241280061046504134" at="1252,0,1255,0">
         <var name="_context" id="1241280061046504134" />
       </scope>
-      <scope id="7753763219109750713" at="1384,0,1387,0">
+      <scope id="7753763219109750713" at="1390,0,1393,0">
         <var name="_context" id="7753763219109750713" />
       </scope>
-      <scope id="7753763219109811971" at="1387,0,1390,0">
+      <scope id="7753763219109811971" at="1393,0,1396,0">
         <var name="_context" id="7753763219109811971" />
       </scope>
-      <scope id="3944422889391638053" at="1390,0,1393,0">
+      <scope id="3944422889391638053" at="1396,0,1399,0">
         <var name="_context" id="3944422889391638053" />
       </scope>
-      <scope id="6136186284559414556" at="1393,0,1396,0">
+      <scope id="6136186284559414556" at="1399,0,1402,0">
         <var name="_context" id="6136186284559414556" />
       </scope>
-      <scope id="6136186284559414582" at="1396,0,1399,0">
+      <scope id="6136186284559414582" at="1402,0,1405,0">
         <var name="_context" id="6136186284559414582" />
       </scope>
-      <scope id="4031822141866304312" at="1399,0,1402,0">
+      <scope id="4031822141866304312" at="1405,0,1408,0">
         <var name="_context" id="4031822141866304312" />
       </scope>
-      <scope id="4031822141866302968" at="1402,0,1405,0">
+      <scope id="4031822141866302968" at="1408,0,1411,0">
         <var name="_context" id="4031822141866302968" />
       </scope>
-      <scope id="3747750384908360402" at="1567,0,1570,0">
+      <scope id="3747750384908360402" at="1573,0,1576,0">
         <var name="_context" id="3747750384908360402" />
       </scope>
-      <scope id="4031822141866304305" at="1714,0,1717,0">
+      <scope id="4031822141866304305" at="1720,0,1723,0">
         <var name="_context" id="4031822141866304305" />
       </scope>
-      <scope id="1241280061045074209" at="1147,92,1151,120" />
+      <scope id="1241280061045074209" at="1153,92,1157,120" />
       <scope id="6136186284559309051" at="146,136,152,238">
         <var name="solution" id="6136186284559325826" />
       </scope>
       <scope id="4031822141866289525" at="162,83,168,17" />
-      <scope id="1241280061045074208" at="1147,0,1153,0">
+      <scope id="1241280061045074208" at="1153,0,1159,0">
         <var name="_context" id="1241280061045074208" />
       </scope>
       <scope id="4031822141866289524" at="162,0,170,0">
@@ -3481,250 +3499,250 @@
       <node id="5894421362118009148" at="487,89,488,301" concept="6" />
       <node id="781140262678258844" at="490,89,491,306" concept="6" />
       <node id="781140262678264113" at="493,89,494,305" concept="6" />
-      <node id="922958177840045827" at="922,78,923,270" concept="6" />
-      <node id="7753544965996885488" at="925,78,926,279" concept="6" />
-      <node id="2355727383328185335" at="928,78,929,322" concept="6" />
-      <node id="781140262678085922" at="931,78,932,111" concept="6" />
-      <node id="1462305029084462175" at="934,78,935,113" concept="6" />
-      <node id="6845119683729348833" at="937,78,938,117" concept="6" />
-      <node id="6845119683729381207" at="940,78,941,291" concept="6" />
-      <node id="7962467864633131914" at="943,78,944,118" concept="6" />
-      <node id="1084163669516717578" at="946,78,947,114" concept="6" />
-      <node id="1084163669516724487" at="949,78,950,123" concept="6" />
-      <node id="1084163669516726593" at="952,79,953,113" concept="6" />
-      <node id="1084163669516728742" at="955,79,956,109" concept="6" />
-      <node id="1084163669516730934" at="958,79,959,109" concept="6" />
-      <node id="1084163669516733169" at="961,79,962,109" concept="6" />
-      <node id="1084163669516735447" at="964,79,965,109" concept="6" />
-      <node id="6520817392523144237" at="967,79,968,115" concept="6" />
-      <node id="6845119683729389724" at="970,79,971,108" concept="6" />
-      <node id="1938598294982501576" at="973,79,974,107" concept="6" />
-      <node id="1938598294982501975" at="976,79,977,113" concept="6" />
-      <node id="1938598294982499470" at="979,79,980,110" concept="6" />
-      <node id="1938598294982497081" at="982,79,983,110" concept="6" />
-      <node id="781140262677966748" at="985,79,986,111" concept="6" />
-      <node id="4783730913495458307" at="988,79,989,269" concept="6" />
-      <node id="1462305029084461975" at="991,79,992,117" concept="6" />
-      <node id="5053813598678961694" at="994,79,995,310" concept="6" />
-      <node id="1462305029084452925" at="997,79,998,108" concept="6" />
-      <node id="5894421362117318936" at="1000,79,1001,117" concept="6" />
-      <node id="5894421362117649635" at="1003,79,1004,111" concept="6" />
-      <node id="8877724874822463467" at="1006,79,1007,115" concept="6" />
-      <node id="781140262678204261" at="1009,79,1010,112" concept="6" />
-      <node id="5894421362118005966" at="1012,79,1013,110" concept="6" />
-      <node id="781140262678250055" at="1015,79,1016,109" concept="6" />
-      <node id="1938598294988140191" at="1018,79,1019,110" concept="6" />
-      <node id="1938598294988137072" at="1021,79,1022,110" concept="6" />
-      <node id="781140262679960796" at="1024,79,1025,111" concept="6" />
-      <node id="1938598294988146082" at="1027,79,1028,107" concept="6" />
-      <node id="1938598294988149067" at="1030,79,1031,113" concept="6" />
-      <node id="6845119683731096027" at="1033,79,1034,108" concept="6" />
-      <node id="6520817392523151557" at="1036,79,1037,115" concept="6" />
-      <node id="7753544965996885760" at="1153,92,1154,100" concept="6" />
-      <node id="7753544965996885823" at="1156,92,1157,100" concept="6" />
-      <node id="781140262679960786" at="1159,92,1160,101" concept="6" />
-      <node id="1938598294988146072" at="1162,92,1163,97" concept="6" />
-      <node id="1938598294988149057" at="1165,92,1166,103" concept="6" />
-      <node id="6845119683731096017" at="1168,92,1169,98" concept="6" />
-      <node id="772379520212560180" at="1171,92,1172,105" concept="6" />
-      <node id="1462305029084462286" at="1174,92,1175,106" concept="6" />
-      <node id="1462305029084462300" at="1177,92,1178,105" concept="6" />
-      <node id="6845119683729436306" at="1405,104,1406,112" concept="6" />
-      <node id="7753544965996885758" at="1940,56,1941,56" concept="1" />
-      <node id="7753544965996885821" at="1941,56,1942,56" concept="1" />
-      <node id="781140262679960784" at="1942,56,1943,55" concept="1" />
-      <node id="1938598294988146070" at="1943,55,1944,56" concept="1" />
-      <node id="1938598294988149055" at="1944,56,1945,56" concept="1" />
-      <node id="6845119683731096015" at="1945,56,1946,56" concept="1" />
-      <node id="772379520212560178" at="1946,56,1947,55" concept="1" />
-      <node id="1462305029084462284" at="1947,55,1948,56" concept="1" />
-      <node id="1462305029084462298" at="1948,56,1949,56" concept="1" />
-      <node id="7753544965996885758" at="1993,16,1994,59" concept="6" />
-      <node id="7753544965996885821" at="1995,16,1996,59" concept="6" />
-      <node id="781140262679960784" at="1997,16,1998,59" concept="6" />
-      <node id="1938598294988146070" at="1999,16,2000,59" concept="6" />
-      <node id="1938598294988149055" at="2001,16,2002,59" concept="6" />
-      <node id="6845119683731096015" at="2003,16,2004,59" concept="6" />
-      <node id="772379520212560178" at="2005,16,2006,59" concept="6" />
-      <node id="1462305029084462284" at="2007,16,2008,59" concept="6" />
-      <node id="1462305029084462298" at="2009,16,2010,59" concept="6" />
-      <node id="6845119683729431098" at="2059,58,2060,58" concept="1" />
-      <node id="6845119683729431098" at="2167,16,2168,87" concept="6" />
-      <node id="7753544965996882379" at="2256,200,2257,187" concept="1" />
-      <node id="7753544965996883333" at="2257,187,2258,185" concept="1" />
-      <node id="7753544965996885262" at="2258,185,2259,185" concept="1" />
-      <node id="7753544965996885278" at="2259,185,2260,189" concept="1" />
-      <node id="7753544965996885368" at="2260,189,2261,191" concept="1" />
-      <node id="781140262678093901" at="2261,191,2262,192" concept="1" />
-      <node id="781140262678105143" at="2262,192,2263,203" concept="1" />
-      <node id="2355727383328194768" at="2263,203,2264,188" concept="1" />
-      <node id="7753544965996885635" at="2264,188,2265,187" concept="1" />
-      <node id="1462305029084473469" at="2265,187,2266,193" concept="1" />
-      <node id="1462305029084462105" at="2266,193,2267,195" concept="1" />
-      <node id="1462305029084462140" at="2267,195,2268,190" concept="1" />
-      <node id="6845119683729383510" at="2268,190,2269,190" concept="1" />
-      <node id="6845119683729386511" at="2269,190,2270,187" concept="1" />
-      <node id="7962467864633127656" at="2270,187,2271,185" concept="1" />
-      <node id="1462305029084462062" at="2271,185,2272,194" concept="1" />
-      <node id="1084163669516703718" at="2272,194,2273,190" concept="1" />
-      <node id="1084163669516724466" at="2273,190,2274,190" concept="1" />
-      <node id="1084163669516726572" at="2274,190,2275,190" concept="1" />
-      <node id="1084163669516728721" at="2275,190,2276,190" concept="1" />
-      <node id="1084163669516730913" at="2276,190,2277,190" concept="1" />
-      <node id="1084163669516733148" at="2277,190,2278,190" concept="1" />
-      <node id="1084163669516735426" at="2278,190,2279,190" concept="1" />
-      <node id="6845119683729395352" at="2279,190,2280,191" concept="1" />
-      <node id="1938598294982501560" at="2280,191,2281,191" concept="1" />
-      <node id="1938598294982501959" at="2281,191,2282,194" concept="1" />
-      <node id="1462305029084462313" at="2282,194,2283,190" concept="1" />
-      <node id="1462305029084462337" at="2283,190,2284,190" concept="1" />
-      <node id="781140262677966725" at="2284,190,2285,190" concept="1" />
-      <node id="1462305029084462430" at="2285,190,2286,187" concept="1" />
-      <node id="1462305029084462452" at="2286,187,2287,197" concept="1" />
-      <node id="4783730913495463581" at="2287,197,2288,186" concept="1" />
-      <node id="4783730913495430922" at="2288,186,2289,187" concept="1" />
-      <node id="772379520212879620" at="2289,187,2290,192" concept="1" />
-      <node id="781140262678149977" at="2290,192,2291,213" concept="1" />
-      <node id="1462305029084461923" at="2291,213,2292,196" concept="1" />
-      <node id="1462305029084461948" at="2292,196,2293,197" concept="1" />
-      <node id="1462305029084452899" at="2293,197,2294,192" concept="1" />
-      <node id="1462305029084452877" at="2294,192,2295,187" concept="1" />
-      <node id="1462305029084421196" at="2295,187,2296,197" concept="1" />
-      <node id="5894421362117319929" at="2296,197,2297,205" concept="1" />
-      <node id="5894421362117650628" at="2297,205,2298,199" concept="1" />
-      <node id="8877724874822463400" at="2298,199,2299,200" concept="1" />
-      <node id="781140262678199734" at="2299,200,2300,199" concept="1" />
-      <node id="5894421362118006947" at="2300,199,2301,202" concept="1" />
-      <node id="5894421362118007025" at="2301,202,2302,202" concept="1" />
-      <node id="781140262678258087" at="2302,202,2303,238" concept="1" />
-      <node id="781140262678263355" at="2303,238,2304,229" concept="1" />
-      <node id="7753544965996882379" at="2458,16,2459,66" concept="6" />
-      <node id="7753544965996883333" at="2460,16,2461,66" concept="6" />
-      <node id="7753544965996885262" at="2462,16,2463,66" concept="6" />
-      <node id="7753544965996885278" at="2464,16,2465,66" concept="6" />
-      <node id="7753544965996885368" at="2466,16,2467,66" concept="6" />
-      <node id="781140262678093901" at="2468,16,2469,66" concept="6" />
-      <node id="781140262678105143" at="2470,16,2471,66" concept="6" />
-      <node id="2355727383328194768" at="2472,16,2473,66" concept="6" />
-      <node id="7753544965996885635" at="2474,16,2475,66" concept="6" />
-      <node id="1462305029084473469" at="2476,16,2477,66" concept="6" />
-      <node id="1462305029084462105" at="2478,16,2479,67" concept="6" />
-      <node id="1462305029084462140" at="2480,16,2481,67" concept="6" />
-      <node id="6845119683729383510" at="2482,16,2483,67" concept="6" />
-      <node id="6845119683729386511" at="2484,16,2485,67" concept="6" />
-      <node id="7962467864633127656" at="2486,16,2487,67" concept="6" />
-      <node id="1462305029084462062" at="2488,16,2489,67" concept="6" />
-      <node id="1084163669516703718" at="2490,16,2491,67" concept="6" />
-      <node id="1084163669516724466" at="2492,16,2493,67" concept="6" />
-      <node id="1084163669516726572" at="2494,16,2495,67" concept="6" />
-      <node id="1084163669516728721" at="2496,16,2497,67" concept="6" />
-      <node id="1084163669516730913" at="2498,16,2499,67" concept="6" />
-      <node id="1084163669516733148" at="2500,16,2501,67" concept="6" />
-      <node id="1084163669516735426" at="2502,16,2503,67" concept="6" />
-      <node id="6845119683729395352" at="2504,16,2505,67" concept="6" />
-      <node id="1938598294982501560" at="2506,16,2507,67" concept="6" />
-      <node id="1938598294982501959" at="2508,16,2509,67" concept="6" />
-      <node id="1462305029084462313" at="2510,16,2511,67" concept="6" />
-      <node id="1462305029084462337" at="2512,16,2513,67" concept="6" />
-      <node id="781140262677966725" at="2514,16,2515,67" concept="6" />
-      <node id="1462305029084462430" at="2516,16,2517,67" concept="6" />
-      <node id="1462305029084462452" at="2518,16,2519,67" concept="6" />
-      <node id="4783730913495463581" at="2520,16,2521,67" concept="6" />
-      <node id="4783730913495430922" at="2522,16,2523,67" concept="6" />
-      <node id="772379520212879620" at="2524,16,2525,67" concept="6" />
-      <node id="781140262678149977" at="2526,16,2527,67" concept="6" />
-      <node id="1462305029084461923" at="2528,16,2529,67" concept="6" />
-      <node id="1462305029084461948" at="2530,16,2531,67" concept="6" />
-      <node id="1462305029084452899" at="2532,16,2533,67" concept="6" />
-      <node id="1462305029084452877" at="2534,16,2535,67" concept="6" />
-      <node id="1462305029084421196" at="2536,16,2537,67" concept="6" />
-      <node id="5894421362117319929" at="2538,16,2539,67" concept="6" />
-      <node id="5894421362117650628" at="2540,16,2541,67" concept="6" />
-      <node id="8877724874822463400" at="2542,16,2543,67" concept="6" />
-      <node id="781140262678199734" at="2544,16,2545,67" concept="6" />
-      <node id="5894421362118006947" at="2546,16,2547,67" concept="6" />
-      <node id="5894421362118007025" at="2548,16,2549,67" concept="6" />
-      <node id="781140262678258087" at="2550,16,2551,67" concept="6" />
-      <node id="781140262678263355" at="2552,16,2553,67" concept="6" />
-      <node id="922958177840041190" at="2734,57,2735,56" concept="1" />
-      <node id="7753544965996885485" at="2735,56,2736,57" concept="1" />
-      <node id="2355727383328172309" at="2736,57,2737,57" concept="1" />
-      <node id="781140262678082419" at="2737,57,2738,56" concept="1" />
-      <node id="1462305029084462172" at="2738,56,2739,57" concept="1" />
-      <node id="6845119683729348499" at="2739,57,2740,57" concept="1" />
-      <node id="6845119683729380880" at="2740,57,2741,57" concept="1" />
-      <node id="7962467864633127579" at="2741,57,2742,57" concept="1" />
-      <node id="1084163669516716663" at="2742,57,2743,57" concept="1" />
-      <node id="1084163669516724484" at="2743,57,2744,57" concept="1" />
-      <node id="1084163669516726590" at="2744,57,2745,57" concept="1" />
-      <node id="1084163669516728739" at="2745,57,2746,57" concept="1" />
-      <node id="1084163669516730931" at="2746,57,2747,57" concept="1" />
-      <node id="1084163669516733166" at="2747,57,2748,57" concept="1" />
-      <node id="1084163669516735444" at="2748,57,2749,57" concept="1" />
-      <node id="6520817392523143158" at="2749,57,2750,57" concept="1" />
-      <node id="6845119683729389262" at="2750,57,2751,57" concept="1" />
-      <node id="1938598294982501573" at="2751,57,2752,57" concept="1" />
-      <node id="1938598294982501972" at="2752,57,2753,57" concept="1" />
-      <node id="1938598294982492973" at="2753,57,2754,57" concept="1" />
-      <node id="1938598294982493000" at="2754,57,2755,57" concept="1" />
-      <node id="781140262677966745" at="2755,57,2756,56" concept="1" />
-      <node id="4783730913495457059" at="2756,56,2757,57" concept="1" />
-      <node id="1462305029084461972" at="2757,57,2758,57" concept="1" />
-      <node id="5053813598678952392" at="2758,57,2759,57" concept="1" />
-      <node id="1462305029084452922" at="2759,57,2760,57" concept="1" />
-      <node id="5894421362117318859" at="2760,57,2761,57" concept="1" />
-      <node id="5894421362117645772" at="2761,57,2762,57" concept="1" />
-      <node id="8877724874822463464" at="2762,57,2763,57" concept="1" />
-      <node id="781140262678203503" at="2763,57,2764,56" concept="1" />
-      <node id="5894421362118001935" at="2764,56,2765,57" concept="1" />
-      <node id="781140262678249378" at="2765,57,2766,56" concept="1" />
-      <node id="1938598294988139938" at="2766,56,2767,57" concept="1" />
-      <node id="1938598294988136819" at="2767,57,2768,57" concept="1" />
-      <node id="781140262679960793" at="2768,57,2769,56" concept="1" />
-      <node id="1938598294988146079" at="2769,56,2770,57" concept="1" />
-      <node id="1938598294988149064" at="2770,57,2771,57" concept="1" />
-      <node id="6845119683731096024" at="2771,57,2772,57" concept="1" />
-      <node id="6520817392523151294" at="2772,57,2773,57" concept="1" />
-      <node id="922958177840041190" at="2848,16,2849,61" concept="6" />
-      <node id="7753544965996885485" at="2850,16,2851,61" concept="6" />
-      <node id="2355727383328172309" at="2852,16,2853,61" concept="6" />
-      <node id="781140262678082419" at="2854,16,2855,61" concept="6" />
-      <node id="1462305029084462172" at="2856,16,2857,61" concept="6" />
-      <node id="6845119683729348499" at="2858,16,2859,61" concept="6" />
-      <node id="6845119683729380880" at="2860,16,2861,61" concept="6" />
-      <node id="7962467864633127579" at="2862,16,2863,61" concept="6" />
-      <node id="1084163669516716663" at="2864,16,2865,61" concept="6" />
-      <node id="1084163669516724484" at="2866,16,2867,61" concept="6" />
-      <node id="1084163669516726590" at="2868,16,2869,62" concept="6" />
-      <node id="1084163669516728739" at="2870,16,2871,62" concept="6" />
-      <node id="1084163669516730931" at="2872,16,2873,62" concept="6" />
-      <node id="1084163669516733166" at="2874,16,2875,62" concept="6" />
-      <node id="1084163669516735444" at="2876,16,2877,62" concept="6" />
-      <node id="6520817392523143158" at="2878,16,2879,62" concept="6" />
-      <node id="6845119683729389262" at="2880,16,2881,62" concept="6" />
-      <node id="1938598294982501573" at="2882,16,2883,62" concept="6" />
-      <node id="1938598294982501972" at="2884,16,2885,62" concept="6" />
-      <node id="1938598294982492973" at="2886,16,2887,62" concept="6" />
-      <node id="1938598294982493000" at="2888,16,2889,62" concept="6" />
-      <node id="781140262677966745" at="2890,16,2891,62" concept="6" />
-      <node id="4783730913495457059" at="2892,16,2893,62" concept="6" />
-      <node id="1462305029084461972" at="2894,16,2895,62" concept="6" />
-      <node id="5053813598678952392" at="2896,16,2897,62" concept="6" />
-      <node id="1462305029084452922" at="2898,16,2899,62" concept="6" />
-      <node id="5894421362117318859" at="2900,16,2901,62" concept="6" />
-      <node id="5894421362117645772" at="2902,16,2903,62" concept="6" />
-      <node id="8877724874822463464" at="2904,16,2905,62" concept="6" />
-      <node id="781140262678203503" at="2906,16,2907,62" concept="6" />
-      <node id="5894421362118001935" at="2908,16,2909,62" concept="6" />
-      <node id="781140262678249378" at="2910,16,2911,62" concept="6" />
-      <node id="1938598294988139938" at="2912,16,2913,62" concept="6" />
-      <node id="1938598294988136819" at="2914,16,2915,62" concept="6" />
-      <node id="781140262679960793" at="2916,16,2917,62" concept="6" />
-      <node id="1938598294988146079" at="2918,16,2919,62" concept="6" />
-      <node id="1938598294988149064" at="2920,16,2921,62" concept="6" />
-      <node id="6845119683731096024" at="2922,16,2923,62" concept="6" />
-      <node id="6520817392523151294" at="2924,16,2925,62" concept="6" />
-      <node id="4157435862225495595" at="3318,55,3319,43" concept="6" />
+      <node id="922958177840045827" at="925,78,926,270" concept="6" />
+      <node id="7753544965996885488" at="928,78,929,279" concept="6" />
+      <node id="2355727383328185335" at="931,78,932,322" concept="6" />
+      <node id="781140262678085922" at="934,78,935,111" concept="6" />
+      <node id="1462305029084462175" at="937,78,938,113" concept="6" />
+      <node id="6845119683729348833" at="940,78,941,117" concept="6" />
+      <node id="6845119683729381207" at="943,78,944,291" concept="6" />
+      <node id="7962467864633131914" at="946,78,947,118" concept="6" />
+      <node id="1084163669516717578" at="949,78,950,114" concept="6" />
+      <node id="1084163669516724487" at="952,78,953,123" concept="6" />
+      <node id="1084163669516726593" at="955,79,956,113" concept="6" />
+      <node id="1084163669516728742" at="958,79,959,109" concept="6" />
+      <node id="1084163669516730934" at="961,79,962,109" concept="6" />
+      <node id="1084163669516733169" at="964,79,965,109" concept="6" />
+      <node id="1084163669516735447" at="967,79,968,109" concept="6" />
+      <node id="6520817392523144237" at="970,79,971,115" concept="6" />
+      <node id="6845119683729389724" at="973,79,974,108" concept="6" />
+      <node id="1938598294982501576" at="976,79,977,107" concept="6" />
+      <node id="1938598294982501975" at="979,79,980,113" concept="6" />
+      <node id="1938598294982499470" at="982,79,983,110" concept="6" />
+      <node id="1938598294982497081" at="985,79,986,110" concept="6" />
+      <node id="781140262677966748" at="988,79,989,111" concept="6" />
+      <node id="4783730913495458307" at="991,79,992,269" concept="6" />
+      <node id="1462305029084461975" at="994,79,995,117" concept="6" />
+      <node id="5053813598678961694" at="997,79,998,310" concept="6" />
+      <node id="1462305029084452925" at="1000,79,1001,108" concept="6" />
+      <node id="5894421362117318936" at="1003,79,1004,117" concept="6" />
+      <node id="5894421362117649635" at="1006,79,1007,111" concept="6" />
+      <node id="8877724874822463467" at="1009,79,1010,115" concept="6" />
+      <node id="781140262678204261" at="1012,79,1013,112" concept="6" />
+      <node id="5894421362118005966" at="1015,79,1016,110" concept="6" />
+      <node id="781140262678250055" at="1018,79,1019,109" concept="6" />
+      <node id="1938598294988140191" at="1021,79,1022,110" concept="6" />
+      <node id="1938598294988137072" at="1024,79,1025,110" concept="6" />
+      <node id="781140262679960796" at="1027,79,1028,111" concept="6" />
+      <node id="1938598294988146082" at="1030,79,1031,107" concept="6" />
+      <node id="1938598294988149067" at="1033,79,1034,113" concept="6" />
+      <node id="6845119683731096027" at="1036,79,1037,108" concept="6" />
+      <node id="6520817392523151557" at="1039,79,1040,115" concept="6" />
+      <node id="7753544965996885760" at="1159,92,1160,100" concept="6" />
+      <node id="7753544965996885823" at="1162,92,1163,100" concept="6" />
+      <node id="781140262679960786" at="1165,92,1166,101" concept="6" />
+      <node id="1938598294988146072" at="1168,92,1169,97" concept="6" />
+      <node id="1938598294988149057" at="1171,92,1172,103" concept="6" />
+      <node id="6845119683731096017" at="1174,92,1175,98" concept="6" />
+      <node id="772379520212560180" at="1177,92,1178,105" concept="6" />
+      <node id="1462305029084462286" at="1180,92,1181,106" concept="6" />
+      <node id="1462305029084462300" at="1183,92,1184,105" concept="6" />
+      <node id="6845119683729436306" at="1411,104,1412,112" concept="6" />
+      <node id="7753544965996885758" at="1946,56,1947,56" concept="1" />
+      <node id="7753544965996885821" at="1947,56,1948,56" concept="1" />
+      <node id="781140262679960784" at="1948,56,1949,55" concept="1" />
+      <node id="1938598294988146070" at="1949,55,1950,56" concept="1" />
+      <node id="1938598294988149055" at="1950,56,1951,56" concept="1" />
+      <node id="6845119683731096015" at="1951,56,1952,56" concept="1" />
+      <node id="772379520212560178" at="1952,56,1953,55" concept="1" />
+      <node id="1462305029084462284" at="1953,55,1954,56" concept="1" />
+      <node id="1462305029084462298" at="1954,56,1955,56" concept="1" />
+      <node id="7753544965996885758" at="1999,16,2000,59" concept="6" />
+      <node id="7753544965996885821" at="2001,16,2002,59" concept="6" />
+      <node id="781140262679960784" at="2003,16,2004,59" concept="6" />
+      <node id="1938598294988146070" at="2005,16,2006,59" concept="6" />
+      <node id="1938598294988149055" at="2007,16,2008,59" concept="6" />
+      <node id="6845119683731096015" at="2009,16,2010,59" concept="6" />
+      <node id="772379520212560178" at="2011,16,2012,59" concept="6" />
+      <node id="1462305029084462284" at="2013,16,2014,59" concept="6" />
+      <node id="1462305029084462298" at="2015,16,2016,59" concept="6" />
+      <node id="6845119683729431098" at="2065,58,2066,58" concept="1" />
+      <node id="6845119683729431098" at="2173,16,2174,87" concept="6" />
+      <node id="7753544965996882379" at="2262,200,2263,187" concept="1" />
+      <node id="7753544965996883333" at="2263,187,2264,185" concept="1" />
+      <node id="7753544965996885262" at="2264,185,2265,185" concept="1" />
+      <node id="7753544965996885278" at="2265,185,2266,189" concept="1" />
+      <node id="7753544965996885368" at="2266,189,2267,191" concept="1" />
+      <node id="781140262678093901" at="2267,191,2268,192" concept="1" />
+      <node id="781140262678105143" at="2268,192,2269,203" concept="1" />
+      <node id="2355727383328194768" at="2269,203,2270,188" concept="1" />
+      <node id="7753544965996885635" at="2270,188,2271,187" concept="1" />
+      <node id="1462305029084473469" at="2271,187,2272,193" concept="1" />
+      <node id="1462305029084462105" at="2272,193,2273,195" concept="1" />
+      <node id="1462305029084462140" at="2273,195,2274,190" concept="1" />
+      <node id="6845119683729383510" at="2274,190,2275,190" concept="1" />
+      <node id="6845119683729386511" at="2275,190,2276,187" concept="1" />
+      <node id="7962467864633127656" at="2276,187,2277,185" concept="1" />
+      <node id="1462305029084462062" at="2277,185,2278,194" concept="1" />
+      <node id="1084163669516703718" at="2278,194,2279,190" concept="1" />
+      <node id="1084163669516724466" at="2279,190,2280,190" concept="1" />
+      <node id="1084163669516726572" at="2280,190,2281,190" concept="1" />
+      <node id="1084163669516728721" at="2281,190,2282,190" concept="1" />
+      <node id="1084163669516730913" at="2282,190,2283,190" concept="1" />
+      <node id="1084163669516733148" at="2283,190,2284,190" concept="1" />
+      <node id="1084163669516735426" at="2284,190,2285,190" concept="1" />
+      <node id="6845119683729395352" at="2285,190,2286,191" concept="1" />
+      <node id="1938598294982501560" at="2286,191,2287,191" concept="1" />
+      <node id="1938598294982501959" at="2287,191,2288,194" concept="1" />
+      <node id="1462305029084462313" at="2288,194,2289,190" concept="1" />
+      <node id="1462305029084462337" at="2289,190,2290,190" concept="1" />
+      <node id="781140262677966725" at="2290,190,2291,190" concept="1" />
+      <node id="1462305029084462430" at="2291,190,2292,187" concept="1" />
+      <node id="1462305029084462452" at="2292,187,2293,197" concept="1" />
+      <node id="4783730913495463581" at="2293,197,2294,186" concept="1" />
+      <node id="4783730913495430922" at="2294,186,2295,187" concept="1" />
+      <node id="772379520212879620" at="2295,187,2296,192" concept="1" />
+      <node id="781140262678149977" at="2296,192,2297,213" concept="1" />
+      <node id="1462305029084461923" at="2297,213,2298,196" concept="1" />
+      <node id="1462305029084461948" at="2298,196,2299,197" concept="1" />
+      <node id="1462305029084452899" at="2299,197,2300,192" concept="1" />
+      <node id="1462305029084452877" at="2300,192,2301,187" concept="1" />
+      <node id="1462305029084421196" at="2301,187,2302,197" concept="1" />
+      <node id="5894421362117319929" at="2302,197,2303,205" concept="1" />
+      <node id="5894421362117650628" at="2303,205,2304,199" concept="1" />
+      <node id="8877724874822463400" at="2304,199,2305,200" concept="1" />
+      <node id="781140262678199734" at="2305,200,2306,199" concept="1" />
+      <node id="5894421362118006947" at="2306,199,2307,202" concept="1" />
+      <node id="5894421362118007025" at="2307,202,2308,202" concept="1" />
+      <node id="781140262678258087" at="2308,202,2309,238" concept="1" />
+      <node id="781140262678263355" at="2309,238,2310,229" concept="1" />
+      <node id="7753544965996882379" at="2465,16,2466,66" concept="6" />
+      <node id="7753544965996883333" at="2467,16,2468,66" concept="6" />
+      <node id="7753544965996885262" at="2469,16,2470,66" concept="6" />
+      <node id="7753544965996885278" at="2471,16,2472,66" concept="6" />
+      <node id="7753544965996885368" at="2473,16,2474,66" concept="6" />
+      <node id="781140262678093901" at="2475,16,2476,66" concept="6" />
+      <node id="781140262678105143" at="2477,16,2478,66" concept="6" />
+      <node id="2355727383328194768" at="2479,16,2480,66" concept="6" />
+      <node id="7753544965996885635" at="2481,16,2482,66" concept="6" />
+      <node id="1462305029084473469" at="2483,16,2484,66" concept="6" />
+      <node id="1462305029084462105" at="2485,16,2486,67" concept="6" />
+      <node id="1462305029084462140" at="2487,16,2488,67" concept="6" />
+      <node id="6845119683729383510" at="2489,16,2490,67" concept="6" />
+      <node id="6845119683729386511" at="2491,16,2492,67" concept="6" />
+      <node id="7962467864633127656" at="2493,16,2494,67" concept="6" />
+      <node id="1462305029084462062" at="2495,16,2496,67" concept="6" />
+      <node id="1084163669516703718" at="2497,16,2498,67" concept="6" />
+      <node id="1084163669516724466" at="2499,16,2500,67" concept="6" />
+      <node id="1084163669516726572" at="2501,16,2502,67" concept="6" />
+      <node id="1084163669516728721" at="2503,16,2504,67" concept="6" />
+      <node id="1084163669516730913" at="2505,16,2506,67" concept="6" />
+      <node id="1084163669516733148" at="2507,16,2508,67" concept="6" />
+      <node id="1084163669516735426" at="2509,16,2510,67" concept="6" />
+      <node id="6845119683729395352" at="2511,16,2512,67" concept="6" />
+      <node id="1938598294982501560" at="2513,16,2514,67" concept="6" />
+      <node id="1938598294982501959" at="2515,16,2516,67" concept="6" />
+      <node id="1462305029084462313" at="2517,16,2518,67" concept="6" />
+      <node id="1462305029084462337" at="2519,16,2520,67" concept="6" />
+      <node id="781140262677966725" at="2521,16,2522,67" concept="6" />
+      <node id="1462305029084462430" at="2523,16,2524,67" concept="6" />
+      <node id="1462305029084462452" at="2525,16,2526,67" concept="6" />
+      <node id="4783730913495463581" at="2527,16,2528,67" concept="6" />
+      <node id="4783730913495430922" at="2529,16,2530,67" concept="6" />
+      <node id="772379520212879620" at="2531,16,2532,67" concept="6" />
+      <node id="781140262678149977" at="2533,16,2534,67" concept="6" />
+      <node id="1462305029084461923" at="2535,16,2536,67" concept="6" />
+      <node id="1462305029084461948" at="2537,16,2538,67" concept="6" />
+      <node id="1462305029084452899" at="2539,16,2540,67" concept="6" />
+      <node id="1462305029084452877" at="2541,16,2542,67" concept="6" />
+      <node id="1462305029084421196" at="2543,16,2544,67" concept="6" />
+      <node id="5894421362117319929" at="2545,16,2546,67" concept="6" />
+      <node id="5894421362117650628" at="2547,16,2548,67" concept="6" />
+      <node id="8877724874822463400" at="2549,16,2550,67" concept="6" />
+      <node id="781140262678199734" at="2551,16,2552,67" concept="6" />
+      <node id="5894421362118006947" at="2553,16,2554,67" concept="6" />
+      <node id="5894421362118007025" at="2555,16,2556,67" concept="6" />
+      <node id="781140262678258087" at="2557,16,2558,67" concept="6" />
+      <node id="781140262678263355" at="2559,16,2560,67" concept="6" />
+      <node id="922958177840041190" at="2743,57,2744,56" concept="1" />
+      <node id="7753544965996885485" at="2744,56,2745,57" concept="1" />
+      <node id="2355727383328172309" at="2745,57,2746,57" concept="1" />
+      <node id="781140262678082419" at="2746,57,2747,56" concept="1" />
+      <node id="1462305029084462172" at="2747,56,2748,57" concept="1" />
+      <node id="6845119683729348499" at="2748,57,2749,57" concept="1" />
+      <node id="6845119683729380880" at="2749,57,2750,57" concept="1" />
+      <node id="7962467864633127579" at="2750,57,2751,57" concept="1" />
+      <node id="1084163669516716663" at="2751,57,2752,57" concept="1" />
+      <node id="1084163669516724484" at="2752,57,2753,57" concept="1" />
+      <node id="1084163669516726590" at="2753,57,2754,57" concept="1" />
+      <node id="1084163669516728739" at="2754,57,2755,57" concept="1" />
+      <node id="1084163669516730931" at="2755,57,2756,57" concept="1" />
+      <node id="1084163669516733166" at="2756,57,2757,57" concept="1" />
+      <node id="1084163669516735444" at="2757,57,2758,57" concept="1" />
+      <node id="6520817392523143158" at="2758,57,2759,57" concept="1" />
+      <node id="6845119683729389262" at="2759,57,2760,57" concept="1" />
+      <node id="1938598294982501573" at="2760,57,2761,57" concept="1" />
+      <node id="1938598294982501972" at="2761,57,2762,57" concept="1" />
+      <node id="1938598294982492973" at="2762,57,2763,57" concept="1" />
+      <node id="1938598294982493000" at="2763,57,2764,57" concept="1" />
+      <node id="781140262677966745" at="2764,57,2765,56" concept="1" />
+      <node id="4783730913495457059" at="2765,56,2766,57" concept="1" />
+      <node id="1462305029084461972" at="2766,57,2767,57" concept="1" />
+      <node id="5053813598678952392" at="2767,57,2768,57" concept="1" />
+      <node id="1462305029084452922" at="2768,57,2769,57" concept="1" />
+      <node id="5894421362117318859" at="2769,57,2770,57" concept="1" />
+      <node id="5894421362117645772" at="2770,57,2771,57" concept="1" />
+      <node id="8877724874822463464" at="2771,57,2772,57" concept="1" />
+      <node id="781140262678203503" at="2772,57,2773,56" concept="1" />
+      <node id="5894421362118001935" at="2773,56,2774,57" concept="1" />
+      <node id="781140262678249378" at="2774,57,2775,56" concept="1" />
+      <node id="1938598294988139938" at="2775,56,2776,57" concept="1" />
+      <node id="1938598294988136819" at="2776,57,2777,57" concept="1" />
+      <node id="781140262679960793" at="2777,57,2778,56" concept="1" />
+      <node id="1938598294988146079" at="2778,56,2779,57" concept="1" />
+      <node id="1938598294988149064" at="2779,57,2780,57" concept="1" />
+      <node id="6845119683731096024" at="2780,57,2781,57" concept="1" />
+      <node id="6520817392523151294" at="2781,57,2782,57" concept="1" />
+      <node id="922958177840041190" at="2858,16,2859,61" concept="6" />
+      <node id="7753544965996885485" at="2860,16,2861,61" concept="6" />
+      <node id="2355727383328172309" at="2862,16,2863,61" concept="6" />
+      <node id="781140262678082419" at="2864,16,2865,61" concept="6" />
+      <node id="1462305029084462172" at="2866,16,2867,61" concept="6" />
+      <node id="6845119683729348499" at="2868,16,2869,61" concept="6" />
+      <node id="6845119683729380880" at="2870,16,2871,61" concept="6" />
+      <node id="7962467864633127579" at="2872,16,2873,61" concept="6" />
+      <node id="1084163669516716663" at="2874,16,2875,61" concept="6" />
+      <node id="1084163669516724484" at="2876,16,2877,61" concept="6" />
+      <node id="1084163669516726590" at="2878,16,2879,62" concept="6" />
+      <node id="1084163669516728739" at="2880,16,2881,62" concept="6" />
+      <node id="1084163669516730931" at="2882,16,2883,62" concept="6" />
+      <node id="1084163669516733166" at="2884,16,2885,62" concept="6" />
+      <node id="1084163669516735444" at="2886,16,2887,62" concept="6" />
+      <node id="6520817392523143158" at="2888,16,2889,62" concept="6" />
+      <node id="6845119683729389262" at="2890,16,2891,62" concept="6" />
+      <node id="1938598294982501573" at="2892,16,2893,62" concept="6" />
+      <node id="1938598294982501972" at="2894,16,2895,62" concept="6" />
+      <node id="1938598294982492973" at="2896,16,2897,62" concept="6" />
+      <node id="1938598294982493000" at="2898,16,2899,62" concept="6" />
+      <node id="781140262677966745" at="2900,16,2901,62" concept="6" />
+      <node id="4783730913495457059" at="2902,16,2903,62" concept="6" />
+      <node id="1462305029084461972" at="2904,16,2905,62" concept="6" />
+      <node id="5053813598678952392" at="2906,16,2907,62" concept="6" />
+      <node id="1462305029084452922" at="2908,16,2909,62" concept="6" />
+      <node id="5894421362117318859" at="2910,16,2911,62" concept="6" />
+      <node id="5894421362117645772" at="2912,16,2913,62" concept="6" />
+      <node id="8877724874822463464" at="2914,16,2915,62" concept="6" />
+      <node id="781140262678203503" at="2916,16,2917,62" concept="6" />
+      <node id="5894421362118001935" at="2918,16,2919,62" concept="6" />
+      <node id="781140262678249378" at="2920,16,2921,62" concept="6" />
+      <node id="1938598294988139938" at="2922,16,2923,62" concept="6" />
+      <node id="1938598294988136819" at="2924,16,2925,62" concept="6" />
+      <node id="781140262679960793" at="2926,16,2927,62" concept="6" />
+      <node id="1938598294988146079" at="2928,16,2929,62" concept="6" />
+      <node id="1938598294988149064" at="2930,16,2931,62" concept="6" />
+      <node id="6845119683731096024" at="2932,16,2933,62" concept="6" />
+      <node id="6520817392523151294" at="2934,16,2935,62" concept="6" />
+      <node id="4157435862225495595" at="3330,55,3331,43" concept="6" />
       <node id="7753544965996882380" at="348,0,351,0" concept="9" trace="propertyMacro_GetValue_8_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="7753544965996883334" at="351,0,354,0" concept="9" trace="propertyMacro_GetValue_8_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="7753544965996885279" at="358,0,361,0" concept="9" trace="propertyMacro_GetValue_8_3#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
@@ -3772,56 +3790,56 @@
       <node id="5894421362118007026" at="487,0,490,0" concept="9" trace="propertyMacro_GetValue_8_45#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="781140262678258088" at="490,0,493,0" concept="9" trace="propertyMacro_GetValue_8_46#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="781140262678263356" at="493,0,496,0" concept="9" trace="propertyMacro_GetValue_8_47#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="922958177840041192" at="922,0,925,0" concept="9" trace="ifMacro_Condition_8_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7753544965996885486" at="925,0,928,0" concept="9" trace="ifMacro_Condition_8_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="2355727383328172311" at="928,0,931,0" concept="9" trace="ifMacro_Condition_8_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="781140262678082421" at="931,0,934,0" concept="9" trace="ifMacro_Condition_8_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1462305029084462173" at="934,0,937,0" concept="9" trace="ifMacro_Condition_8_4#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6845119683729348501" at="937,0,940,0" concept="9" trace="ifMacro_Condition_8_5#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6845119683729380882" at="940,0,943,0" concept="9" trace="ifMacro_Condition_8_6#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7962467864633127581" at="943,0,946,0" concept="9" trace="ifMacro_Condition_8_7#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1084163669516716665" at="946,0,949,0" concept="9" trace="ifMacro_Condition_8_8#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1084163669516724485" at="949,0,952,0" concept="9" trace="ifMacro_Condition_8_9#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1084163669516726591" at="952,0,955,0" concept="9" trace="ifMacro_Condition_8_10#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1084163669516728740" at="955,0,958,0" concept="9" trace="ifMacro_Condition_8_11#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1084163669516730932" at="958,0,961,0" concept="9" trace="ifMacro_Condition_8_12#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1084163669516733167" at="961,0,964,0" concept="9" trace="ifMacro_Condition_8_13#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1084163669516735445" at="964,0,967,0" concept="9" trace="ifMacro_Condition_8_14#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6520817392523143159" at="967,0,970,0" concept="9" trace="ifMacro_Condition_8_15#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6845119683729389264" at="970,0,973,0" concept="9" trace="ifMacro_Condition_8_16#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1938598294982501574" at="973,0,976,0" concept="9" trace="ifMacro_Condition_8_17#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1938598294982501973" at="976,0,979,0" concept="9" trace="ifMacro_Condition_8_18#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1938598294982492974" at="979,0,982,0" concept="9" trace="ifMacro_Condition_8_19#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1938598294982493001" at="982,0,985,0" concept="9" trace="ifMacro_Condition_8_20#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="781140262677966746" at="985,0,988,0" concept="9" trace="ifMacro_Condition_8_21#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="4783730913495457061" at="988,0,991,0" concept="9" trace="ifMacro_Condition_8_22#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1462305029084461973" at="991,0,994,0" concept="9" trace="ifMacro_Condition_8_23#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="5053813598678952394" at="994,0,997,0" concept="9" trace="ifMacro_Condition_8_24#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1462305029084452923" at="997,0,1000,0" concept="9" trace="ifMacro_Condition_8_25#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="5894421362117318861" at="1000,0,1003,0" concept="9" trace="ifMacro_Condition_8_26#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="5894421362117645774" at="1003,0,1006,0" concept="9" trace="ifMacro_Condition_8_27#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="8877724874822463465" at="1006,0,1009,0" concept="9" trace="ifMacro_Condition_8_28#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="781140262678203505" at="1009,0,1012,0" concept="9" trace="ifMacro_Condition_8_29#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="5894421362118001937" at="1012,0,1015,0" concept="9" trace="ifMacro_Condition_8_30#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="781140262678249380" at="1015,0,1018,0" concept="9" trace="ifMacro_Condition_8_31#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1938598294988139939" at="1018,0,1021,0" concept="9" trace="ifMacro_Condition_8_32#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1938598294988136820" at="1021,0,1024,0" concept="9" trace="ifMacro_Condition_8_33#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="781140262679960794" at="1024,0,1027,0" concept="9" trace="ifMacro_Condition_8_34#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1938598294988146080" at="1027,0,1030,0" concept="9" trace="ifMacro_Condition_8_35#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="1938598294988149065" at="1030,0,1033,0" concept="9" trace="ifMacro_Condition_8_36#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6845119683731096025" at="1033,0,1036,0" concept="9" trace="ifMacro_Condition_8_37#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="6520817392523151295" at="1036,0,1039,0" concept="9" trace="ifMacro_Condition_8_38#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
-      <node id="7753544965996885758" at="1153,0,1156,0" concept="9" trace="sourceNodeQuery_8_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="7753544965996885821" at="1156,0,1159,0" concept="9" trace="sourceNodeQuery_8_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="781140262679960784" at="1159,0,1162,0" concept="9" trace="sourceNodeQuery_8_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1938598294988146070" at="1162,0,1165,0" concept="9" trace="sourceNodeQuery_8_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1938598294988149055" at="1165,0,1168,0" concept="9" trace="sourceNodeQuery_8_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="6845119683731096015" at="1168,0,1171,0" concept="9" trace="sourceNodeQuery_8_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="772379520212560178" at="1171,0,1174,0" concept="9" trace="sourceNodeQuery_8_6#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1462305029084462284" at="1174,0,1177,0" concept="9" trace="sourceNodeQuery_8_7#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="1462305029084462298" at="1177,0,1180,0" concept="9" trace="sourceNodeQuery_8_8#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
-      <node id="6845119683729431098" at="1405,0,1408,0" concept="9" trace="sourceNodesQuery_8_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
-      <node id="4157435862225495595" at="3318,0,3321,0" concept="9" trace="isNotEmptyString#(Ljava/lang/String;)Z" />
+      <node id="922958177840041192" at="925,0,928,0" concept="9" trace="ifMacro_Condition_8_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7753544965996885486" at="928,0,931,0" concept="9" trace="ifMacro_Condition_8_1#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="2355727383328172311" at="931,0,934,0" concept="9" trace="ifMacro_Condition_8_2#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="781140262678082421" at="934,0,937,0" concept="9" trace="ifMacro_Condition_8_3#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1462305029084462173" at="937,0,940,0" concept="9" trace="ifMacro_Condition_8_4#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6845119683729348501" at="940,0,943,0" concept="9" trace="ifMacro_Condition_8_5#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6845119683729380882" at="943,0,946,0" concept="9" trace="ifMacro_Condition_8_6#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7962467864633127581" at="946,0,949,0" concept="9" trace="ifMacro_Condition_8_7#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1084163669516716665" at="949,0,952,0" concept="9" trace="ifMacro_Condition_8_8#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1084163669516724485" at="952,0,955,0" concept="9" trace="ifMacro_Condition_8_9#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1084163669516726591" at="955,0,958,0" concept="9" trace="ifMacro_Condition_8_10#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1084163669516728740" at="958,0,961,0" concept="9" trace="ifMacro_Condition_8_11#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1084163669516730932" at="961,0,964,0" concept="9" trace="ifMacro_Condition_8_12#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1084163669516733167" at="964,0,967,0" concept="9" trace="ifMacro_Condition_8_13#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1084163669516735445" at="967,0,970,0" concept="9" trace="ifMacro_Condition_8_14#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6520817392523143159" at="970,0,973,0" concept="9" trace="ifMacro_Condition_8_15#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6845119683729389264" at="973,0,976,0" concept="9" trace="ifMacro_Condition_8_16#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1938598294982501574" at="976,0,979,0" concept="9" trace="ifMacro_Condition_8_17#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1938598294982501973" at="979,0,982,0" concept="9" trace="ifMacro_Condition_8_18#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1938598294982492974" at="982,0,985,0" concept="9" trace="ifMacro_Condition_8_19#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1938598294982493001" at="985,0,988,0" concept="9" trace="ifMacro_Condition_8_20#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="781140262677966746" at="988,0,991,0" concept="9" trace="ifMacro_Condition_8_21#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="4783730913495457061" at="991,0,994,0" concept="9" trace="ifMacro_Condition_8_22#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1462305029084461973" at="994,0,997,0" concept="9" trace="ifMacro_Condition_8_23#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="5053813598678952394" at="997,0,1000,0" concept="9" trace="ifMacro_Condition_8_24#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1462305029084452923" at="1000,0,1003,0" concept="9" trace="ifMacro_Condition_8_25#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="5894421362117318861" at="1003,0,1006,0" concept="9" trace="ifMacro_Condition_8_26#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="5894421362117645774" at="1006,0,1009,0" concept="9" trace="ifMacro_Condition_8_27#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="8877724874822463465" at="1009,0,1012,0" concept="9" trace="ifMacro_Condition_8_28#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="781140262678203505" at="1012,0,1015,0" concept="9" trace="ifMacro_Condition_8_29#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="5894421362118001937" at="1015,0,1018,0" concept="9" trace="ifMacro_Condition_8_30#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="781140262678249380" at="1018,0,1021,0" concept="9" trace="ifMacro_Condition_8_31#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1938598294988139939" at="1021,0,1024,0" concept="9" trace="ifMacro_Condition_8_32#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1938598294988136820" at="1024,0,1027,0" concept="9" trace="ifMacro_Condition_8_33#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="781140262679960794" at="1027,0,1030,0" concept="9" trace="ifMacro_Condition_8_34#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1938598294988146080" at="1030,0,1033,0" concept="9" trace="ifMacro_Condition_8_35#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="1938598294988149065" at="1033,0,1036,0" concept="9" trace="ifMacro_Condition_8_36#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6845119683731096025" at="1036,0,1039,0" concept="9" trace="ifMacro_Condition_8_37#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="6520817392523151295" at="1039,0,1042,0" concept="9" trace="ifMacro_Condition_8_38#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="7753544965996885758" at="1159,0,1162,0" concept="9" trace="sourceNodeQuery_8_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="7753544965996885821" at="1162,0,1165,0" concept="9" trace="sourceNodeQuery_8_1#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="781140262679960784" at="1165,0,1168,0" concept="9" trace="sourceNodeQuery_8_2#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1938598294988146070" at="1168,0,1171,0" concept="9" trace="sourceNodeQuery_8_3#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1938598294988149055" at="1171,0,1174,0" concept="9" trace="sourceNodeQuery_8_4#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="6845119683731096015" at="1174,0,1177,0" concept="9" trace="sourceNodeQuery_8_5#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="772379520212560178" at="1177,0,1180,0" concept="9" trace="sourceNodeQuery_8_6#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1462305029084462284" at="1180,0,1183,0" concept="9" trace="sourceNodeQuery_8_7#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="1462305029084462298" at="1183,0,1186,0" concept="9" trace="sourceNodeQuery_8_8#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodeContext;)Lorg/jetbrains/mps/openapi/model/SNode;" />
+      <node id="6845119683729431098" at="1411,0,1414,0" concept="9" trace="sourceNodesQuery_8_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="4157435862225495595" at="3330,0,3333,0" concept="9" trace="isNotEmptyString#(Ljava/lang/String;)Z" />
       <node id="7753544965996885263" at="354,0,358,0" concept="9" trace="propertyMacro_GetValue_8_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <node id="781140262678149978" at="451,0,457,0" concept="9" trace="propertyMacro_GetValue_8_34#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
       <scope id="7753544965996882381" at="348,88,349,261" />
@@ -3871,153 +3889,153 @@
       <scope id="5894421362118007027" at="487,89,488,301" />
       <scope id="781140262678258089" at="490,89,491,306" />
       <scope id="781140262678263357" at="493,89,494,305" />
-      <scope id="922958177840041194" at="922,78,923,270" />
-      <scope id="7753544965996885487" at="925,78,926,279" />
-      <scope id="2355727383328172313" at="928,78,929,322" />
-      <scope id="781140262678082423" at="931,78,932,111" />
-      <scope id="1462305029084462174" at="934,78,935,113" />
-      <scope id="6845119683729348503" at="937,78,938,117" />
-      <scope id="6845119683729380884" at="940,78,941,291" />
-      <scope id="7962467864633127583" at="943,78,944,118" />
-      <scope id="1084163669516716667" at="946,78,947,114" />
-      <scope id="1084163669516724486" at="949,78,950,123" />
-      <scope id="1084163669516726592" at="952,79,953,113" />
-      <scope id="1084163669516728741" at="955,79,956,109" />
-      <scope id="1084163669516730933" at="958,79,959,109" />
-      <scope id="1084163669516733168" at="961,79,962,109" />
-      <scope id="1084163669516735446" at="964,79,965,109" />
-      <scope id="6520817392523143160" at="967,79,968,115" />
-      <scope id="6845119683729389266" at="970,79,971,108" />
-      <scope id="1938598294982501575" at="973,79,974,107" />
-      <scope id="1938598294982501974" at="976,79,977,113" />
-      <scope id="1938598294982492975" at="979,79,980,110" />
-      <scope id="1938598294982493002" at="982,79,983,110" />
-      <scope id="781140262677966747" at="985,79,986,111" />
-      <scope id="4783730913495457063" at="988,79,989,269" />
-      <scope id="1462305029084461974" at="991,79,992,117" />
-      <scope id="5053813598678952396" at="994,79,995,310" />
-      <scope id="1462305029084452924" at="997,79,998,108" />
-      <scope id="5894421362117318863" at="1000,79,1001,117" />
-      <scope id="5894421362117645776" at="1003,79,1004,111" />
-      <scope id="8877724874822463466" at="1006,79,1007,115" />
-      <scope id="781140262678203507" at="1009,79,1010,112" />
-      <scope id="5894421362118001939" at="1012,79,1013,110" />
-      <scope id="781140262678249382" at="1015,79,1016,109" />
-      <scope id="1938598294988139940" at="1018,79,1019,110" />
-      <scope id="1938598294988136821" at="1021,79,1022,110" />
-      <scope id="781140262679960795" at="1024,79,1025,111" />
-      <scope id="1938598294988146081" at="1027,79,1028,107" />
-      <scope id="1938598294988149066" at="1030,79,1031,113" />
-      <scope id="6845119683731096026" at="1033,79,1034,108" />
-      <scope id="6520817392523151296" at="1036,79,1037,115" />
-      <scope id="7753544965996885759" at="1153,92,1154,100" />
-      <scope id="7753544965996885822" at="1156,92,1157,100" />
-      <scope id="781140262679960785" at="1159,92,1160,101" />
-      <scope id="1938598294988146071" at="1162,92,1163,97" />
-      <scope id="1938598294988149056" at="1165,92,1166,103" />
-      <scope id="6845119683731096016" at="1168,92,1169,98" />
-      <scope id="772379520212560179" at="1171,92,1172,105" />
-      <scope id="1462305029084462285" at="1174,92,1175,106" />
-      <scope id="1462305029084462299" at="1177,92,1178,105" />
-      <scope id="6845119683729431099" at="1405,104,1406,112" />
-      <scope id="7753544965996885758" at="1993,16,1994,59" />
-      <scope id="7753544965996885821" at="1995,16,1996,59" />
-      <scope id="781140262679960784" at="1997,16,1998,59" />
-      <scope id="1938598294988146070" at="1999,16,2000,59" />
-      <scope id="1938598294988149055" at="2001,16,2002,59" />
-      <scope id="6845119683731096015" at="2003,16,2004,59" />
-      <scope id="772379520212560178" at="2005,16,2006,59" />
-      <scope id="1462305029084462284" at="2007,16,2008,59" />
-      <scope id="1462305029084462298" at="2009,16,2010,59" />
-      <scope id="6845119683729431098" at="2167,16,2168,87" />
-      <scope id="7753544965996882379" at="2458,16,2459,66" />
-      <scope id="7753544965996883333" at="2460,16,2461,66" />
-      <scope id="7753544965996885262" at="2462,16,2463,66" />
-      <scope id="7753544965996885278" at="2464,16,2465,66" />
-      <scope id="7753544965996885368" at="2466,16,2467,66" />
-      <scope id="781140262678093901" at="2468,16,2469,66" />
-      <scope id="781140262678105143" at="2470,16,2471,66" />
-      <scope id="2355727383328194768" at="2472,16,2473,66" />
-      <scope id="7753544965996885635" at="2474,16,2475,66" />
-      <scope id="1462305029084473469" at="2476,16,2477,66" />
-      <scope id="1462305029084462105" at="2478,16,2479,67" />
-      <scope id="1462305029084462140" at="2480,16,2481,67" />
-      <scope id="6845119683729383510" at="2482,16,2483,67" />
-      <scope id="6845119683729386511" at="2484,16,2485,67" />
-      <scope id="7962467864633127656" at="2486,16,2487,67" />
-      <scope id="1462305029084462062" at="2488,16,2489,67" />
-      <scope id="1084163669516703718" at="2490,16,2491,67" />
-      <scope id="1084163669516724466" at="2492,16,2493,67" />
-      <scope id="1084163669516726572" at="2494,16,2495,67" />
-      <scope id="1084163669516728721" at="2496,16,2497,67" />
-      <scope id="1084163669516730913" at="2498,16,2499,67" />
-      <scope id="1084163669516733148" at="2500,16,2501,67" />
-      <scope id="1084163669516735426" at="2502,16,2503,67" />
-      <scope id="6845119683729395352" at="2504,16,2505,67" />
-      <scope id="1938598294982501560" at="2506,16,2507,67" />
-      <scope id="1938598294982501959" at="2508,16,2509,67" />
-      <scope id="1462305029084462313" at="2510,16,2511,67" />
-      <scope id="1462305029084462337" at="2512,16,2513,67" />
-      <scope id="781140262677966725" at="2514,16,2515,67" />
-      <scope id="1462305029084462430" at="2516,16,2517,67" />
-      <scope id="1462305029084462452" at="2518,16,2519,67" />
-      <scope id="4783730913495463581" at="2520,16,2521,67" />
-      <scope id="4783730913495430922" at="2522,16,2523,67" />
-      <scope id="772379520212879620" at="2524,16,2525,67" />
-      <scope id="781140262678149977" at="2526,16,2527,67" />
-      <scope id="1462305029084461923" at="2528,16,2529,67" />
-      <scope id="1462305029084461948" at="2530,16,2531,67" />
-      <scope id="1462305029084452899" at="2532,16,2533,67" />
-      <scope id="1462305029084452877" at="2534,16,2535,67" />
-      <scope id="1462305029084421196" at="2536,16,2537,67" />
-      <scope id="5894421362117319929" at="2538,16,2539,67" />
-      <scope id="5894421362117650628" at="2540,16,2541,67" />
-      <scope id="8877724874822463400" at="2542,16,2543,67" />
-      <scope id="781140262678199734" at="2544,16,2545,67" />
-      <scope id="5894421362118006947" at="2546,16,2547,67" />
-      <scope id="5894421362118007025" at="2548,16,2549,67" />
-      <scope id="781140262678258087" at="2550,16,2551,67" />
-      <scope id="781140262678263355" at="2552,16,2553,67" />
-      <scope id="922958177840041190" at="2848,16,2849,61" />
-      <scope id="7753544965996885485" at="2850,16,2851,61" />
-      <scope id="2355727383328172309" at="2852,16,2853,61" />
-      <scope id="781140262678082419" at="2854,16,2855,61" />
-      <scope id="1462305029084462172" at="2856,16,2857,61" />
-      <scope id="6845119683729348499" at="2858,16,2859,61" />
-      <scope id="6845119683729380880" at="2860,16,2861,61" />
-      <scope id="7962467864633127579" at="2862,16,2863,61" />
-      <scope id="1084163669516716663" at="2864,16,2865,61" />
-      <scope id="1084163669516724484" at="2866,16,2867,61" />
-      <scope id="1084163669516726590" at="2868,16,2869,62" />
-      <scope id="1084163669516728739" at="2870,16,2871,62" />
-      <scope id="1084163669516730931" at="2872,16,2873,62" />
-      <scope id="1084163669516733166" at="2874,16,2875,62" />
-      <scope id="1084163669516735444" at="2876,16,2877,62" />
-      <scope id="6520817392523143158" at="2878,16,2879,62" />
-      <scope id="6845119683729389262" at="2880,16,2881,62" />
-      <scope id="1938598294982501573" at="2882,16,2883,62" />
-      <scope id="1938598294982501972" at="2884,16,2885,62" />
-      <scope id="1938598294982492973" at="2886,16,2887,62" />
-      <scope id="1938598294982493000" at="2888,16,2889,62" />
-      <scope id="781140262677966745" at="2890,16,2891,62" />
-      <scope id="4783730913495457059" at="2892,16,2893,62" />
-      <scope id="1462305029084461972" at="2894,16,2895,62" />
-      <scope id="5053813598678952392" at="2896,16,2897,62" />
-      <scope id="1462305029084452922" at="2898,16,2899,62" />
-      <scope id="5894421362117318859" at="2900,16,2901,62" />
-      <scope id="5894421362117645772" at="2902,16,2903,62" />
-      <scope id="8877724874822463464" at="2904,16,2905,62" />
-      <scope id="781140262678203503" at="2906,16,2907,62" />
-      <scope id="5894421362118001935" at="2908,16,2909,62" />
-      <scope id="781140262678249378" at="2910,16,2911,62" />
-      <scope id="1938598294988139938" at="2912,16,2913,62" />
-      <scope id="1938598294988136819" at="2914,16,2915,62" />
-      <scope id="781140262679960793" at="2916,16,2917,62" />
-      <scope id="1938598294988146079" at="2918,16,2919,62" />
-      <scope id="1938598294988149064" at="2920,16,2921,62" />
-      <scope id="6845119683731096024" at="2922,16,2923,62" />
-      <scope id="6520817392523151294" at="2924,16,2925,62" />
-      <scope id="4157435862225495595" at="3318,55,3319,43" />
+      <scope id="922958177840041194" at="925,78,926,270" />
+      <scope id="7753544965996885487" at="928,78,929,279" />
+      <scope id="2355727383328172313" at="931,78,932,322" />
+      <scope id="781140262678082423" at="934,78,935,111" />
+      <scope id="1462305029084462174" at="937,78,938,113" />
+      <scope id="6845119683729348503" at="940,78,941,117" />
+      <scope id="6845119683729380884" at="943,78,944,291" />
+      <scope id="7962467864633127583" at="946,78,947,118" />
+      <scope id="1084163669516716667" at="949,78,950,114" />
+      <scope id="1084163669516724486" at="952,78,953,123" />
+      <scope id="1084163669516726592" at="955,79,956,113" />
+      <scope id="1084163669516728741" at="958,79,959,109" />
+      <scope id="1084163669516730933" at="961,79,962,109" />
+      <scope id="1084163669516733168" at="964,79,965,109" />
+      <scope id="1084163669516735446" at="967,79,968,109" />
+      <scope id="6520817392523143160" at="970,79,971,115" />
+      <scope id="6845119683729389266" at="973,79,974,108" />
+      <scope id="1938598294982501575" at="976,79,977,107" />
+      <scope id="1938598294982501974" at="979,79,980,113" />
+      <scope id="1938598294982492975" at="982,79,983,110" />
+      <scope id="1938598294982493002" at="985,79,986,110" />
+      <scope id="781140262677966747" at="988,79,989,111" />
+      <scope id="4783730913495457063" at="991,79,992,269" />
+      <scope id="1462305029084461974" at="994,79,995,117" />
+      <scope id="5053813598678952396" at="997,79,998,310" />
+      <scope id="1462305029084452924" at="1000,79,1001,108" />
+      <scope id="5894421362117318863" at="1003,79,1004,117" />
+      <scope id="5894421362117645776" at="1006,79,1007,111" />
+      <scope id="8877724874822463466" at="1009,79,1010,115" />
+      <scope id="781140262678203507" at="1012,79,1013,112" />
+      <scope id="5894421362118001939" at="1015,79,1016,110" />
+      <scope id="781140262678249382" at="1018,79,1019,109" />
+      <scope id="1938598294988139940" at="1021,79,1022,110" />
+      <scope id="1938598294988136821" at="1024,79,1025,110" />
+      <scope id="781140262679960795" at="1027,79,1028,111" />
+      <scope id="1938598294988146081" at="1030,79,1031,107" />
+      <scope id="1938598294988149066" at="1033,79,1034,113" />
+      <scope id="6845119683731096026" at="1036,79,1037,108" />
+      <scope id="6520817392523151296" at="1039,79,1040,115" />
+      <scope id="7753544965996885759" at="1159,92,1160,100" />
+      <scope id="7753544965996885822" at="1162,92,1163,100" />
+      <scope id="781140262679960785" at="1165,92,1166,101" />
+      <scope id="1938598294988146071" at="1168,92,1169,97" />
+      <scope id="1938598294988149056" at="1171,92,1172,103" />
+      <scope id="6845119683731096016" at="1174,92,1175,98" />
+      <scope id="772379520212560179" at="1177,92,1178,105" />
+      <scope id="1462305029084462285" at="1180,92,1181,106" />
+      <scope id="1462305029084462299" at="1183,92,1184,105" />
+      <scope id="6845119683729431099" at="1411,104,1412,112" />
+      <scope id="7753544965996885758" at="1999,16,2000,59" />
+      <scope id="7753544965996885821" at="2001,16,2002,59" />
+      <scope id="781140262679960784" at="2003,16,2004,59" />
+      <scope id="1938598294988146070" at="2005,16,2006,59" />
+      <scope id="1938598294988149055" at="2007,16,2008,59" />
+      <scope id="6845119683731096015" at="2009,16,2010,59" />
+      <scope id="772379520212560178" at="2011,16,2012,59" />
+      <scope id="1462305029084462284" at="2013,16,2014,59" />
+      <scope id="1462305029084462298" at="2015,16,2016,59" />
+      <scope id="6845119683729431098" at="2173,16,2174,87" />
+      <scope id="7753544965996882379" at="2465,16,2466,66" />
+      <scope id="7753544965996883333" at="2467,16,2468,66" />
+      <scope id="7753544965996885262" at="2469,16,2470,66" />
+      <scope id="7753544965996885278" at="2471,16,2472,66" />
+      <scope id="7753544965996885368" at="2473,16,2474,66" />
+      <scope id="781140262678093901" at="2475,16,2476,66" />
+      <scope id="781140262678105143" at="2477,16,2478,66" />
+      <scope id="2355727383328194768" at="2479,16,2480,66" />
+      <scope id="7753544965996885635" at="2481,16,2482,66" />
+      <scope id="1462305029084473469" at="2483,16,2484,66" />
+      <scope id="1462305029084462105" at="2485,16,2486,67" />
+      <scope id="1462305029084462140" at="2487,16,2488,67" />
+      <scope id="6845119683729383510" at="2489,16,2490,67" />
+      <scope id="6845119683729386511" at="2491,16,2492,67" />
+      <scope id="7962467864633127656" at="2493,16,2494,67" />
+      <scope id="1462305029084462062" at="2495,16,2496,67" />
+      <scope id="1084163669516703718" at="2497,16,2498,67" />
+      <scope id="1084163669516724466" at="2499,16,2500,67" />
+      <scope id="1084163669516726572" at="2501,16,2502,67" />
+      <scope id="1084163669516728721" at="2503,16,2504,67" />
+      <scope id="1084163669516730913" at="2505,16,2506,67" />
+      <scope id="1084163669516733148" at="2507,16,2508,67" />
+      <scope id="1084163669516735426" at="2509,16,2510,67" />
+      <scope id="6845119683729395352" at="2511,16,2512,67" />
+      <scope id="1938598294982501560" at="2513,16,2514,67" />
+      <scope id="1938598294982501959" at="2515,16,2516,67" />
+      <scope id="1462305029084462313" at="2517,16,2518,67" />
+      <scope id="1462305029084462337" at="2519,16,2520,67" />
+      <scope id="781140262677966725" at="2521,16,2522,67" />
+      <scope id="1462305029084462430" at="2523,16,2524,67" />
+      <scope id="1462305029084462452" at="2525,16,2526,67" />
+      <scope id="4783730913495463581" at="2527,16,2528,67" />
+      <scope id="4783730913495430922" at="2529,16,2530,67" />
+      <scope id="772379520212879620" at="2531,16,2532,67" />
+      <scope id="781140262678149977" at="2533,16,2534,67" />
+      <scope id="1462305029084461923" at="2535,16,2536,67" />
+      <scope id="1462305029084461948" at="2537,16,2538,67" />
+      <scope id="1462305029084452899" at="2539,16,2540,67" />
+      <scope id="1462305029084452877" at="2541,16,2542,67" />
+      <scope id="1462305029084421196" at="2543,16,2544,67" />
+      <scope id="5894421362117319929" at="2545,16,2546,67" />
+      <scope id="5894421362117650628" at="2547,16,2548,67" />
+      <scope id="8877724874822463400" at="2549,16,2550,67" />
+      <scope id="781140262678199734" at="2551,16,2552,67" />
+      <scope id="5894421362118006947" at="2553,16,2554,67" />
+      <scope id="5894421362118007025" at="2555,16,2556,67" />
+      <scope id="781140262678258087" at="2557,16,2558,67" />
+      <scope id="781140262678263355" at="2559,16,2560,67" />
+      <scope id="922958177840041190" at="2858,16,2859,61" />
+      <scope id="7753544965996885485" at="2860,16,2861,61" />
+      <scope id="2355727383328172309" at="2862,16,2863,61" />
+      <scope id="781140262678082419" at="2864,16,2865,61" />
+      <scope id="1462305029084462172" at="2866,16,2867,61" />
+      <scope id="6845119683729348499" at="2868,16,2869,61" />
+      <scope id="6845119683729380880" at="2870,16,2871,61" />
+      <scope id="7962467864633127579" at="2872,16,2873,61" />
+      <scope id="1084163669516716663" at="2874,16,2875,61" />
+      <scope id="1084163669516724484" at="2876,16,2877,61" />
+      <scope id="1084163669516726590" at="2878,16,2879,62" />
+      <scope id="1084163669516728739" at="2880,16,2881,62" />
+      <scope id="1084163669516730931" at="2882,16,2883,62" />
+      <scope id="1084163669516733166" at="2884,16,2885,62" />
+      <scope id="1084163669516735444" at="2886,16,2887,62" />
+      <scope id="6520817392523143158" at="2888,16,2889,62" />
+      <scope id="6845119683729389262" at="2890,16,2891,62" />
+      <scope id="1938598294982501573" at="2892,16,2893,62" />
+      <scope id="1938598294982501972" at="2894,16,2895,62" />
+      <scope id="1938598294982492973" at="2896,16,2897,62" />
+      <scope id="1938598294982493000" at="2898,16,2899,62" />
+      <scope id="781140262677966745" at="2900,16,2901,62" />
+      <scope id="4783730913495457059" at="2902,16,2903,62" />
+      <scope id="1462305029084461972" at="2904,16,2905,62" />
+      <scope id="5053813598678952392" at="2906,16,2907,62" />
+      <scope id="1462305029084452922" at="2908,16,2909,62" />
+      <scope id="5894421362117318859" at="2910,16,2911,62" />
+      <scope id="5894421362117645772" at="2912,16,2913,62" />
+      <scope id="8877724874822463464" at="2914,16,2915,62" />
+      <scope id="781140262678203503" at="2916,16,2917,62" />
+      <scope id="5894421362118001935" at="2918,16,2919,62" />
+      <scope id="781140262678249378" at="2920,16,2921,62" />
+      <scope id="1938598294988139938" at="2922,16,2923,62" />
+      <scope id="1938598294988136819" at="2924,16,2925,62" />
+      <scope id="781140262679960793" at="2926,16,2927,62" />
+      <scope id="1938598294988146079" at="2928,16,2929,62" />
+      <scope id="1938598294988149064" at="2930,16,2931,62" />
+      <scope id="6845119683731096024" at="2932,16,2933,62" />
+      <scope id="6520817392523151294" at="2934,16,2935,62" />
+      <scope id="4157435862225495595" at="3330,55,3331,43" />
       <scope id="7753544965996885264" at="354,88,356,18">
         <var name="result" id="4237758264767298422" />
       </scope>
@@ -4159,154 +4177,154 @@
       <scope id="781140262678263356" at="493,0,496,0">
         <var name="_context" id="781140262678263356" />
       </scope>
-      <scope id="922958177840041192" at="922,0,925,0">
+      <scope id="922958177840041192" at="925,0,928,0">
         <var name="_context" id="922958177840041192" />
       </scope>
-      <scope id="7753544965996885486" at="925,0,928,0">
+      <scope id="7753544965996885486" at="928,0,931,0">
         <var name="_context" id="7753544965996885486" />
       </scope>
-      <scope id="2355727383328172311" at="928,0,931,0">
+      <scope id="2355727383328172311" at="931,0,934,0">
         <var name="_context" id="2355727383328172311" />
       </scope>
-      <scope id="781140262678082421" at="931,0,934,0">
+      <scope id="781140262678082421" at="934,0,937,0">
         <var name="_context" id="781140262678082421" />
       </scope>
-      <scope id="1462305029084462173" at="934,0,937,0">
+      <scope id="1462305029084462173" at="937,0,940,0">
         <var name="_context" id="1462305029084462173" />
       </scope>
-      <scope id="6845119683729348501" at="937,0,940,0">
+      <scope id="6845119683729348501" at="940,0,943,0">
         <var name="_context" id="6845119683729348501" />
       </scope>
-      <scope id="6845119683729380882" at="940,0,943,0">
+      <scope id="6845119683729380882" at="943,0,946,0">
         <var name="_context" id="6845119683729380882" />
       </scope>
-      <scope id="7962467864633127581" at="943,0,946,0">
+      <scope id="7962467864633127581" at="946,0,949,0">
         <var name="_context" id="7962467864633127581" />
       </scope>
-      <scope id="1084163669516716665" at="946,0,949,0">
+      <scope id="1084163669516716665" at="949,0,952,0">
         <var name="_context" id="1084163669516716665" />
       </scope>
-      <scope id="1084163669516724485" at="949,0,952,0">
+      <scope id="1084163669516724485" at="952,0,955,0">
         <var name="_context" id="1084163669516724485" />
       </scope>
-      <scope id="1084163669516726591" at="952,0,955,0">
+      <scope id="1084163669516726591" at="955,0,958,0">
         <var name="_context" id="1084163669516726591" />
       </scope>
-      <scope id="1084163669516728740" at="955,0,958,0">
+      <scope id="1084163669516728740" at="958,0,961,0">
         <var name="_context" id="1084163669516728740" />
       </scope>
-      <scope id="1084163669516730932" at="958,0,961,0">
+      <scope id="1084163669516730932" at="961,0,964,0">
         <var name="_context" id="1084163669516730932" />
       </scope>
-      <scope id="1084163669516733167" at="961,0,964,0">
+      <scope id="1084163669516733167" at="964,0,967,0">
         <var name="_context" id="1084163669516733167" />
       </scope>
-      <scope id="1084163669516735445" at="964,0,967,0">
+      <scope id="1084163669516735445" at="967,0,970,0">
         <var name="_context" id="1084163669516735445" />
       </scope>
-      <scope id="6520817392523143159" at="967,0,970,0">
+      <scope id="6520817392523143159" at="970,0,973,0">
         <var name="_context" id="6520817392523143159" />
       </scope>
-      <scope id="6845119683729389264" at="970,0,973,0">
+      <scope id="6845119683729389264" at="973,0,976,0">
         <var name="_context" id="6845119683729389264" />
       </scope>
-      <scope id="1938598294982501574" at="973,0,976,0">
+      <scope id="1938598294982501574" at="976,0,979,0">
         <var name="_context" id="1938598294982501574" />
       </scope>
-      <scope id="1938598294982501973" at="976,0,979,0">
+      <scope id="1938598294982501973" at="979,0,982,0">
         <var name="_context" id="1938598294982501973" />
       </scope>
-      <scope id="1938598294982492974" at="979,0,982,0">
+      <scope id="1938598294982492974" at="982,0,985,0">
         <var name="_context" id="1938598294982492974" />
       </scope>
-      <scope id="1938598294982493001" at="982,0,985,0">
+      <scope id="1938598294982493001" at="985,0,988,0">
         <var name="_context" id="1938598294982493001" />
       </scope>
-      <scope id="781140262677966746" at="985,0,988,0">
+      <scope id="781140262677966746" at="988,0,991,0">
         <var name="_context" id="781140262677966746" />
       </scope>
-      <scope id="4783730913495457061" at="988,0,991,0">
+      <scope id="4783730913495457061" at="991,0,994,0">
         <var name="_context" id="4783730913495457061" />
       </scope>
-      <scope id="1462305029084461973" at="991,0,994,0">
+      <scope id="1462305029084461973" at="994,0,997,0">
         <var name="_context" id="1462305029084461973" />
       </scope>
-      <scope id="5053813598678952394" at="994,0,997,0">
+      <scope id="5053813598678952394" at="997,0,1000,0">
         <var name="_context" id="5053813598678952394" />
       </scope>
-      <scope id="1462305029084452923" at="997,0,1000,0">
+      <scope id="1462305029084452923" at="1000,0,1003,0">
         <var name="_context" id="1462305029084452923" />
       </scope>
-      <scope id="5894421362117318861" at="1000,0,1003,0">
+      <scope id="5894421362117318861" at="1003,0,1006,0">
         <var name="_context" id="5894421362117318861" />
       </scope>
-      <scope id="5894421362117645774" at="1003,0,1006,0">
+      <scope id="5894421362117645774" at="1006,0,1009,0">
         <var name="_context" id="5894421362117645774" />
       </scope>
-      <scope id="8877724874822463465" at="1006,0,1009,0">
+      <scope id="8877724874822463465" at="1009,0,1012,0">
         <var name="_context" id="8877724874822463465" />
       </scope>
-      <scope id="781140262678203505" at="1009,0,1012,0">
+      <scope id="781140262678203505" at="1012,0,1015,0">
         <var name="_context" id="781140262678203505" />
       </scope>
-      <scope id="5894421362118001937" at="1012,0,1015,0">
+      <scope id="5894421362118001937" at="1015,0,1018,0">
         <var name="_context" id="5894421362118001937" />
       </scope>
-      <scope id="781140262678249380" at="1015,0,1018,0">
+      <scope id="781140262678249380" at="1018,0,1021,0">
         <var name="_context" id="781140262678249380" />
       </scope>
-      <scope id="1938598294988139939" at="1018,0,1021,0">
+      <scope id="1938598294988139939" at="1021,0,1024,0">
         <var name="_context" id="1938598294988139939" />
       </scope>
-      <scope id="1938598294988136820" at="1021,0,1024,0">
+      <scope id="1938598294988136820" at="1024,0,1027,0">
         <var name="_context" id="1938598294988136820" />
       </scope>
-      <scope id="781140262679960794" at="1024,0,1027,0">
+      <scope id="781140262679960794" at="1027,0,1030,0">
         <var name="_context" id="781140262679960794" />
       </scope>
-      <scope id="1938598294988146080" at="1027,0,1030,0">
+      <scope id="1938598294988146080" at="1030,0,1033,0">
         <var name="_context" id="1938598294988146080" />
       </scope>
-      <scope id="1938598294988149065" at="1030,0,1033,0">
+      <scope id="1938598294988149065" at="1033,0,1036,0">
         <var name="_context" id="1938598294988149065" />
       </scope>
-      <scope id="6845119683731096025" at="1033,0,1036,0">
+      <scope id="6845119683731096025" at="1036,0,1039,0">
         <var name="_context" id="6845119683731096025" />
       </scope>
-      <scope id="6520817392523151295" at="1036,0,1039,0">
+      <scope id="6520817392523151295" at="1039,0,1042,0">
         <var name="_context" id="6520817392523151295" />
       </scope>
-      <scope id="7753544965996885758" at="1153,0,1156,0">
+      <scope id="7753544965996885758" at="1159,0,1162,0">
         <var name="_context" id="7753544965996885758" />
       </scope>
-      <scope id="7753544965996885821" at="1156,0,1159,0">
+      <scope id="7753544965996885821" at="1162,0,1165,0">
         <var name="_context" id="7753544965996885821" />
       </scope>
-      <scope id="781140262679960784" at="1159,0,1162,0">
+      <scope id="781140262679960784" at="1165,0,1168,0">
         <var name="_context" id="781140262679960784" />
       </scope>
-      <scope id="1938598294988146070" at="1162,0,1165,0">
+      <scope id="1938598294988146070" at="1168,0,1171,0">
         <var name="_context" id="1938598294988146070" />
       </scope>
-      <scope id="1938598294988149055" at="1165,0,1168,0">
+      <scope id="1938598294988149055" at="1171,0,1174,0">
         <var name="_context" id="1938598294988149055" />
       </scope>
-      <scope id="6845119683731096015" at="1168,0,1171,0">
+      <scope id="6845119683731096015" at="1174,0,1177,0">
         <var name="_context" id="6845119683731096015" />
       </scope>
-      <scope id="772379520212560178" at="1171,0,1174,0">
+      <scope id="772379520212560178" at="1177,0,1180,0">
         <var name="_context" id="772379520212560178" />
       </scope>
-      <scope id="1462305029084462284" at="1174,0,1177,0">
+      <scope id="1462305029084462284" at="1180,0,1183,0">
         <var name="_context" id="1462305029084462284" />
       </scope>
-      <scope id="1462305029084462298" at="1177,0,1180,0">
+      <scope id="1462305029084462298" at="1183,0,1186,0">
         <var name="_context" id="1462305029084462298" />
       </scope>
-      <scope id="6845119683729431098" at="1405,0,1408,0">
+      <scope id="6845119683729431098" at="1411,0,1414,0">
         <var name="_context" id="6845119683729431098" />
       </scope>
-      <scope id="4157435862225495595" at="3318,0,3321,0">
+      <scope id="4157435862225495595" at="3330,0,3333,0">
         <var name="str" id="4157435862225495595" />
       </scope>
       <scope id="7753544965996885263" at="354,0,358,0">
@@ -4321,66 +4339,66 @@
   <root nodeRef="r:54537613-52b5-40a8-b223-e87f0960b04f(jetbrains.mps.build.mps.generator.template.main@generator)/8065469100328125695">
     <file name="QueriesGenerated.java">
       <node id="8065469100328133551" at="194,84,195,90" concept="6" />
-      <node id="8065469100328125714" at="765,89,766,123" concept="6" />
-      <node id="8065469100328125732" at="768,89,769,123" concept="6" />
-      <node id="8065469100328125768" at="771,89,772,123" concept="6" />
-      <node id="8065469100328125707" at="845,94,846,76" concept="6" />
-      <node id="8065469100328125763" at="848,94,849,30" concept="6" />
-      <node id="8065469100328125742" at="1533,105,1534,230" concept="6" />
-      <node id="8065469100328125740" at="2081,58,2082,58" concept="1" />
-      <node id="8065469100328125740" at="2211,16,2212,88" concept="6" />
-      <node id="8065469100328125711" at="2369,186,2370,200" concept="1" />
-      <node id="8065469100328125729" at="2370,200,2371,193" concept="1" />
-      <node id="8065469100328125765" at="2371,193,2372,200" concept="1" />
-      <node id="8065469100328125711" at="2684,17,2685,67" concept="6" />
-      <node id="8065469100328125729" at="2686,17,2687,67" concept="6" />
-      <node id="8065469100328125765" at="2688,17,2689,67" concept="6" />
-      <node id="8065469100328132896" at="2981,58,2982,58" concept="1" />
-      <node id="8065469100328132896" at="3010,15,3011,59" concept="6" />
-      <node id="8065469100328125704" at="3031,59,3032,62" concept="1" />
-      <node id="8065469100328125760" at="3032,62,3033,62" concept="1" />
-      <node id="8065469100328125704" at="3078,16,3079,71" concept="6" />
-      <node id="8065469100328125760" at="3080,16,3081,71" concept="6" />
+      <node id="8065469100328125714" at="768,89,769,123" concept="6" />
+      <node id="8065469100328125732" at="771,89,772,123" concept="6" />
+      <node id="8065469100328125768" at="774,89,775,123" concept="6" />
+      <node id="8065469100328125707" at="848,94,849,76" concept="6" />
+      <node id="8065469100328125763" at="851,94,852,30" concept="6" />
+      <node id="8065469100328125742" at="1539,105,1540,230" concept="6" />
+      <node id="8065469100328125740" at="2087,58,2088,58" concept="1" />
+      <node id="8065469100328125740" at="2217,16,2218,88" concept="6" />
+      <node id="8065469100328125711" at="2376,186,2377,200" concept="1" />
+      <node id="8065469100328125729" at="2377,200,2378,193" concept="1" />
+      <node id="8065469100328125765" at="2378,193,2379,200" concept="1" />
+      <node id="8065469100328125711" at="2693,17,2694,67" concept="6" />
+      <node id="8065469100328125729" at="2695,17,2696,67" concept="6" />
+      <node id="8065469100328125765" at="2697,17,2698,67" concept="6" />
+      <node id="8065469100328132896" at="2993,58,2994,58" concept="1" />
+      <node id="8065469100328132896" at="3022,15,3023,59" concept="6" />
+      <node id="8065469100328125704" at="3043,59,3044,62" concept="1" />
+      <node id="8065469100328125760" at="3044,62,3045,62" concept="1" />
+      <node id="8065469100328125704" at="3090,16,3091,71" concept="6" />
+      <node id="8065469100328125760" at="3092,16,3093,71" concept="6" />
       <node id="8065469100328132897" at="194,0,197,0" concept="9" trace="rule_Condition_17_0#(Ljetbrains/mps/generator/template/BaseMappingRuleContext;)Z" />
-      <node id="8065469100328125712" at="765,0,768,0" concept="9" trace="propertyMacro_GetValue_17_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8065469100328125730" at="768,0,771,0" concept="9" trace="propertyMacro_GetValue_17_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8065469100328125766" at="771,0,774,0" concept="9" trace="propertyMacro_GetValue_17_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <node id="8065469100328125705" at="845,0,848,0" concept="9" trace="referenceMacro_GetReferent_17_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="8065469100328125761" at="848,0,851,0" concept="9" trace="referenceMacro_GetReferent_17_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
-      <node id="8065469100328125740" at="1533,0,1536,0" concept="9" trace="sourceNodesQuery_17_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
+      <node id="8065469100328125712" at="768,0,771,0" concept="9" trace="propertyMacro_GetValue_17_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="8065469100328125730" at="771,0,774,0" concept="9" trace="propertyMacro_GetValue_17_1#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="8065469100328125766" at="774,0,777,0" concept="9" trace="propertyMacro_GetValue_17_2#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
+      <node id="8065469100328125705" at="848,0,851,0" concept="9" trace="referenceMacro_GetReferent_17_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="8065469100328125761" at="851,0,854,0" concept="9" trace="referenceMacro_GetReferent_17_1#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="8065469100328125740" at="1539,0,1542,0" concept="9" trace="sourceNodesQuery_17_0#(Ljetbrains/mps/generator/template/SourceSubstituteMacroNodesContext;)Ljava/lang/Iterable;" />
       <scope id="8065469100328132898" at="194,84,195,90" />
-      <scope id="8065469100328125713" at="765,89,766,123" />
-      <scope id="8065469100328125731" at="768,89,769,123" />
-      <scope id="8065469100328125767" at="771,89,772,123" />
-      <scope id="8065469100328125706" at="845,94,846,76" />
-      <scope id="8065469100328125762" at="848,94,849,30" />
-      <scope id="8065469100328125741" at="1533,105,1534,230" />
-      <scope id="8065469100328125740" at="2211,16,2212,88" />
-      <scope id="8065469100328125711" at="2684,17,2685,67" />
-      <scope id="8065469100328125729" at="2686,17,2687,67" />
-      <scope id="8065469100328125765" at="2688,17,2689,67" />
-      <scope id="8065469100328132896" at="3010,15,3011,59" />
-      <scope id="8065469100328125704" at="3078,16,3079,71" />
-      <scope id="8065469100328125760" at="3080,16,3081,71" />
+      <scope id="8065469100328125713" at="768,89,769,123" />
+      <scope id="8065469100328125731" at="771,89,772,123" />
+      <scope id="8065469100328125767" at="774,89,775,123" />
+      <scope id="8065469100328125706" at="848,94,849,76" />
+      <scope id="8065469100328125762" at="851,94,852,30" />
+      <scope id="8065469100328125741" at="1539,105,1540,230" />
+      <scope id="8065469100328125740" at="2217,16,2218,88" />
+      <scope id="8065469100328125711" at="2693,17,2694,67" />
+      <scope id="8065469100328125729" at="2695,17,2696,67" />
+      <scope id="8065469100328125765" at="2697,17,2698,67" />
+      <scope id="8065469100328132896" at="3022,15,3023,59" />
+      <scope id="8065469100328125704" at="3090,16,3091,71" />
+      <scope id="8065469100328125760" at="3092,16,3093,71" />
       <scope id="8065469100328132897" at="194,0,197,0">
         <var name="_context" id="8065469100328132897" />
       </scope>
-      <scope id="8065469100328125712" at="765,0,768,0">
+      <scope id="8065469100328125712" at="768,0,771,0">
         <var name="_context" id="8065469100328125712" />
       </scope>
-      <scope id="8065469100328125730" at="768,0,771,0">
+      <scope id="8065469100328125730" at="771,0,774,0">
         <var name="_context" id="8065469100328125730" />
       </scope>
-      <scope id="8065469100328125766" at="771,0,774,0">
+      <scope id="8065469100328125766" at="774,0,777,0">
         <var name="_context" id="8065469100328125766" />
       </scope>
-      <scope id="8065469100328125705" at="845,0,848,0">
+      <scope id="8065469100328125705" at="848,0,851,0">
         <var name="_context" id="8065469100328125705" />
       </scope>
-      <scope id="8065469100328125761" at="848,0,851,0">
+      <scope id="8065469100328125761" at="851,0,854,0">
         <var name="_context" id="8065469100328125761" />
       </scope>
-      <scope id="8065469100328125740" at="1533,0,1536,0">
+      <scope id="8065469100328125740" at="1539,0,1542,0">
         <var name="_context" id="8065469100328125740" />
       </scope>
     </file>
@@ -4398,40 +4416,40 @@
       <node id="4821808014881207580" at="330,22,331,177" concept="1" />
       <node id="4821808014881207592" at="331,177,332,19" concept="6" />
       <node id="4821808014881207597" at="333,5,334,15" concept="6" />
-      <node id="9095843441492671068" at="821,93,822,94" concept="6" />
-      <node id="4912951749633466226" at="899,78,900,89" concept="7" />
-      <node id="4912951749633467505" at="900,89,901,91" concept="7" />
-      <node id="4912951749633507772" at="901,91,902,128" concept="7" />
-      <node id="4912951749633510150" at="902,128,903,134" concept="7" />
-      <node id="4912951749633511090" at="903,134,904,148" concept="7" />
-      <node id="4912951749633512077" at="904,148,905,51" concept="7" />
-      <node id="4912951749633533930" at="905,51,906,149" concept="7" />
-      <node id="4912951749633535443" at="906,149,907,107" concept="7" />
-      <node id="4821808014881207405" at="907,107,908,143" concept="6" />
-      <node id="4821808014881207504" at="2251,198,2252,194" concept="1" />
-      <node id="4821808014881207504" at="2448,16,2449,66" concept="6" />
-      <node id="8252715012761547078" at="2729,57,2730,57" concept="1" />
-      <node id="8252715012761547078" at="2838,16,2839,61" concept="6" />
-      <node id="8252715012761547083" at="3023,61,3024,63" concept="1" />
-      <node id="8252715012761547083" at="3062,15,3063,70" concept="6" />
-      <node id="8252715012761547084" at="821,0,824,0" concept="9" trace="referenceMacro_GetReferent_4_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
+      <node id="9095843441492671068" at="824,93,825,94" concept="6" />
+      <node id="4912951749633466226" at="902,78,903,89" concept="7" />
+      <node id="4912951749633467505" at="903,89,904,91" concept="7" />
+      <node id="4912951749633507772" at="904,91,905,128" concept="7" />
+      <node id="4912951749633510150" at="905,128,906,134" concept="7" />
+      <node id="4912951749633511090" at="906,134,907,148" concept="7" />
+      <node id="4912951749633512077" at="907,148,908,51" concept="7" />
+      <node id="4912951749633533930" at="908,51,909,149" concept="7" />
+      <node id="4912951749633535443" at="909,149,910,107" concept="7" />
+      <node id="4821808014881207405" at="910,107,911,143" concept="6" />
+      <node id="4821808014881207504" at="2257,198,2258,194" concept="1" />
+      <node id="4821808014881207504" at="2455,16,2456,66" concept="6" />
+      <node id="8252715012761547078" at="2738,57,2739,57" concept="1" />
+      <node id="8252715012761547078" at="2848,16,2849,61" concept="6" />
+      <node id="8252715012761547083" at="3035,61,3036,63" concept="1" />
+      <node id="8252715012761547083" at="3074,15,3075,70" concept="6" />
+      <node id="8252715012761547084" at="824,0,827,0" concept="9" trace="referenceMacro_GetReferent_4_0#(Ljetbrains/mps/generator/template/ReferenceMacroContext;)Ljava/lang/Object;" />
       <node id="4821808014881207515" at="318,133,322,5" concept="3" />
       <node id="4821808014881207548" at="324,62,328,5" concept="3" />
       <node id="4821808014881207578" at="329,131,333,5" concept="3" />
-      <node id="8252715012761547079" at="899,0,910,0" concept="9" trace="ifMacro_Condition_4_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
+      <node id="8252715012761547079" at="902,0,913,0" concept="9" trace="ifMacro_Condition_4_0#(Ljetbrains/mps/generator/template/IfMacroContext;)Z" />
       <node id="4821808014881207505" at="317,0,336,0" concept="9" trace="propertyMacro_GetValue_4_0#(Ljetbrains/mps/generator/template/PropertyMacroContext;)Ljava/lang/Object;" />
-      <scope id="8252715012761547085" at="821,93,822,94" />
-      <scope id="4821808014881207504" at="2448,16,2449,66" />
-      <scope id="8252715012761547078" at="2838,16,2839,61" />
-      <scope id="8252715012761547083" at="3062,15,3063,70" />
+      <scope id="8252715012761547085" at="824,93,825,94" />
+      <scope id="4821808014881207504" at="2455,16,2456,66" />
+      <scope id="8252715012761547078" at="2848,16,2849,61" />
+      <scope id="8252715012761547083" at="3074,15,3075,70" />
       <scope id="4821808014881207516" at="319,26,321,19" />
       <scope id="4821808014881207549" at="325,29,327,19" />
       <scope id="4821808014881207579" at="330,22,332,19" />
-      <scope id="8252715012761547084" at="821,0,824,0">
+      <scope id="8252715012761547084" at="824,0,827,0">
         <var name="_context" id="8252715012761547084" />
       </scope>
-      <scope id="8252715012761547080" at="899,78,908,143" />
-      <scope id="8252715012761547079" at="899,0,910,0">
+      <scope id="8252715012761547080" at="902,78,911,143" />
+      <scope id="8252715012761547079" at="902,0,913,0">
         <var name="_context" id="8252715012761547079" />
       </scope>
       <scope id="4821808014881207506" at="317,88,334,15">
diff --git a/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps b/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps
index ce2e66c6a9ee..fe58cde23108 100644
--- a/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps
+++ b/plugins/mps-build/languages/build.mps/generator/template/jetbrains/mps/build/mps/generator/template/main@generator.mps
@@ -16579,6 +16579,36 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="2pNNFK" id="7aYn41gUsuj" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="7aYn41gUtjX" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="7aYn41gUtjY" role="2pMdts">
+                        <property role="2pMdty" value="-Didea.config.path=${build.mps.config.path}" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pNNFK" id="7aYn41gUtk9" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="7aYn41gUu9Q" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="7aYn41gUu9R" role="2pMdts">
+                        <property role="2pMdty" value="-Didea.system.path=${build.mps.system.path}" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pNNFK" id="6OON6YVXP4c" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="6OON6YVXP4d" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="6OON6YVXP4e" role="2pMdts">
+                        <property role="2pMdty" value="-Djna.boot.library.path=${build.jna.library.path}" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="2pNNFK" id="4mf44un4dsE" role="3o6s8t">
                     <property role="2pNNFO" value="arg" />
                     <property role="qg3DV" value="true" />
@@ -17489,6 +17519,88 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="2pNNFK" id="1ICn6ejfe6S" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="1ICn6ejfe6T" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="1ICn6ejfe6U" role="2pMdts">
+                        <property role="2pMdty" value="-Didea.config.path=${build.mps.config.path}" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pNNFK" id="1ICn6ejfe6V" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="1ICn6ejfe6W" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="1ICn6ejfe6X" role="2pMdts">
+                        <property role="2pMdty" value="-Didea.system.path=${build.mps.system.path}" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pNNFK" id="1ICn6ejfe6Y" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="1ICn6ejfe6Z" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="1ICn6ejfe70" role="2pMdts">
+                        <property role="2pMdty" value="-Djna.boot.library.path=${build.jna.library.path}" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pNNFK" id="1ICn6ejff9l" role="3o6s8t">
+                    <property role="2pNNFO" value="arg" />
+                    <property role="qg3DV" value="true" />
+                    <node concept="2pNUuL" id="1ICn6ejff9m" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="1ICn6ejff9n" role="2pMdts">
+                        <property role="2pMdty" value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pNNFK" id="1ICn6ejfezF" role="3o6s8t">
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="1ICn6ejfezG" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="1ICn6ejfezH" role="2pMdts">
+                        <property role="2pMdty" value="--options" />
+                        <node concept="17Uvod" id="1ICn6ejfezI" role="lGtFl">
+                          <property role="2qtEX9" value="text" />
+                          <property role="P4ACc" value="479c7a8c-02f9-43b5-9139-d910cb22f298/6666499814681541919/6666499814681541920" />
+                          <node concept="3zFVjK" id="1ICn6ejfezJ" role="3zH0cK">
+                            <node concept="3clFbS" id="1ICn6ejfezK" role="2VODD2">
+                              <node concept="3clFbF" id="1ICn6ejfezL" role="3cqZAp">
+                                <node concept="2OqwBi" id="1ICn6ejfezM" role="3clFbG">
+                                  <node concept="1iwH7S" id="1ICn6ejfezN" role="2Oq$k0" />
+                                  <node concept="1psM6Z" id="1ICn6ejfezO" role="2OqNvi">
+                                    <ref role="1psM6Y" node="1FkcQH_$a29" resolve="generatorOptions" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1W57fq" id="1ICn6ejfezP" role="lGtFl">
+                      <node concept="3IZrLx" id="1ICn6ejfezQ" role="3IZSJc">
+                        <node concept="3clFbS" id="1ICn6ejfezR" role="2VODD2">
+                          <node concept="3clFbF" id="1ICn6ejfezS" role="3cqZAp">
+                            <node concept="3y3z36" id="1ICn6ejfezT" role="3clFbG">
+                              <node concept="10Nm6u" id="1ICn6ejfezU" role="3uHU7w" />
+                              <node concept="2OqwBi" id="1ICn6ejfezV" role="3uHU7B">
+                                <node concept="1iwH7S" id="1ICn6ejfezW" role="2Oq$k0" />
+                                <node concept="1psM6Z" id="1ICn6ejfezX" role="2OqNvi">
+                                  <ref role="1psM6Y" node="1FkcQH_$a29" resolve="generatorOptions" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="2pNNFK" id="3w1$bnwPhf_" role="3o6s8t">
                   <property role="2pNNFO" value="macro" />
@@ -18699,6 +18811,36 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="2pNNFK" id="1ICn6ejfgKj" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="1ICn6ejfgKk" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="1ICn6ejfgKl" role="2pMdts">
+                        <property role="2pMdty" value="-Didea.config.path=${build.mps.config.path}" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pNNFK" id="1ICn6ejfgKm" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="1ICn6ejfgKn" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="1ICn6ejfgKo" role="2pMdts">
+                        <property role="2pMdty" value="-Didea.system.path=${build.mps.system.path}" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2pNNFK" id="1ICn6ejfgKp" role="3o6s8t">
+                    <property role="qg3DV" value="true" />
+                    <property role="2pNNFO" value="arg" />
+                    <node concept="2pNUuL" id="1ICn6ejfgKq" role="2pNNFR">
+                      <property role="2pNUuO" value="value" />
+                      <node concept="2pMdtt" id="1ICn6ejfgKr" role="2pMdts">
+                        <property role="2pMdty" value="-Djna.boot.library.path=${build.jna.library.path}" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
                 <node concept="3o6iSG" id="7MPX9wYr_gj" role="3o6s8t" />
                 <node concept="2pNNFK" id="4lGpBZBMs5b" role="3o6s8t">
diff --git a/plugins/mps-build/languages/build.mps/util/jetbrains/mps/build/mps/accessories.mps b/plugins/mps-build/languages/build.mps/util/jetbrains/mps/build/mps/accessories.mps
index 172ea673b25a..c987dad4e8ac 100644
--- a/plugins/mps-build/languages/build.mps/util/jetbrains/mps/build/mps/accessories.mps
+++ b/plugins/mps-build/languages/build.mps/util/jetbrains/mps/build/mps/accessories.mps
@@ -23,10 +23,34 @@
       <concept id="2769948622284546675" name="jetbrains.mps.build.workflow.structure.BwfTask" flags="ng" index="2VaFvF">
         <child id="2769948622284574302" name="dependencies" index="2VaxJ6" />
       </concept>
+      <concept id="2769948622284546677" name="jetbrains.mps.build.workflow.structure.BwfSubTask" flags="ng" index="2VaFvH">
+        <child id="2769948622284606050" name="statements" index="2VaTZU" />
+      </concept>
+      <concept id="2769948622284768359" name="jetbrains.mps.build.workflow.structure.BwfAntStatement" flags="ng" index="2Vbh7Z">
+        <child id="2769948622284768360" name="element" index="2Vbh7K" />
+      </concept>
       <concept id="3961775458390032824" name="jetbrains.mps.build.workflow.structure.BwfTaskPart" flags="ng" index="3bMsLL">
         <reference id="3961775458390032825" name="task" index="3bMsLK" />
+        <child id="3961775458390032826" name="subTasks" index="3bMsLN" />
         <child id="3961775458390352322" name="additionalDependencies" index="3bNaKb" />
       </concept>
+      <concept id="6896005762093571400" name="jetbrains.mps.build.workflow.structure.BwfMacro" flags="ng" index="1_4tnW">
+        <property id="6896005762093571407" name="isLocation" index="1_4tnV" />
+        <property id="6896005762093571402" name="defaultValue" index="1_4tnY" />
+      </concept>
+    </language>
+    <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml">
+      <concept id="6666499814681541919" name="jetbrains.mps.core.xml.structure.XmlTextValue" flags="ng" index="2pMdtt">
+        <property id="6666499814681541920" name="text" index="2pMdty" />
+      </concept>
+      <concept id="6666499814681415858" name="jetbrains.mps.core.xml.structure.XmlElement" flags="ng" index="2pNNFK">
+        <property id="6666499814681415862" name="tagName" index="2pNNFO" />
+        <child id="6666499814681415861" name="attributes" index="2pNNFR" />
+      </concept>
+      <concept id="6666499814681447923" name="jetbrains.mps.core.xml.structure.XmlAttribute" flags="ng" index="2pNUuL">
+        <property id="6666499814681447926" name="attrName" index="2pNUuO" />
+        <child id="6666499814681541918" name="value" index="2pMdts" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
@@ -36,6 +60,21 @@
   </registry>
   <node concept="yghi3" id="m8_23bzloH">
     <property role="TrG5h" value="mps" />
+    <node concept="1_4tnW" id="o7F7WgLLiA" role="yghi5">
+      <property role="1_4tnV" value="true" />
+      <property role="TrG5h" value="build.mps.config.path" />
+      <property role="1_4tnY" value="${build.dir}/config" />
+    </node>
+    <node concept="1_4tnW" id="o7F7WgLLik" role="yghi5">
+      <property role="1_4tnV" value="true" />
+      <property role="TrG5h" value="build.mps.system.path" />
+      <property role="1_4tnY" value="${build.dir}/system" />
+    </node>
+    <node concept="1_4tnW" id="1ICn6ejf9Da" role="yghi5">
+      <property role="1_4tnV" value="true" />
+      <property role="TrG5h" value="build.jna.library.path" />
+      <property role="1_4tnY" value="${mps_home}/lib/jna" />
+    </node>
     <node concept="2VaFvF" id="m8_23bzoyR" role="yghi5">
       <property role="TrG5h" value="generate" />
       <node concept="2VaxJe" id="m8_23bSm_s" role="2VaxJ6">
@@ -54,6 +93,34 @@
     <node concept="2VaFvF" id="3zFnP6MHc0r" role="yghi5">
       <property role="TrG5h" value="makeDependents" />
     </node>
+    <node concept="3bMsLL" id="o7F7WgLLi3" role="yghi5">
+      <ref role="3bMsLK" to="arit:6l_Qx579cKM" resolve="clean" />
+      <node concept="2VaFvH" id="o7F7WgLLia" role="3bMsLN">
+        <property role="TrG5h" value="clear.mps.cahces" />
+        <node concept="2Vbh7Z" id="o7F7WgLLtL" role="2VaTZU">
+          <node concept="2pNNFK" id="o7F7WgLLtV" role="2Vbh7K">
+            <property role="2pNNFO" value="delete" />
+            <node concept="2pNUuL" id="o7F7WgLLtZ" role="2pNNFR">
+              <property role="2pNUuO" value="dir" />
+              <node concept="2pMdtt" id="o7F7WgLLu1" role="2pMdts">
+                <property role="2pMdty" value="${build.mps.config.path}" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Vbh7Z" id="o7F7WgLLiK" role="2VaTZU">
+          <node concept="2pNNFK" id="o7F7WgLLtd" role="2Vbh7K">
+            <property role="2pNNFO" value="delete" />
+            <node concept="2pNUuL" id="o7F7WgLLth" role="2pNNFR">
+              <property role="2pNUuO" value="dir" />
+              <node concept="2pMdtt" id="o7F7WgLLtj" role="2pMdts">
+                <property role="2pMdty" value="${build.mps.system.path}" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="ygXWA" id="5T0Kicg_Jpc" role="yg1MB">
       <ref role="ygXWD" to="arit:6l_Qx579h0V" resolve="common" />
     </node>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml
index 96c3b781ab19..03ffbdbe05c8 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml
@@ -1,6 +1,9 @@
 <project name="buildTest" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/buildTest" />
   <property name="build.layout" location="${build.dir}/artifacts/buildTest" />
   <property name="artifacts.mps" location="../../../build/artifacts/mps" />
@@ -138,6 +141,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -255,6 +260,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml
index 20d5ca655dff..fdd91907e176 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml
@@ -1,6 +1,9 @@
 <project name="buildTest2" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/buildTest2" />
   <property name="build.layout" location="${build.dir}/artifacts/buildTest2" />
   <property name="artifacts.mps" location="../../../build/artifacts/mps" />
@@ -171,6 +174,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -287,6 +292,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml
index 7d53dbe220c0..9c8623dc0ddd 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml
@@ -1,6 +1,9 @@
 <project name="buildPlugin" default="build" basedir="../../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/buildPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/buildPlugin" />
   <property name="artifacts.mps" location="../../build/artifacts/mps" />
@@ -232,6 +235,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -350,6 +355,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml
index 7d53dbe220c0..9c8623dc0ddd 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml
@@ -1,6 +1,9 @@
 <project name="buildPlugin" default="build" basedir="../../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/buildPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/buildPlugin" />
   <property name="artifacts.mps" location="../../build/artifacts/mps" />
@@ -232,6 +235,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -350,6 +355,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info
index c5364099f207..554abcccc46a 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:02e26212-728e-46cb-bbf3-c544990b3781(jetbrains.mps.build.sandbox.stripImplementation)/3389822811992714254">
     <file name="buildPlugin.xml">
-      <unit id="3389822811992714254" at="1,0,603,10" name="jetbrains.mps.build.sandbox.stripImplementation.buildPlugin" />
+      <unit id="3389822811992714254" at="1,0,611,10" name="jetbrains.mps.build.sandbox.stripImplementation.buildPlugin" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml
index 96c3b781ab19..03ffbdbe05c8 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml
@@ -1,6 +1,9 @@
 <project name="buildTest" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/buildTest" />
   <property name="build.layout" location="${build.dir}/artifacts/buildTest" />
   <property name="artifacts.mps" location="../../../build/artifacts/mps" />
@@ -138,6 +141,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -255,6 +260,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml
index 20d5ca655dff..fdd91907e176 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml
@@ -1,6 +1,9 @@
 <project name="buildTest2" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/buildTest2" />
   <property name="build.layout" location="${build.dir}/artifacts/buildTest2" />
   <property name="artifacts.mps" location="../../../build/artifacts/mps" />
@@ -171,6 +174,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -287,6 +292,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info
index a155b603f757..4f40441f662c 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info
@@ -2,12 +2,12 @@
 <debug-info version="2">
   <root nodeRef="r:911b64be-e838-4b67-bbec-bce1a5b0b287(jetbrains.mps.build.sandbox.testExternalBuild)/8056730377013685541">
     <file name="buildTest.xml">
-      <unit id="8056730377013685541" at="1,0,452,10" name="jetbrains.mps.build.sandbox.testExternalBuild.buildTest" />
+      <unit id="8056730377013685541" at="1,0,460,10" name="jetbrains.mps.build.sandbox.testExternalBuild.buildTest" />
     </file>
   </root>
   <root nodeRef="r:911b64be-e838-4b67-bbec-bce1a5b0b287(jetbrains.mps.build.sandbox.testExternalBuild)/8077978191914979020">
     <file name="buildTest2.xml">
-      <unit id="8077978191914979020" at="1,0,465,10" name="jetbrains.mps.build.sandbox.testExternalBuild.buildTest2" />
+      <unit id="8077978191914979020" at="1,0,473,10" name="jetbrains.mps.build.sandbox.testExternalBuild.buildTest2" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml
index 5eeab9c4cd01..76e7fbff2ae3 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml
@@ -1,6 +1,9 @@
 <project name="jetpad" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/jetpad" />
   <property name="build.layout" location="${build.dir}/artifacts/jetpad" />
   <property name="idea_home" location="" />
@@ -91,6 +94,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -120,6 +125,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml
index a61adecdeb9d..4e3f11d1337c 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsAntToolsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsAntToolsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsAntToolsPlugin" />
   <property name="idea_home" location="" />
@@ -103,6 +106,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -231,6 +236,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
index ad195c9cf466..57ad2901b148 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
@@ -1,6 +1,9 @@
 <project name="mpsBootstrapCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBootstrapCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBootstrapCore" />
   <property name="version.major" value="2023" />
@@ -16486,6 +16489,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -16689,6 +16694,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml
index bba0233bee41..7e4b079c4651 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml
@@ -1,6 +1,9 @@
 <project name="mpsBuild" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuild" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuild" />
   <property name="idea_home" location="" />
@@ -1592,6 +1595,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1766,6 +1771,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml
index 04bf6c6574b2..6405e369e638 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml
@@ -1,6 +1,9 @@
 <project name="mpsBuildUI" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuildUI" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuildUI" />
   <property name="idea_home" location="" />
@@ -334,6 +337,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -484,6 +489,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml
index 619b053143e9..3939403869d2 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsConsolePlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsConsolePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsConsolePlugin" />
   <property name="idea_home" location="" />
@@ -1101,6 +1104,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1273,6 +1278,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml
index b13a9621a363..a39fc568fa9c 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml
@@ -1,6 +1,9 @@
 <project name="mpsContextActionsTool" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsContextActionsTool" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsContextActionsTool" />
   <property name="idea_home" location="" />
@@ -339,6 +342,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -493,6 +498,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
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 e86d4939ba93..dfa6492154cd 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
@@ -1,6 +1,9 @@
 <project name="mpsCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsCore" />
   <property name="idea_home" location="" />
@@ -755,6 +758,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -911,6 +916,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml
index d5bc8cf68314..381d9acbd3ef 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsDebuggerPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDebuggerPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDebuggerPlugin" />
   <property name="idea_home" location="" />
@@ -1406,6 +1409,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1579,6 +1584,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml
index ca2fb9cb2b34..847868bfce3d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml
@@ -1,6 +1,9 @@
 <project name="mpsDevKit" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDevKit" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDevKit" />
   <property name="idea_home" location="" />
@@ -990,6 +993,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1153,6 +1158,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml
index 267a67b25e45..24742327fd1c 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml
@@ -1,6 +1,9 @@
 <project name="mpsDiagramEditor" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDiagramEditor" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDiagramEditor" />
   <property name="idea_home" location="" />
@@ -541,6 +544,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -701,6 +706,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml
index 6aa53a0a6fd1..4906add672d9 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsExecutionPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsExecutionPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsExecutionPlugin" />
   <property name="idea_home" location="" />
@@ -1107,6 +1110,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1292,6 +1297,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml
index b181f497b803..7675d82c8bca 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsHttpSupportPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsHttpSupportPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsHttpSupportPlugin" />
   <property name="idea_home" location="" />
@@ -429,6 +432,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -590,6 +595,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml
index 051659fcc2d9..f75c81b656be 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml
@@ -1,6 +1,9 @@
 <project name="mpsJava" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJava" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJava" />
   <property name="mps_home" location="${basedir}" />
@@ -161,6 +164,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -299,6 +304,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml
index 5b433d072ae4..97c14b6ce27d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml
@@ -1,6 +1,9 @@
 <project name="mpsJavaCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaCore" />
   <property name="mps_home" location="${basedir}" />
@@ -133,6 +136,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -264,6 +269,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml
index 62c4f28cf89c..9947e5c3b5a6 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml
@@ -1,6 +1,9 @@
 <project name="mpsJavaPlatform" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaPlatform" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaPlatform" />
   <property name="mps_home" location="${basedir}" />
@@ -157,6 +160,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -293,6 +298,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
index 8d2849d2e696..910374f0f565 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsKotlinPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsKotlinPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsKotlinPlugin" />
   <property name="idea_home" location="" />
@@ -1057,6 +1060,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1227,6 +1232,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml
index 2805e7acc648..49e31b249ac8 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsMakePlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMakePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMakePlugin" />
   <property name="idea_home" location="" />
@@ -156,6 +159,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -295,6 +300,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml
index 42d81b8e1d94..15b97e549ac5 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml
@@ -1,6 +1,9 @@
 <project name="mpsMigration" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMigration" />
   <property name="idea_home" location="" />
@@ -344,6 +347,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -488,6 +493,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml
index e4ebbacb81d0..cd32cdb27150 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml
@@ -1,6 +1,9 @@
 <project name="mpsMigrationCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMigrationCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMigrationCore" />
   <property name="idea_home" location="" />
@@ -65,6 +68,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml
index 25b1342f67b0..4639dad52c74 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml
@@ -1,6 +1,9 @@
 <project name="mpsNavigationBar" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsNavigationBar" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsNavigationBar" />
   <property name="idea_home" location="" />
@@ -68,6 +71,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
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 1d48c4ce5ca9..ca83a68ab552 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
@@ -1,6 +1,9 @@
 <project name="mpsPlugins" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPlugins" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPlugins" />
   <property name="idea_home" location="" />
@@ -782,6 +785,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -936,6 +941,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml
index 1b3764a20d96..853732d6c2f1 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsSpellCheckPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsSpellCheckPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsSpellCheckPlugin" />
   <property name="idea_home" location="" />
@@ -121,6 +124,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -255,6 +260,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml
index 8c9c59ea3241..a57a528f8e77 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml
@@ -1,6 +1,9 @@
 <project name="mpsStandalone" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsStandalone" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsStandalone" />
   <property name="mps_home" location="${basedir}" />
@@ -115,6 +118,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
index 7ea4f2d5ebec..a3d5df161b6f 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
@@ -1,6 +1,9 @@
 <project name="mpsTesting" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTesting" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTesting" />
   <property name="idea_home" location="" />
@@ -1165,6 +1168,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1335,6 +1340,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml
index 34dbf16eb57a..8f6b643daa1f 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml
@@ -1,6 +1,9 @@
 <project name="mpsTooltips" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTooltips" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTooltips" />
   <property name="idea_home" location="" />
@@ -266,6 +269,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -402,6 +407,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml
index 3ace2444b1b5..84c9e5a6d5ad 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml
@@ -1,6 +1,9 @@
 <project name="mpsTroveCollections" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTroveCollections" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTroveCollections" />
   <property name="idea_home" location="" />
@@ -269,6 +272,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -401,6 +406,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml
index 4e73d028b23c..e70ceb995f91 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml
@@ -1,6 +1,9 @@
 <project name="mpsVcs" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVcs" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVcs" />
   <property name="idea_home" location="" />
@@ -470,6 +473,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -639,6 +644,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml
index 75a500c2b8f6..9274892ab7f1 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml
@@ -1,6 +1,9 @@
 <project name="mpsVcsPlatform" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVcsPlatform" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVcsPlatform" />
   <property name="idea_home" location="" />
@@ -425,6 +428,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -574,6 +579,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml
index ce0525188c52..f6906865b67d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml
@@ -1,6 +1,9 @@
 <project name="mpsWorkbench" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsWorkbench" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsWorkbench" />
   <property name="idea_home" location="" />
@@ -362,6 +365,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -524,6 +529,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
index 7dd9ae9d2a08..6c560222bdc8 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTestModules" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTestModules" />
   <property name="mps_home" location="" />
@@ -704,6 +705,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1320,7 +1324,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
index e079cde8e14d..007c633feafc 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:12897c41-1d23-444a-8c3d-8a254e74f9b6(jetbrains.mps.ide.build.tests.generatedTests)/1179917706899984993">
     <file name="mpsTestModules.xml">
-      <unit id="1179917706899984993" at="1,0,1475,10" name="jetbrains.mps.ide.build.tests.generatedTests.mpsTestModules" />
+      <unit id="1179917706899984993" at="1,0,1479,10" name="jetbrains.mps.ide.build.tests.generatedTests.mpsTestModules" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
index fdd0d9e9b415..bd60a6df5a61 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsActions" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsActions" />
   <property name="mps_home" location="" />
@@ -240,6 +241,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -340,7 +344,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
index 482bba2f8612..14b72fe3f35d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBaseLanguage" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBaseLanguage" />
   <property name="mps_home" location="" />
@@ -1043,6 +1044,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1955,7 +1959,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
index 3ca6149dc8ca..5285046e2600 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBehavior" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBehavior" />
   <property name="mps_home" location="" />
@@ -826,6 +827,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1285,7 +1289,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
index 9574f398beea..7f0a1faa9ef1 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuild" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuild" />
   <property name="mps_home" location="" />
@@ -311,6 +312,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -485,7 +489,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
index 84b8a78ab6a1..e6996ab42046 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsConsole" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsConsole" />
   <property name="mps_home" location="" />
@@ -271,6 +272,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -430,7 +434,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
index a674abe54a63..b7fc5772de2f 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsConstraints" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsConstraints" />
   <property name="mps_home" location="" />
@@ -579,6 +580,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -955,7 +959,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
index 2f4311bf83f9..b6220bf0d17f 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDataFlow" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDataFlow" />
   <property name="mps_home" location="" />
@@ -489,6 +490,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -764,7 +768,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
index 5a7df55b60ca..c3e542e5bf9d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditor" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditor" />
   <property name="mps_home" location="" />
@@ -1831,6 +1832,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -3328,7 +3332,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
index 2a3386f17dd7..bdb8e5adf722 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorDiagram" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorDiagram" />
   <property name="mps_home" location="" />
@@ -437,6 +438,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -708,7 +712,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
index 963a7614123e..1ef43c02ab39 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorImageGen" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorImageGen" />
   <property name="mps_home" location="${basedir}/build/artifacts/mps" />
@@ -414,6 +415,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
         <arg value="--add-opens=java.desktop/sun.font=ALL-UNNAMED" />
       </jvmargs>
@@ -630,7 +634,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
index 5b4251df28c7..601a28d1a775 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorTransformationMenu" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorTransformationMenu" />
   <property name="mps_home" location="" />
@@ -1797,6 +1798,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -3173,7 +3177,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
index 59caf2be1801..dfae2964bc85 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsExecution" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsExecution" />
   <property name="mps_home" location="" />
@@ -611,6 +612,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1015,7 +1019,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
index 68ea84fb98ee..c9418be63b79 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsFeedback" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsFeedback" />
   <property name="mps_home" location="" />
@@ -367,6 +368,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -539,7 +543,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
index 0154c44de7d8..60cbe0777bd6 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsGenerator" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsGenerator" />
   <property name="mps_home" location="" />
@@ -1719,6 +1720,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -3091,7 +3095,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
index 83e91c0d8459..77cb55582cf7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsHttpSupport" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsHttpSupport" />
   <property name="mps_home" location="" />
@@ -259,6 +260,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -419,7 +423,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
index f47096b9d39f..91413a387295 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsImplementationStripping" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsImplementationStripping" />
   <property name="mps_home" location="" />
@@ -470,6 +471,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -754,7 +758,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
index 3561a5b347bb..6398fe3ed2af 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJava" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJava" />
   <property name="mps_home" location="" />
@@ -303,6 +304,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -436,7 +440,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
index f62a7dde5aed..b8505582b14b 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsKotlin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsKotlin" />
   <property name="mps_home" location="" />
@@ -326,6 +327,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -511,7 +515,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
index e61590a936f0..d5d8db666621 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPackaged" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPackaged" />
   <property name="mps_home" location="" />
@@ -377,6 +378,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -546,7 +550,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
index 6b119543500b..3bde45ce4c89 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsSModel" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsSModel" />
   <property name="mps_home" location="" />
@@ -489,6 +490,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -911,7 +915,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
index b12404b6e176..1d6ca4b1f57b 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsSmartRefAttrMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsSmartRefAttrMigration" />
   <property name="mps_home" location="" />
@@ -238,6 +239,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -339,7 +343,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
index b18c8a633f49..9d061f7d2ca7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTest" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTest" />
   <property name="mps_home" location="" />
@@ -1256,6 +1257,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -2316,7 +2320,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
index 0bfae909d357..066a11a0eeba 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsText" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsText" />
   <property name="mps_home" location="" />
@@ -247,6 +248,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -347,7 +351,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
index 99f2a7bfbadb..605891d4f765 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsToolTests" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsToolTests" />
   <property name="mps_home" location="" />
@@ -300,6 +301,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -515,7 +519,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
index 2969345aa413..1e6d47fc61a3 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
@@ -3,6 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTypesystem" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTypesystem" />
   <property name="mps_home" location="" />
@@ -1093,6 +1094,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
@@ -1794,7 +1798,7 @@
         <arg value="-XX:+HeapDumpOnOutOfMemoryError" />
         <arg value="-Didea.config.path=${build.mps.config.path}" />
         <arg value="-Didea.system.path=${build.mps.system.path}" />
-        <arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
       </jvmargs>
       
       
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml
index e679d41b73cc..80788283258b 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVCS" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVCS" />
   <property name="mps_home" location="${basedir}" />
@@ -88,6 +91,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -200,6 +205,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
index f4d0f21bce54..f8eebfdb6067 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
@@ -2,132 +2,132 @@
 <debug-info version="2">
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/141865155246494254">
     <file name="mpsDataFlow.xml">
-      <unit id="141865155246494254" at="1,0,898,10" name="jetbrains.mps.ide.build.tests.mpsDataFlow" />
+      <unit id="141865155246494254" at="1,0,902,10" name="jetbrains.mps.ide.build.tests.mpsDataFlow" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/1889888958307906528">
     <file name="mpsKotlin.xml">
-      <unit id="1889888958307906528" at="1,0,635,10" name="jetbrains.mps.ide.build.tests.mpsKotlin" />
+      <unit id="1889888958307906528" at="1,0,639,10" name="jetbrains.mps.ide.build.tests.mpsKotlin" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2085316548396374793">
     <file name="mpsImplementationStripping.xml">
-      <unit id="2085316548396374793" at="1,0,906,10" name="jetbrains.mps.ide.build.tests.mpsImplementationStripping" />
+      <unit id="2085316548396374793" at="1,0,910,10" name="jetbrains.mps.ide.build.tests.mpsImplementationStripping" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2201735946498405745">
     <file name="mpsTypesystem.xml">
-      <unit id="2201735946498405745" at="1,0,1959,10" name="jetbrains.mps.ide.build.tests.mpsTypesystem" />
+      <unit id="2201735946498405745" at="1,0,1963,10" name="jetbrains.mps.ide.build.tests.mpsTypesystem" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2883693069523015134">
     <file name="mpsConstraints.xml">
-      <unit id="2883693069523015134" at="1,0,1108,10" name="jetbrains.mps.ide.build.tests.mpsConstraints" />
+      <unit id="2883693069523015134" at="1,0,1112,10" name="jetbrains.mps.ide.build.tests.mpsConstraints" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3071492597344792659">
     <file name="mpsFeedback.xml">
-      <unit id="3071492597344792659" at="1,0,687,10" name="jetbrains.mps.ide.build.tests.mpsFeedback" />
+      <unit id="3071492597344792659" at="1,0,691,10" name="jetbrains.mps.ide.build.tests.mpsFeedback" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3197190366568000187">
     <file name="mpsBuild.xml">
-      <unit id="3197190366568000187" at="1,0,613,10" name="jetbrains.mps.ide.build.tests.mpsBuild" />
+      <unit id="3197190366568000187" at="1,0,617,10" name="jetbrains.mps.ide.build.tests.mpsBuild" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3474133302908391407">
     <file name="mpsExecution.xml">
-      <unit id="3474133302908391407" at="1,0,1190,10" name="jetbrains.mps.ide.build.tests.mpsExecution" />
+      <unit id="3474133302908391407" at="1,0,1194,10" name="jetbrains.mps.ide.build.tests.mpsExecution" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3856853424911912638">
     <file name="mpsEditorImageGen.xml">
-      <unit id="3856853424911912638" at="1,0,776,10" name="jetbrains.mps.ide.build.tests.mpsEditorImageGen" />
+      <unit id="3856853424911912638" at="1,0,780,10" name="jetbrains.mps.ide.build.tests.mpsEditorImageGen" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4074183641147971049">
     <file name="mpsSModel.xml">
-      <unit id="4074183641147971049" at="1,0,1039,10" name="jetbrains.mps.ide.build.tests.mpsSModel" />
+      <unit id="4074183641147971049" at="1,0,1043,10" name="jetbrains.mps.ide.build.tests.mpsSModel" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4286050570470716727">
     <file name="mpsText.xml">
-      <unit id="4286050570470716727" at="1,0,476,10" name="jetbrains.mps.ide.build.tests.mpsText" />
+      <unit id="4286050570470716727" at="1,0,480,10" name="jetbrains.mps.ide.build.tests.mpsText" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5003005296035786909">
     <file name="mpsEditorDiagram.xml">
-      <unit id="5003005296035786909" at="1,0,862,10" name="jetbrains.mps.ide.build.tests.mpsEditorDiagram" />
+      <unit id="5003005296035786909" at="1,0,866,10" name="jetbrains.mps.ide.build.tests.mpsEditorDiagram" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5332690376493680136">
     <file name="mpsSmartRefAttrMigration.xml">
-      <unit id="5332690376493680136" at="1,0,452,10" name="jetbrains.mps.ide.build.tests.mpsSmartRefAttrMigration" />
+      <unit id="5332690376493680136" at="1,0,456,10" name="jetbrains.mps.ide.build.tests.mpsSmartRefAttrMigration" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5624877018229105292">
     <file name="mpsEditorTransformationMenu.xml">
-      <unit id="5624877018229105292" at="1,0,3352,10" name="jetbrains.mps.ide.build.tests.mpsEditorTransformationMenu" />
+      <unit id="5624877018229105292" at="1,0,3356,10" name="jetbrains.mps.ide.build.tests.mpsEditorTransformationMenu" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5833628797344916224">
     <file name="mpsEditor.xml">
-      <unit id="5833628797344916224" at="1,0,3509,10" name="jetbrains.mps.ide.build.tests.mpsEditor" />
+      <unit id="5833628797344916224" at="1,0,3513,10" name="jetbrains.mps.ide.build.tests.mpsEditor" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5973657458022229901">
     <file name="mpsPackaged.xml">
-      <unit id="5973657458022229901" at="1,0,691,10" name="jetbrains.mps.ide.build.tests.mpsPackaged" />
+      <unit id="5973657458022229901" at="1,0,695,10" name="jetbrains.mps.ide.build.tests.mpsPackaged" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6147098677962246363">
     <file name="mpsHttpSupport.xml">
-      <unit id="6147098677962246363" at="1,0,535,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
+      <unit id="6147098677962246363" at="1,0,539,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353312053">
     <file name="mpsGenerator.xml">
-      <unit id="617882099353312053" at="1,0,3292,10" name="jetbrains.mps.ide.build.tests.mpsGenerator" />
+      <unit id="617882099353312053" at="1,0,3296,10" name="jetbrains.mps.ide.build.tests.mpsGenerator" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353331886">
     <file name="mpsJava.xml">
-      <unit id="617882099353331886" at="1,0,555,10" name="jetbrains.mps.ide.build.tests.mpsJava" />
+      <unit id="617882099353331886" at="1,0,559,10" name="jetbrains.mps.ide.build.tests.mpsJava" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6238501899265293051">
     <file name="mpsActions.xml">
-      <unit id="6238501899265293051" at="1,0,454,10" name="jetbrains.mps.ide.build.tests.mpsActions" />
+      <unit id="6238501899265293051" at="1,0,458,10" name="jetbrains.mps.ide.build.tests.mpsActions" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6390717532282583654">
     <file name="mpsVCS.xml">
-      <unit id="6390717532282583654" at="1,0,358,10" name="jetbrains.mps.ide.build.tests.mpsVCS" />
+      <unit id="6390717532282583654" at="1,0,366,10" name="jetbrains.mps.ide.build.tests.mpsVCS" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7210153263370654627">
     <file name="mpsBaseLanguage.xml">
-      <unit id="7210153263370654627" at="1,0,2123,10" name="jetbrains.mps.ide.build.tests.mpsBaseLanguage" />
+      <unit id="7210153263370654627" at="1,0,2127,10" name="jetbrains.mps.ide.build.tests.mpsBaseLanguage" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7438002853058266164">
     <file name="mpsBehavior.xml">
-      <unit id="7438002853058266164" at="1,0,1416,10" name="jetbrains.mps.ide.build.tests.mpsBehavior" />
+      <unit id="7438002853058266164" at="1,0,1420,10" name="jetbrains.mps.ide.build.tests.mpsBehavior" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7763823021514561033">
     <file name="mpsTest.xml">
-      <unit id="7763823021514561033" at="1,0,2507,10" name="jetbrains.mps.ide.build.tests.mpsTest" />
+      <unit id="7763823021514561033" at="1,0,2511,10" name="jetbrains.mps.ide.build.tests.mpsTest" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/9064011936883918541">
     <file name="mpsToolTests.xml">
-      <unit id="9064011936883918541" at="1,0,641,10" name="jetbrains.mps.ide.build.tests.mpsToolTests" />
+      <unit id="9064011936883918541" at="1,0,645,10" name="jetbrains.mps.ide.build.tests.mpsToolTests" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/9219004022556570565">
     <file name="mpsConsole.xml">
-      <unit id="9219004022556570565" at="1,0,552,10" name="jetbrains.mps.ide.build.tests.mpsConsole" />
+      <unit id="9219004022556570565" at="1,0,556,10" name="jetbrains.mps.ide.build.tests.mpsConsole" />
     </file>
   </root>
 </debug-info>
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 51990fd02a2c..e19a46b28ed6 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
@@ -2,47 +2,47 @@
 <debug-info version="2">
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1392391688312941958">
     <file name="mpsStandalone.xml">
-      <unit id="1392391688312941958" at="1,0,137,10" name="jetbrains.mps.ide.build.mpsStandalone" />
+      <unit id="1392391688312941958" at="1,0,142,10" name="jetbrains.mps.ide.build.mpsStandalone" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1432730276628307864">
     <file name="mpsKotlinPlugin.xml">
-      <unit id="1432730276628307864" at="1,0,1994,10" name="jetbrains.mps.ide.build.mpsKotlinPlugin" />
+      <unit id="1432730276628307864" at="1,0,2002,10" name="jetbrains.mps.ide.build.mpsKotlinPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1545517825663017278">
     <file name="mpsVcs.xml">
-      <unit id="1545517825663017278" at="1,0,939,10" name="jetbrains.mps.ide.build.mpsVcs" />
+      <unit id="1545517825663017278" at="1,0,947,10" name="jetbrains.mps.ide.build.mpsVcs" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1583398502926411284">
     <file name="mpsAntToolsPlugin.xml">
-      <unit id="1583398502926411284" at="1,0,291,10" name="jetbrains.mps.ide.build.mpsAntToolsPlugin" />
+      <unit id="1583398502926411284" at="1,0,299,10" name="jetbrains.mps.ide.build.mpsAntToolsPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2002671966457711287">
     <file name="mpsContextActionsTool.xml">
-      <unit id="2002671966457711287" at="1,0,776,10" name="jetbrains.mps.ide.build.mpsContextActionsTool" />
+      <unit id="2002671966457711287" at="1,0,784,10" name="jetbrains.mps.ide.build.mpsContextActionsTool" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2405506926871158265">
     <file name="jetpad.xml">
-      <unit id="2405506926871158265" at="1,0,147,10" name="jetbrains.mps.ide.build.jetpad" />
+      <unit id="2405506926871158265" at="1,0,155,10" name="jetbrains.mps.ide.build.jetpad" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2569834391839970845">
     <file name="mpsWorkbench.xml">
-      <unit id="2569834391839970845" at="1,0,839,10" name="jetbrains.mps.ide.build.mpsWorkbench" />
+      <unit id="2569834391839970845" at="1,0,847,10" name="jetbrains.mps.ide.build.mpsWorkbench" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2849781404939735115">
     <file name="mpsJavaCore.xml">
-      <unit id="2849781404939735115" at="1,0,344,10" name="jetbrains.mps.ide.build.mpsJavaCore" />
+      <unit id="2849781404939735115" at="1,0,352,10" name="jetbrains.mps.ide.build.mpsJavaCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4218078887717256532">
     <file name="mpsConsolePlugin.xml">
-      <unit id="4218078887717256532" at="1,0,2209,10" name="jetbrains.mps.ide.build.mpsConsolePlugin" />
+      <unit id="4218078887717256532" at="1,0,2217,10" name="jetbrains.mps.ide.build.mpsConsolePlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4301118715654192646">
@@ -57,57 +57,57 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4301118715654819483">
     <file name="mpsTroveCollections.xml">
-      <unit id="4301118715654819483" at="1,0,532,10" name="jetbrains.mps.ide.build.mpsTroveCollections" />
+      <unit id="4301118715654819483" at="1,0,540,10" name="jetbrains.mps.ide.build.mpsTroveCollections" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4305752832749937830">
     <file name="mpsDiagramEditor.xml">
-      <unit id="4305752832749937830" at="1,0,1213,10" name="jetbrains.mps.ide.build.mpsDiagramEditor" />
+      <unit id="4305752832749937830" at="1,0,1221,10" name="jetbrains.mps.ide.build.mpsDiagramEditor" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4481132555457191249">
     <file name="mpsSpellCheckPlugin.xml">
-      <unit id="4481132555457191249" at="1,0,338,10" name="jetbrains.mps.ide.build.mpsSpellCheckPlugin" />
+      <unit id="4481132555457191249" at="1,0,346,10" name="jetbrains.mps.ide.build.mpsSpellCheckPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/5412100053808926057">
     <file name="mpsNavigationBar.xml">
-      <unit id="5412100053808926057" at="1,0,135,10" name="jetbrains.mps.ide.build.mpsNavigationBar" />
+      <unit id="5412100053808926057" at="1,0,140,10" name="jetbrains.mps.ide.build.mpsNavigationBar" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/5548512857136492214">
     <file name="mpsDevKit.xml">
-      <unit id="5548512857136492214" at="1,0,2086,10" name="jetbrains.mps.ide.build.mpsDevKit" />
+      <unit id="5548512857136492214" at="1,0,2094,10" name="jetbrains.mps.ide.build.mpsDevKit" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6164334420696839314">
     <file name="mpsDebuggerPlugin.xml">
-      <unit id="6164334420696839314" at="1,0,2471,10" name="jetbrains.mps.ide.build.mpsDebuggerPlugin" />
+      <unit id="6164334420696839314" at="1,0,2479,10" name="jetbrains.mps.ide.build.mpsDebuggerPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/618786790401812237">
     <file name="mpsTesting.xml">
-      <unit id="618786790401812237" at="1,0,2440,10" name="jetbrains.mps.ide.build.mpsTesting" />
+      <unit id="618786790401812237" at="1,0,2448,10" name="jetbrains.mps.ide.build.mpsTesting" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6265574260762011003">
     <file name="mpsMakePlugin.xml">
-      <unit id="6265574260762011003" at="1,0,383,10" name="jetbrains.mps.ide.build.mpsMakePlugin" />
+      <unit id="6265574260762011003" at="1,0,391,10" name="jetbrains.mps.ide.build.mpsMakePlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6361939271669846483">
     <file name="mpsExecutionPlugin.xml">
-      <unit id="6361939271669846483" at="1,0,2243,10" name="jetbrains.mps.ide.build.mpsExecutionPlugin" />
+      <unit id="6361939271669846483" at="1,0,2251,10" name="jetbrains.mps.ide.build.mpsExecutionPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6391307088354381121">
     <file name="mpsPlugins.xml">
-      <unit id="6391307088354381121" at="1,0,1637,10" name="jetbrains.mps.ide.build.mpsPlugins" />
+      <unit id="6391307088354381121" at="1,0,1645,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,1500,10" name="jetbrains.mps.ide.build.mpsCore" />
+      <unit id="6503539749405386437" at="1,0,1508,10" name="jetbrains.mps.ide.build.mpsCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/716066598061903713">
@@ -117,7 +117,7 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7246064732104303799">
     <file name="mpsVcsPlatform.xml">
-      <unit id="7246064732104303799" at="1,0,758,10" name="jetbrains.mps.ide.build.mpsVcsPlatform" />
+      <unit id="7246064732104303799" at="1,0,766,10" name="jetbrains.mps.ide.build.mpsVcsPlatform" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7352975819312388027">
@@ -127,17 +127,17 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7375832234660265597">
     <file name="mpsHttpSupportPlugin.xml">
-      <unit id="7375832234660265597" at="1,0,951,10" name="jetbrains.mps.ide.build.mpsHttpSupportPlugin" />
+      <unit id="7375832234660265597" at="1,0,959,10" name="jetbrains.mps.ide.build.mpsHttpSupportPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7401958389406848608">
     <file name="mpsJavaPlatform.xml">
-      <unit id="7401958389406848608" at="1,0,376,10" name="jetbrains.mps.ide.build.mpsJavaPlatform" />
+      <unit id="7401958389406848608" at="1,0,384,10" name="jetbrains.mps.ide.build.mpsJavaPlatform" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7735258172337199450">
     <file name="mpsTooltips.xml">
-      <unit id="7735258172337199450" at="1,0,625,10" name="jetbrains.mps.ide.build.mpsTooltips" />
+      <unit id="7735258172337199450" at="1,0,633,10" name="jetbrains.mps.ide.build.mpsTooltips" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7759561396119470053">
@@ -147,32 +147,32 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7926701909975931624">
     <file name="mpsBootstrapCore.xml">
-      <unit id="7926701909975931624" at="1,0,31225,10" name="jetbrains.mps.ide.build.mpsBootstrapCore" />
+      <unit id="7926701909975931624" at="1,0,31233,10" name="jetbrains.mps.ide.build.mpsBootstrapCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8006829063600512192">
     <file name="mpsJava.xml">
-      <unit id="8006829063600512192" at="1,0,400,10" name="jetbrains.mps.ide.build.mpsJava" />
+      <unit id="8006829063600512192" at="1,0,408,10" name="jetbrains.mps.ide.build.mpsJava" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8214399919540084172">
     <file name="mpsMigrationCore.xml">
-      <unit id="8214399919540084172" at="1,0,134,10" name="jetbrains.mps.ide.build.mpsMigrationCore" />
+      <unit id="8214399919540084172" at="1,0,139,10" name="jetbrains.mps.ide.build.mpsMigrationCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8214399919540087303">
     <file name="mpsMigration.xml">
-      <unit id="8214399919540087303" at="1,0,684,10" name="jetbrains.mps.ide.build.mpsMigration" />
+      <unit id="8214399919540087303" at="1,0,692,10" name="jetbrains.mps.ide.build.mpsMigration" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8227093612176368028">
     <file name="mpsBuildUI.xml">
-      <unit id="8227093612176368028" at="1,0,729,10" name="jetbrains.mps.ide.build.mpsBuildUI" />
+      <unit id="8227093612176368028" at="1,0,737,10" name="jetbrains.mps.ide.build.mpsBuildUI" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8524659923334108558">
     <file name="mpsBuild.xml">
-      <unit id="8524659923334108558" at="1,0,2909,10" name="jetbrains.mps.ide.build.mpsBuild" />
+      <unit id="8524659923334108558" at="1,0,2917,10" name="jetbrains.mps.ide.build.mpsBuild" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/945136127677776238">
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml
index 26f8dd387e8b..912bab2f2d92 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsEditorTestsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorTestsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorTestsPlugin" />
   <property name="mps_home" location="${basedir}" />
@@ -65,6 +68,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml
index b5b05dbc8388..e285fc1381dd 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml
@@ -1,6 +1,9 @@
 <project name="mpsIdeaMigration" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsIdeaMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsIdeaMigration" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -89,6 +92,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml
index 285a8cb6aeb2..1e83398086b0 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml
@@ -1,6 +1,9 @@
 <project name="mpsIdeaVcs" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsIdeaVcs" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsIdeaVcs" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -101,6 +104,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml
index 9ec9d9a36578..ff02ab5ae5aa 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsJavaIdeaPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaIdeaPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaIdeaPlugin" />
   <property name="mps_home" location="${basedir}" />
@@ -87,6 +90,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml
index 8f6d7c64ab3e..4fdd65bbfd79 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml
@@ -1,6 +1,9 @@
 <project name="mpsJpsIdea" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJpsIdea" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJpsIdea" />
   <property name="mps_home" location="${basedir}" />
@@ -70,6 +73,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml
index 1dabb3d191fe..e22818888888 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml
@@ -1,6 +1,9 @@
 <project name="mpsJpsIdeaJ8Compatibility" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJpsIdeaJ8Compatibility" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJpsIdeaJ8Compatibility" />
   <property name="mps_home" location="${basedir}" />
@@ -74,6 +77,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml
index dae9c0a27b0b..8cb5a56e8871 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml
@@ -1,6 +1,9 @@
 <project name="mpsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPlugin" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -96,6 +99,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml
index a26a1aa01f2e..9cab9ff983c8 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml
@@ -1,6 +1,9 @@
 <project name="mpsPluginTests" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${mps_home}/lib/jna" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPluginTests" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPluginTests" />
   <property name="idea_home" location="" />
@@ -127,6 +130,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info
index d9fde00dd566..c9414cea8197 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info
@@ -7,7 +7,7 @@
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/2773971779181619526">
     <file name="mpsJavaIdeaPlugin.xml">
-      <unit id="2773971779181619526" at="1,0,172,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJavaIdeaPlugin" />
+      <unit id="2773971779181619526" at="1,0,177,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJavaIdeaPlugin" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/4609382717257597716">
@@ -17,22 +17,22 @@
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/4609382717257603555">
     <file name="mpsJpsIdea.xml">
-      <unit id="4609382717257603555" at="1,0,187,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJpsIdea" />
+      <unit id="4609382717257603555" at="1,0,192,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJpsIdea" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/4762870812623561207">
     <file name="mpsIdeaMigration.xml">
-      <unit id="4762870812623561207" at="1,0,162,10" name="jetbrains.mps.ide.idea.plugin.build.mpsIdeaMigration" />
+      <unit id="4762870812623561207" at="1,0,167,10" name="jetbrains.mps.ide.idea.plugin.build.mpsIdeaMigration" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/5148601452480491524">
     <file name="mpsPlugin.xml">
-      <unit id="5148601452480491524" at="1,0,125,10" name="jetbrains.mps.ide.idea.plugin.build.mpsPlugin" />
+      <unit id="5148601452480491524" at="1,0,130,10" name="jetbrains.mps.ide.idea.plugin.build.mpsPlugin" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/6803956629300513436">
     <file name="mpsJpsIdeaJ8Compatibility.xml">
-      <unit id="6803956629300513436" at="1,0,193,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJpsIdeaJ8Compatibility" />
+      <unit id="6803956629300513436" at="1,0,198,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJpsIdeaJ8Compatibility" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/6936091511561272758">
@@ -42,17 +42,17 @@
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/6977615362525216882">
     <file name="mpsPluginTests.xml">
-      <unit id="6977615362525216882" at="1,0,270,10" name="jetbrains.mps.ide.idea.plugin.build.mpsPluginTests" />
+      <unit id="6977615362525216882" at="1,0,275,10" name="jetbrains.mps.ide.idea.plugin.build.mpsPluginTests" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/7848168823642910785">
     <file name="mpsEditorTestsPlugin.xml">
-      <unit id="7848168823642910785" at="1,0,87,10" name="jetbrains.mps.ide.idea.plugin.build.mpsEditorTestsPlugin" />
+      <unit id="7848168823642910785" at="1,0,92,10" name="jetbrains.mps.ide.idea.plugin.build.mpsEditorTestsPlugin" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/8128914530389845295">
     <file name="mpsIdeaVcs.xml">
-      <unit id="8128914530389845295" at="1,0,174,10" name="jetbrains.mps.ide.idea.plugin.build.mpsIdeaVcs" />
+      <unit id="8128914530389845295" at="1,0,179,10" name="jetbrains.mps.ide.idea.plugin.build.mpsIdeaVcs" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/8658995123701267517">
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml
index 2cc5e82bb287..3123c7ac6b9d 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test1" />
   <property name="build.layout" location="${build.dir}/artifacts/test1" />
   <property name="mps_home" location="" />
@@ -85,6 +88,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -194,6 +199,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml
index 7e49696a8dd9..3d33ff614ea2 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test2" />
   <property name="build.layout" location="${build.dir}/artifacts/test2" />
   <property name="mps_home" location="" />
@@ -123,6 +126,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -233,6 +238,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml
index 57c480d15f9d..da3443c52465 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test3" />
   <property name="build.layout" location="${build.dir}/artifacts/test3" />
   <property name="mps_home" location="" />
@@ -90,6 +93,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -200,6 +205,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml
index bcb6ff48b366..6021ebb23b3b 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test4" />
   <property name="build.layout" location="${build.dir}/artifacts/test4" />
   <property name="mps_home" location="" />
@@ -139,6 +142,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -251,6 +256,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml
index 0888cdfbd1f9..1b0cfdb7107f 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test5" />
   <property name="build.layout" location="${build.dir}/artifacts/test5" />
   <property name="mps_home" location="" />
@@ -138,6 +141,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -251,6 +256,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml
index bb5b14dbb73f..da45c51803c7 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/testDummyPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/testDummyPlugin" />
   <property name="mps_home" location="" />
@@ -98,6 +101,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -207,6 +212,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info
index b3c10f268c18..dcc9f578d4a8 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info
@@ -2,32 +2,32 @@
 <debug-info version="2">
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/1101389554473443113">
     <file name="testDummyPlugin.xml">
-      <unit id="1101389554473443113" at="1,0,371,10" name="jetbrains.mps.build.mps.runner.test.buildscript.testDummyPlugin" />
+      <unit id="1101389554473443113" at="1,0,379,10" name="jetbrains.mps.build.mps.runner.test.buildscript.testDummyPlugin" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/138593292063253314">
     <file name="test3.xml">
-      <unit id="138593292063253314" at="1,0,365,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test3" />
+      <unit id="138593292063253314" at="1,0,373,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test3" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/2304492758936981542">
     <file name="test4.xml">
-      <unit id="2304492758936981542" at="1,0,438,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test4" />
+      <unit id="2304492758936981542" at="1,0,446,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test4" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/3307120220351780865">
     <file name="test5.xml">
-      <unit id="3307120220351780865" at="1,0,437,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test5" />
+      <unit id="3307120220351780865" at="1,0,445,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test5" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/5712055271175299542">
     <file name="test1.xml">
-      <unit id="5712055271175299542" at="1,0,327,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test1" />
+      <unit id="5712055271175299542" at="1,0,335,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test1" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/5712055271175358329">
     <file name="test2.xml">
-      <unit id="5712055271175358329" at="1,0,383,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test2" />
+      <unit id="5712055271175358329" at="1,0,391,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test2" />
     </file>
   </root>
 </debug-info>
diff --git a/testbench/modules/build.mps.runner.test/test1.xml b/testbench/modules/build.mps.runner.test/test1.xml
index 2cc5e82bb287..3123c7ac6b9d 100644
--- a/testbench/modules/build.mps.runner.test/test1.xml
+++ b/testbench/modules/build.mps.runner.test/test1.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test1" />
   <property name="build.layout" location="${build.dir}/artifacts/test1" />
   <property name="mps_home" location="" />
@@ -85,6 +88,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -194,6 +199,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/test2.xml b/testbench/modules/build.mps.runner.test/test2.xml
index 7e49696a8dd9..3d33ff614ea2 100644
--- a/testbench/modules/build.mps.runner.test/test2.xml
+++ b/testbench/modules/build.mps.runner.test/test2.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test2" />
   <property name="build.layout" location="${build.dir}/artifacts/test2" />
   <property name="mps_home" location="" />
@@ -123,6 +126,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -233,6 +238,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/test3.xml b/testbench/modules/build.mps.runner.test/test3.xml
index 57c480d15f9d..da3443c52465 100644
--- a/testbench/modules/build.mps.runner.test/test3.xml
+++ b/testbench/modules/build.mps.runner.test/test3.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test3" />
   <property name="build.layout" location="${build.dir}/artifacts/test3" />
   <property name="mps_home" location="" />
@@ -90,6 +93,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -200,6 +205,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/test4.xml b/testbench/modules/build.mps.runner.test/test4.xml
index bcb6ff48b366..6021ebb23b3b 100644
--- a/testbench/modules/build.mps.runner.test/test4.xml
+++ b/testbench/modules/build.mps.runner.test/test4.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test4" />
   <property name="build.layout" location="${build.dir}/artifacts/test4" />
   <property name="mps_home" location="" />
@@ -139,6 +142,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -251,6 +256,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/test5.xml b/testbench/modules/build.mps.runner.test/test5.xml
index 0888cdfbd1f9..1b0cfdb7107f 100644
--- a/testbench/modules/build.mps.runner.test/test5.xml
+++ b/testbench/modules/build.mps.runner.test/test5.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test5" />
   <property name="build.layout" location="${build.dir}/artifacts/test5" />
   <property name="mps_home" location="" />
@@ -138,6 +141,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -251,6 +256,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/testDummyPlugin.xml b/testbench/modules/build.mps.runner.test/testDummyPlugin.xml
index bb5b14dbb73f..da45c51803c7 100644
--- a/testbench/modules/build.mps.runner.test/testDummyPlugin.xml
+++ b/testbench/modules/build.mps.runner.test/testDummyPlugin.xml
@@ -3,6 +3,9 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/testDummyPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/testDummyPlugin" />
   <property name="mps_home" location="" />
@@ -98,6 +101,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -207,6 +212,9 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
+        <arg value="-Djna.boot.library.path=${build.jna.library.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />